新增 POS插件渠道 MT-MOP 订单转换为 MOP;

Version

fmTakeout/Control/flowControl.cpp

@@ -1681,20 +1681,16 @@ bool FlowControl::_RefundOrder(const QString &orderId,int reasonCode,const QStri
     }
 
     m_procOrderSocket->SetUrl(QUrl( url ) );
-    QLOG_INFO() << QString("[<<<<<-----_RefundOrder: orderId:%1  URL: ----->>>>>]").arg(orderId)<< m_procOrderSocket->GetUrl();
+    QLOG_INFO() << QString("[<<<<<-----_RefundOrder: orderId:%1  Request URL: ----->>>>>]").arg(orderId)<< m_procOrderSocket->GetUrl();
 
     if(ConfigManger::GetInstance().GetOrderSslConfig()) {
         m_procOrderSocket->SetSslConfig();
-        QLOG_INFO()<<"load ssl";
-    } else {
-        QLOG_INFO()<<"load not ssl";
     }
-    QLOG_INFO() << QString("[<<<<---Refund Order Request: --->>>>]")<< m_procOrderSocket->GetUrl();
+
     result = m_procOrderSocket->PostRequest(sendJson, recvJson, error);
-    QLOG_INFO() << QString("[<<<<---Refund Order Finish--->>>>][result:%1][msg:%2][recvData:]")
-                   .arg(result).arg(error)<<recvJson;
-    if(!result)
-    {
+    QLOG_INFO() << QString("[<<<<---Refund Order Finish--->>>>][result:%1][msg:%2][recvData:]").arg(result).arg(error)<<recvJson;
+
+    if ( !result ) {
         emit showAlert(AlertForm::MSGERROR, QString::fromLocal8Bit("退单失败![网络错误]"));
         return false;
     } else {
@@ -1714,6 +1710,7 @@ bool FlowControl::_RefundOrder(const QString &orderId,int reasonCode,const QStri
                 int orderStatus = data[JSON_ORDERSTATUS].toInt();
                 int tempGlobalOrderType = data[JSON_GLOBALORDERTYPE].toInt();
                 int tempGlobalServiceType = data[JSON_GLOBALSERVICETYPE].toInt();
+                int tempRefundMethod = data[JSON_GLOBALREFUNDMETHOD].toInt();   // 1: srkit-全退  2: srkit-部分退
 
                 OrderObject* orderObject = m_FmOrdersMap.value(orderId);
                 int oldOrderStatus = orderObject->orderStatus;
@@ -1724,6 +1721,13 @@ bool FlowControl::_RefundOrder(const QString &orderId,int reasonCode,const QStri
                 orderObject->globalServiceType = tempGlobalServiceType;
 
                 emit changeOrderStatus(orderObject, oldOrderStatus);
+
+                // 部分退场景, 不能提前进入入机队列, 需等待上游更新订单数据;
+                if ( 2 == tempRefundMethod ) {
+                    QLOG_INFO() << QString::fromLocal8Bit("[<<<<---FmTakeout _RefundOrder: orderId: %1, refundMethod: %2  [2: srkit-部分退]--->>>>]").arg( orderObject->id ).arg( tempRefundMethod );
+                    return true;
+                }
+
                 emit doHideMainShowFloatFrom();
                 //退货订单，将此订单添加到simphony 模拟点单列表中；
                 QLOG_INFO() << QString("[<<<<---FmTakeout _RefundOrder: orderObject->id:%1 , orderObject->orderStatus:%2 --->>>>]").arg(orderObject->id).arg(orderObject->orderStatus);
@@ -1751,8 +1755,8 @@ bool FlowControl::_RefundOrder(const QString &orderId,int reasonCode,const QStri
                         // 及时更新 不入机类型的退单数据 并 及时打印退单提醒;
                         m_storagePosOrdersList.append(orderObject->id);
                     }
-                    QLOG_INFO() << QString("[<<<<---FmTakeout _RefundOrder:  m_simValidOrdersList.num:%1 --->>>>]")<< m_simValidOrdersList.count();
-                    QLOG_INFO() << QString("[<<<<---FmTakeout _RefundOrder:  m_simValidOrdersList:%1 --->>>>]")<< m_simValidOrdersList;
+                    QLOG_INFO() << QString("[<<<<---FmTakeout _RefundOrder:  m_simValidOrdersList.num:%1 , m_simValidOrdersList.first: %2 --->>>>]")
+                                .arg( m_simValidOrdersList.count() ).arg( m_simValidOrdersList.first() );
                     QLOG_INFO() << QString("[<<<<---FmTakeout _RefundOrder:  _ClickOMSAssignArea --->>>>]");
                     m_OrderEntryMutex.unlock();
                     m_clickPosCount = 0;
@@ -1777,8 +1781,8 @@ bool FlowControl::_RefundOrder(const QString &orderId,int reasonCode,const QStri
                         orderObject->orsPushOrderType = 0;
                         orderObject->orsPushOrderTimes = 0;
                     }
-                    QLOG_INFO() << QString("[<<<<---FmTakeout _RefundOrder:SimExceptRefund :  m_simValidOrdersList.num:%1 --->>>>]")<< m_simValidOrdersList.count();
-                    QLOG_INFO() << QString("[<<<<---FmTakeout _RefundOrder:SimExceptRefund :  m_simValidOrdersList:%1 --->>>>]")<< m_simValidOrdersList;
+                    QLOG_INFO() << QString("[<<<<---FmTakeout _RefundOrder:SimExceptRefund :  m_simValidOrdersList.num:%1 , m_simValidOrdersList.first: %2 --->>>>]")
+                                .arg( m_simValidOrdersList.count() ).arg( m_simValidOrdersList.first() );
                     QLOG_INFO() << QString("[<<<<---FmTakeout _RefundOrder:SimExceptRefund :  _ClickOMSAssignArea --->>>>]");
                     m_OrderEntryMutex.unlock();
                     m_clickPosCount = 0;

fmTakeout/DTools/printSumBillPosDB.cpp

@@ -920,7 +920,7 @@ bool PrintSumBillPosDB::insertOrderSumBill(OrderObject* orderObj, const QString&
     query.addBindValue(orderObj->orderType);
 
     QString tempChannel = ("WSG-MOD" == orderObj->channel) ? "MOD" : orderObj->channel;
-    tempChannel = ("WSG-MOP" == tempChannel ) ? "MOP" : tempChannel;
+    tempChannel = ( "WSG-MOP" == tempChannel || "MT-MOP" == tempChannel ) ? "MOP" : tempChannel;
 
     query.addBindValue(tempChannel);
     query.addBindValue(orderObj->platformSource);

fmTakeout/preDefine.h

@@ -127,6 +127,7 @@
 #define JSON_REFUNDFMID         "refundFmId"
 #define JSON_GLOBALORDERTYPE        "globalOrderType"
 #define JSON_GLOBALSERVICETYPE        "globalServiceType"
+#define JSON_GLOBALREFUNDMETHOD  "refundMethod"
 #define JSON_STATUSDESC         "status_desc"
 #define JSON_MSG            "msg"
 #define JSON_MESSAGE            "message"