《PosPlugin》

<1> 针对WSG订单券对象进行安全校验; 【修复低概率Bug,无需测试】
<2> 插件门店通告中心增强版:个性化提示,历史通告数据持久化与展示;【测试通过】
<3> 根据POS逻辑调整 顾客性别存储逻辑;【测试通过】
<4> POS插件优化履约拉订单列表逻辑;【修复低概率Bug,无需测试】
<5> POS插件渠道 MT-MOP 订单转换为 MOP; 【测试通过】
<6> POS插件上退单含SRKIT订单会出现退货入机缺陷BUG; 【测试通过】

《Simphony Script》

<1> 订单入机折扣金额校验;【修复低概率Bug,无需测试】
<2> 针对捕捉 系统错误 进行避免重复入机; 【修复低概率Bug,无需测试】

Version: 2.2022.4.25

fmTakeout/Control/flowControl.cpp

@@ -3162,7 +3162,7 @@ bool FlowControl::_ResponseSimReqFristOrderData(const QJsonObject &content, QJso
             tempSbkAppPayValue = "-1";
 
        }// MOP渠道对应的业务逻辑;
-        else if ( "MOP" == orderObject->channel || "EC-MOP" == orderObject->channel ) {
+        else if ( "MOP" == orderObject->channel || "EC-MOP" == orderObject->channel || "EC_WECHAT_MOP" == orderObject->channel ) {
 
             tempOrderPayType = 84;
             //星巴克App端支付方式: 1:支付宝; 2:微信; 3:银联; 4:SVC卡; 5/7:MOP使用券或星星抵扣 0元支付; 8:IStore订单; 9:银联支付(=3);

fmTakeout/DTools/checkPoskeyExistPosDB.cpp

@@ -96,19 +96,20 @@ bool CheckPoskeyExistPosDB::allPoskeyExistDB( OrderObject* orderObj , QStringLis
 
     if ( query.numRowsAffected()  == orderObj->posKeyList.size() ) {
         result= true;
-        orderObj->posKeyList.clear();
+        // orderObj->posKeyList.clear();  //不能清空, 否则会在 PrintCupStickPosDB::checkCouponProdAllVaild  将 原本正常合法订单 误判为 非法订单;
     } else {
         result = false;
+        notExistPoskeyList = orderObj->posKeyList;
+
         while( query.next() ) {
             queryValue= query.value(0);
             if ( queryValue.toString().length() ) {
-                orderObj->posKeyList.removeAll( queryValue.toString() );
+                notExistPoskeyList.removeAll( queryValue.toString() );
             }
         }
     }
 
     m_sqlDb.close();
-    notExistPoskeyList = orderObj->posKeyList;
     return result;
 }
 

fmTakeout/DTools/printSumBillPosDB.cpp

@@ -921,6 +921,7 @@ bool PrintSumBillPosDB::insertOrderSumBill(OrderObject* orderObj, const QString&
 
     QString tempChannel = ("WSG-MOD" == orderObj->channel) ? "MOD" : orderObj->channel;
     tempChannel = ( "WSG-MOP" == tempChannel || "MT-MOP" == tempChannel ) ? "MOP" : tempChannel;
+    tempChannel = ( "EC_WECHAT_MOP" == tempChannel ) ? "EC-MOP" : tempChannel;  // EC_WECHAT_MOP: 电商微信MOP 需转换 电商MOP;
 
     query.addBindValue(tempChannel);
     query.addBindValue(orderObj->platformSource);

fmTakeout/Model/orderObject.cpp

@@ -325,7 +325,7 @@ QString OrderObject::getChannelName()
             return QString::fromLocal8Bit("美团-MOP");
         }
 
-    } else if ( "EC-MOP" == channel ){
+    } else if ( "EC-MOP" == channel || "EC_WECHAT_MOP" == channel ) {
         return QString::fromLocal8Bit("电商MOP");
     } else{
         return QString::fromLocal8Bit("未知");

fmTakeout/detailForm.cpp

@@ -318,11 +318,11 @@ void DetailForm::InitData(OrderObject *orderObject)
         ui->detailBtn2->hide();
     }
     //星巴克:客诉单/MOP渠道/ORS渠道，不能显示退单按钮；
-    if(3 == orderObject->getOrderType() || "MOP" == orderObject->channel || "ORS" == orderObject->channel){
+    if(3 == orderObject->getOrderType() || "MOP" == orderObject->channel || "MT-MOP" == orderObject->channel || "ORS" == orderObject->channel){
         ui->detailBtn2->hide();
     }
     //星巴克:电商-MOP 需要显示退单按钮(便于 当日退 / 跨日退)；
-    if ( "EC-MOP" == orderObject->channel  && OrderObject::Refunded != orderObject->orderStatus ) {
+    if ( ( "EC-MOP" == orderObject->channel || "EC_WECHAT_MOP" == orderObject->channel )  && OrderObject::Refunded != orderObject->orderStatus ) {
         ui->detailBtn2->show();
     }
 

fmTakeout/fmTakeout.rc

@@ -7,8 +7,8 @@ IDI_ICON   ICON DISCARDABLE "logo.ico"
 #endif
 VS_VERSION_INFO VERSIONINFO
     //***每次修改后编译发版必须变更版本号(preDefine.h中APP_VERSION 需要一致)***//
-    FILEVERSION 2,2022,4,11
-    PRODUCTVERSION 2,2022,4,11
+    FILEVERSION 2,2022,4,25
+    PRODUCTVERSION 2,2022,4,25
     //*************************************************************************//
     FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
@@ -31,8 +31,8 @@ VS_VERSION_INFO VERSIONINFO
                 VALUE "OriginalFilename", "fmTakeout.exe"
                 VALUE "ProductName", "Delivery Order Plugin"
                 //***每次修改后编译发版必须变更版本号(preDefine.h中APP_VERSION 需要一致)***//  
-                VALUE "ProductVersion", "2.2022.4.11"
-                VALUE "FileVersion", "2.2022.4.11"
+                VALUE "ProductVersion", "2.2022.4.25"
+                VALUE "FileVersion", "2.2022.4.25"
                 //*************************************************************************//
             END
         END

fmTakeout/mainForm.cpp

@@ -524,7 +524,7 @@ void MainForm::onChangeOrderStatus(OrderObject *orderObject, int oldStatus)
             pBtn->setFocusPolicy(Qt::NoFocus);
             pBtn->setObjectName("mainProcBtn");
             pBtn->setProperty("orderId", orderObject->id);
-            if("MOP" == orderObject->channel){
+            if ( "MOP" == orderObject->channel || "MT-MOP"== orderObject->channel || "EC-MOP"== orderObject->channel || "EC_WECHAT_MOP"== orderObject->channel ) {
                 pBtn->setText(QString::fromLocal8Bit("请扫码通知"));
             }else{
                 pBtn->setText(QString::fromLocal8Bit("请扫码配送"));

fmTakeout/preDefine.h

@@ -42,7 +42,7 @@
 //#define APP_VERSION               "2.2021.9.24"
 //#define APP_VERSION               "2.2021.12.20"
 //#define APP_VERSION               "2.2022.1.18"
-#define APP_VERSION               "2.2022.4.11"
+#define APP_VERSION               "2.2022.4.25"
 //修正版本号时,切记修正 FmTakeout.rc 中的版本号