Commit 8bebb516 by NitefullWind

1. 对应结算接口中的支付方式。 2. 修改认证接口中是否展示用户信息的判断。

parent 9b5214e3
...@@ -46,28 +46,20 @@ void TaskFinal::packageServerReq() ...@@ -46,28 +46,20 @@ void TaskFinal::packageServerReq()
{ {
QJsonObject pay; QJsonObject pay;
pay["amount"] = p.toObject()["pay_amount"]; pay["amount"] = p.toObject()["pay_amount"];
pay["thirdPayTransId"] = ""; pay["thirdPayTransId"] = p.toObject()["pay_transId"].toString();
pay["code"] = p.toObject()["code"].toString(); pay["code"] = p.toObject()["code"].toString();
pay["transId"] = p.toObject()["trans_id"]; pay[PosProps.TransId] = getPosJsonValue(PosProps.TransId);
pay["payTransId"] = p.toObject()["pay_transId"].toString();
QString typeModeFlag = p.toObject()["pay_id"].toString(); QString typeModeFlag = p.toObject()["pay_id"].toString();
if(typeModeFlag == "0") if(typeModeFlag == "0101") {
{
//现金支付 //现金支付
pay["typeModeFlag"] = "20005"; pay["typeModeFlag"] = "20005";
} } else if(typeModeFlag == "0301") {
else if(typeModeFlag == "7") pay["typeModeFlag"] = "10011";
{ } else if(typeModeFlag == "0302") {
//支付宝钱包 pay["typeModeFlag"] = "10011";
pay["typeModeFlag"] = "10001"; //??? } else if(typeModeFlag == "0303") {
} pay["typeModeFlag"] = "10011";
else if(typeModeFlag == "9") } else {
{
//微信钱包
pay["typeModeFlag"] = "10004"; //???
}
else
{
pay["typeModeFlag"] = typeModeFlag; pay["typeModeFlag"] = typeModeFlag;
} }
......
...@@ -74,7 +74,7 @@ void TaskLogin::onLogin() ...@@ -74,7 +74,7 @@ void TaskLogin::onLogin()
QString birthday = getServerJsonValue(PosProps.Birthday).toString(); QString birthday = getServerJsonValue(PosProps.Birthday).toString();
QString name = getServerJsonValue(PosProps.Name).toString(); QString name = getServerJsonValue(PosProps.Name).toString();
if(getServerJsonValue(PosProps.CanPay) == -1) { if(getServerJsonValue(PosProps.CanPay).toInt() == 0) {
FMMsgWnd::LoginSuccess(account, name, birthday, _window); FMMsgWnd::LoginSuccess(account, name, birthday, _window);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment