Commit 41608949 by Carwyn

1. 兼容POS 结算时不传PaidAmount; 2. 如果会员不存在,给POS返回成功(供线下会员认证使用); 3. 兼容第三方支付退款去会员系统退款(把fm_transId 转成fm_id)

parent 4e9ab768
...@@ -23,11 +23,15 @@ void TaskFinal::packageServerReq() ...@@ -23,11 +23,15 @@ void TaskFinal::packageServerReq()
p.push_back(PosProps.Fm_id); p.push_back(PosProps.Fm_id);
p.push_back(PosProps.Fm_open_id); p.push_back(PosProps.Fm_open_id);
p.push_back(PosProps.OrderAmount); p.push_back(PosProps.OrderAmount);
p.push_back(PosProps.PaidAmount == 0 ? PosProps.OrderAmount : PosProps.PaidAmount); p.push_back(PosProps.PaidAmount);
foreach(auto prop , p) { foreach(auto prop , p) {
transData[ServerProps(prop)] = getPosJsonValue(prop); transData[ServerProps(prop)] = getPosJsonValue(prop);
} }
if (transData[ServerProps(PosProps.PaidAmount)].toInt() == 0) {
transData[ServerProps(PosProps.PaidAmount)] = transData[ServerProps(PosProps.OrderAmount)];
}
// 产品列表 // 产品列表
QJsonArray products; QJsonArray products;
foreach(auto p , getPosJsonValue("products").toArray()) foreach(auto p , getPosJsonValue("products").toArray())
......
...@@ -39,7 +39,8 @@ void TaskLogin::packageServerReq() ...@@ -39,7 +39,8 @@ void TaskLogin::packageServerReq()
void TaskLogin::packagePOSRsp() void TaskLogin::packagePOSRsp()
{ {
posRspJsonObj["statusCode"] = getServerJsonValue("statusCode").toInt(); int statusCode = getServerJsonValue("statusCode").toInt();
posRspJsonObj["statusCode"] = statusCode == 2003 ? 100 : statusCode;
posRspJsonObj["msg"] = getServerJsonValue("msg").toString(); posRspJsonObj["msg"] = getServerJsonValue("msg").toString();
posRspJsonObj["prompt"] = getServerJsonValue("prompt").toInt(); posRspJsonObj["prompt"] = getServerJsonValue("prompt").toInt();
posRspJsonObj["fm_open_id"] = getServerJsonValue(PosProps.Fm_open_id).toString(); posRspJsonObj["fm_open_id"] = getServerJsonValue(PosProps.Fm_open_id).toString();
......
...@@ -34,7 +34,9 @@ TaskRefundPay::TaskRefundPay(QJsonObject &jsonObj, QObject *parent) ...@@ -34,7 +34,9 @@ TaskRefundPay::TaskRefundPay(QJsonObject &jsonObj, QObject *parent)
void TaskRefundPay::packageServerReq() void TaskRefundPay::packageServerReq()
{ {
QJsonArray transIds; QJsonArray transIds;
if (!getPosJsonValue(PosProps.TransId).toString().isEmpty()) {
transIds.append(getPosJsonValue(PosProps.TransId)); transIds.append(getPosJsonValue(PosProps.TransId));
}
transIds.append(getPosJsonValue(PosProps.Fm_transId)); transIds.append(getPosJsonValue(PosProps.Fm_transId));
QJsonObject transData; QJsonObject transData;
transData["transIds"] = transIds; transData["transIds"] = transIds;
...@@ -75,8 +77,14 @@ void TaskRefundOrder::packagePOSRsp() ...@@ -75,8 +77,14 @@ void TaskRefundOrder::packagePOSRsp()
std::vector<QString> p; std::vector<QString> p;
p.push_back(PosProps.StatusCode); p.push_back(PosProps.StatusCode);
p.push_back(PosProps.Msg); p.push_back(PosProps.Msg);
foreach(auto prop , p) { foreach(auto prop , p) {
posRspJsonObj[prop] = getServerJsonValue(ServerProps(prop)); posRspJsonObj[prop] = getServerJsonValue(ServerProps(prop));
} }
QString fm_id = getPosJsonValue(PosProps.Fm_id).toString();
QString fmTransId = getPosJsonValue(PosProps.Fm_transId).toString();
if(fm_id == "" && !fmTransId.isEmpty() && getServerJsonValue(ServerProps(PosProps.StatusCode)).toInt() == 3201) {
posRspJsonObj[PosProps.StatusCode] = 100;
}
posRspJsonObj[PosProps.Prompt] = 1; posRspJsonObj[PosProps.Prompt] = 1;
} }
...@@ -68,6 +68,7 @@ void TaskPay::setWindow() ...@@ -68,6 +68,7 @@ void TaskPay::setWindow()
amount = getPosJsonValue(PosProps.OrderAmount).toDouble(); amount = getPosJsonValue(PosProps.OrderAmount).toDouble();
} }
//! 临时取 OrderAmount !!!!
int paid_amount = getPosJsonValue(PosProps.OrderAmount).toInt(); int paid_amount = getPosJsonValue(PosProps.OrderAmount).toInt();
if (paid_amount == 0) { if (paid_amount == 0) {
paid_amount = getPosJsonValue(PosProps.OrderAmount).toDouble(); paid_amount = getPosJsonValue(PosProps.OrderAmount).toDouble();
......
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