Skip to content

T
takeout_sbk
Commit b332c3a0 by wuyang.zou
Options

fix bug:解决配送费 null 录入pos失败

parent 6ef9484a
Showing with 6 additions and 5 deletions
fmTakeout/Control/flowControl.cpp
...@@ -462,7 +462,7 @@ bool FlowControl::_Login() ...@@ -462,7 +462,7 @@ bool FlowControl::_Login()
/*if(1){ /*if(1){
QJsonObject sendJsontemp; QJsonObject sendJsontemp;
sendJsontemp.insert(JSON_ORDERID, "123456789"); sendJsontemp.insert(JSON_ORDERID, "123456789");
sendJsontemp.insert("canceledCause", -1); sendJsontemp.insert("canceledCause", -1 );
sendJsontemp.insert(JSON_POSIPADDRESS,QString("http://10.222.221.163:8080")); sendJsontemp.insert(JSON_POSIPADDRESS,QString("http://10.222.221.163:8080"));
QLOG_INFO() << QString("[<<<<---_Login Test:--->>>>][requestData:%1]")<<sendJsontemp; QLOG_INFO() << QString("[<<<<---_Login Test:--->>>>][requestData:%1]")<<sendJsontemp;
if(ConfigManger::GetInstance().GetOrderSslConfig()) { if(ConfigManger::GetInstance().GetOrderSslConfig()) {
...@@ -1027,7 +1027,7 @@ bool FlowControl::_RefundOrder(const QString &orderId,int reasonCode,const QStri ...@@ -1027,7 +1027,7 @@ bool FlowControl::_RefundOrder(const QString &orderId,int reasonCode,const QStri
if(JSON_STATUSCODE_OK != recvJson[JSON_ERRCODE].toInt()) if(JSON_STATUSCODE_OK != recvJson[JSON_ERRCODE].toInt())
{ {
result = false; result = false;
emit showAlert(AlertForm::MSGERROR, QString::fromLocal8Bit("退单失败![%1]").arg(recvJson[JSON_MESSAGE].toString())); emit showAlert(AlertForm::MSGERROR, QString::fromLocal8Bit("退单失败![%1]").arg(recvJson[JSON_MESSAGE].toString()));
return false; return false;
} else { } else {
QJsonObject data = recvJson[JSON_DATA].toObject(); QJsonObject data = recvJson[JSON_DATA].toObject();
...@@ -1804,7 +1804,8 @@ bool FlowControl::_ResponseSimReqFristOrderData(QJsonObject &data, QString &erro ...@@ -1804,7 +1804,8 @@ bool FlowControl::_ResponseSimReqFristOrderData(QJsonObject &data, QString &erro
cObj.insert("sbkAppPayValue", tempSbkAppPayValue); cObj.insert("sbkAppPayValue", tempSbkAppPayValue);
cObj.insert("orderTransFlowNo", (orderObject->thirdPartyBatch).length()?orderObject->thirdPartyBatch :QString("123456789") ); //第三方交易流水号 cObj.insert("orderTransFlowNo", (orderObject->thirdPartyBatch).length()?orderObject->thirdPartyBatch :QString("123456789") ); //第三方交易流水号
cObj.insert("packFree", orderObject->packageFee); cObj.insert("packFree", orderObject->packageFee);
cObj.insert("deliveryFree", orderObject->deliveryPrice); //防止出现 deliveryPrice: NUll
cObj.insert("deliveryFree", (orderObject->deliveryPrice>0 && orderObject->deliveryPrice<10000)?orderObject->deliveryPrice:0);
cObj.insert("waybillId", (orderObject->waybillId).length()?orderObject->waybillId:QString("123456") ); cObj.insert("waybillId", (orderObject->waybillId).length()?orderObject->waybillId:QString("123456") );
cObj.insert("pos_sale_id", orderObject->posCheckNo); cObj.insert("pos_sale_id", orderObject->posCheckNo);
cObj.insert("order_status",orderObject->orderStatus);//订单的状态 cObj.insert("order_status",orderObject->orderStatus);//订单的状态
......
fmTakeout/preDefine.h
...@@ -165,9 +165,9 @@ ...@@ -165,9 +165,9 @@
// 服务器返回正确值 // 服务器返回正确值
#define JSON_STATUSCODE_OK 100 #define JSON_STATUSCODE_OK 100
// 默认拉取订单的间隔时间 // 默认拉取订单的间隔时间
#define VALUE_PULLSYNCTIME 10000 #define VALUE_PULLSYNCTIME 20000
// 默认网络超时时间 // 默认网络超时时间
#define VALUE_NETTIMEOUT 10000 #define VALUE_NETTIMEOUT 20000
// 默认重新尝试登录的时间 // 默认重新尝试登录的时间
#define VALUE_RELOGINTIME 20000 #define VALUE_RELOGINTIME 20000
// 默认心跳间隔的时间 // 默认心跳间隔的时间
......
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