1. 修复结算时存入数据库的fm_transId为空问题。

global.h

@@ -244,6 +244,7 @@ const PropsMap::value_type PropsMapPairs[] =
     PropsMap::value_type(PosProps.Pay_id,       "typeModeFlag"),
     PropsMap::value_type(PosProps.Pay_amount,   "amount"),
     PropsMap::value_type(PosProps.ConsumeNum,   "consumeNum"),
+    PropsMap::value_type(PosProps.Pay_ids,      "payList"),
 };
 static PropsMap PosToServerProps(PropsMapPairs, PropsMapPairs + (sizeof(PropsMapPairs)/sizeof(PropsMapPairs[0])));
 

task/taskfinal.cpp

@@ -130,7 +130,16 @@ void TaskFinal::packagePOSRsp()
         QString trans_id = getPosJsonValue(PosProps.TransId).toString();
         QString fm_open_id = getServerJsonValue(PosProps.Fm_open_id).toString();
         QString fm_id = getServerJsonValue(PosProps.Fm_id).toString();
-        QString fm_transId = getServerJsonValue("thirdPayTransId").toString();
+        QString fm_transId = "";
+
+        foreach(auto p, getServerJsonValue(PosProps.Pay_ids).toArray())
+        {
+            QJsonObject pay = p.toObject();
+            QString typeModeFlag = pay["typeModeFlag"].toString();
+            if (typeModeFlag == "20010") {
+                fm_transId = pay["thirdPayTransId"].toString();
+            }
+        }
         FMBackup::instance()->insertNewOrder(trans_id, fm_open_id, fm_id, fm_transId);
     }
 }