《PcsPlugin》

<1> 将通过 Fulfillment 服务推送PCS插件的 EC-OMS订单的 callbackUrl 同步存储给 PCS系统；【Pad操作订单状态变更, 测试通过】

<2> PCS插件将 EC-MOP 订单的 supplyChainSku 同步存储 PCS系统 【Pad展示，测试通过】

<3> PCS插件 支持 EC-WECHAT_MOP 渠道订单转换【上游未开通，无需测试】

fmTakeout/Control/flowControl.cpp

@@ -517,6 +517,7 @@ void FlowControl::_OrderAnalysis(const QJsonObject& jsonObject)
         orderObject->globalOrderType = 0;
         orderObject->isGiftitForward = 0 ;
         orderObject->callBackUrl = "";
+        orderObject->pcsCallbackUrl = "";
 
         orderObject->FromJson(jsonObject);
         orderObject->pushOrderType=0;
@@ -1505,7 +1506,7 @@ void FlowControl::_ReportOMSRecordOrderInfo()
     sendJson.insert(JSON_POS_WORKS_NUM, m_posWorkstationNum);
     sendJson.insert(JSON_POS_HOST_NAME, m_posHostName);
     sendJson.insert(JSON_POS_MAC_ADDRESS, m_posMacAddress);
-    // sendJson.insert(JSON_POS_PLUGIN_VERSION,  RepOMSRecOrderIn->posPluginVersion);
+    sendJson.insert(JSON_PCS_PLUGIN_VERSION,  APP_VERSION );
     sendJson.insert(JSON_PMSMACHINENO,m_pmsMachineNo);
     sendJson.insert(JSON_TCP_DEVICE_TYPE , "pcsPlugin");
 

fmTakeout/DTools/pmsOrdersData.h

@@ -112,6 +112,7 @@ private:
 
     QString m_sqlDbIp;
     QString m_sqlDbPassword;
+    QString m_puginInitUrl;  // PcsPlugin Configure File Login Url Part;
 
 signals:
 

fmTakeout/Model/dishesObject.h

@@ -12,6 +12,7 @@ class dishesObject : public QObject
     Q_PROPERTY (QString specId READ getspecId WRITE setspecId)
     Q_PROPERTY (QString name READ getname WRITE setname)
     Q_PROPERTY (QString enProductName READ getEnProductName WRITE setEnProductName)
+    Q_PROPERTY (QString supplyChainSku READ getSupplyChainSku WRITE setSupplyChainSku)
     Q_PROPERTY (QString specName READ getspecName WRITE setspecName)
     Q_PROPERTY (QString enSpecificationName READ getEnSpecificationName WRITE setEnSpecificationName)
     Q_PROPERTY (QString defaultImage READ getDefaultImage WRITE setDefaultImage)
@@ -44,6 +45,7 @@ public:
     QString id = "";
     QString name = "";
     QString enProductName = ""; //英文版商品名称;
+    QString supplyChainSku;   // EC-MOP 渠道订单商品的SKU
     QString specId = "";
     QString specName = "";
     QString enSpecificationName = ""; //英文版规格名称;
@@ -85,6 +87,9 @@ protected:
     inline QString getEnProductName(){ return enProductName; }
     inline void setEnProductName(const QString& v){ enProductName = v; }
 
+    inline QString getSupplyChainSku(){ return supplyChainSku; }
+    inline void setSupplyChainSku(const QString& v){ supplyChainSku = v; }
+
     inline int getprice(){ return price; }
     inline void setprice(const int& v){ price = v; }
 

fmTakeout/Model/orderObject.cpp

@@ -210,7 +210,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{

fmTakeout/Model/orderObject.h

@@ -104,6 +104,7 @@ class OrderObject : public QObject
     Q_PROPERTY (QString carNumber READ getCarNumber WRITE setCarNumber)
     Q_PROPERTY (QString privacyPhone READ getPrivacyPhone WRITE setPrivacyPhone)
     Q_PROPERTY (QString callBackUrl READ getCallBackUrl WRITE setCallBackUrl)
+    Q_PROPERTY (QString pcsCallbackUrl READ getPcsCallbackUrl WRITE setPcsCallbackUrl)
 
 public:
     OrderObject(QObject *parent=0)
@@ -217,6 +218,7 @@ public:
     QString carNumber;            // 车牌号
     QString privacyPhone;        // 隐私号
     QString  callBackUrl;   // 为阿里云配置新域名, 用于获取订单详情, 和汇报订单入机情况: 拉取订单详情成功时手动添加到订单json报文体中为了入机汇报接口;
+    QString pcsCallbackUrl;   // 为走 O2O Fufillment Service 链路的EC-OMS新系统, PCS门店 Pad上操作订单状态变更 请求正确的 Url 地址;
 
     int deliveryStatus = 0;
     int payStatus = 0;
@@ -500,6 +502,8 @@ public:
     inline QString getCallBackUrl()const{return callBackUrl;}
     inline void setCallBackUrl(const QString& v){callBackUrl = v;}
 
+    inline QString getPcsCallbackUrl()const{return pcsCallbackUrl;}
+    inline void setPcsCallbackUrl(const QString& v){pcsCallbackUrl = v;}
 };
 
 #endif // ORDEROBJECT_H

fmTakeout/detailForm.cpp

@@ -259,12 +259,12 @@ 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 4,2022,4,11
-    PRODUCTVERSION 4,2022,4,11
+    FILEVERSION 4,2022,4,28
+    PRODUCTVERSION 4,2022,4,28
     //*************************************************************************//
     FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
@@ -31,8 +31,8 @@ VS_VERSION_INFO VERSIONINFO
                 VALUE "OriginalFilename", "PmsPlugin.exe"
                 VALUE "ProductName", "PMS Plugin"
                 //***每次修改后编译发版必须变更版本号(preDefine.h中APP_VERSION 需要一致)***//  
-                VALUE "ProductVersion", "4.2022.4.11"
-                VALUE "FileVersion", "4.2022.4.11"
+                VALUE "ProductVersion", "4.2022.4.28"
+                VALUE "FileVersion", "4.2022.4.28"
                 //*************************************************************************//
             END
         END

fmTakeout/mainForm.cpp

@@ -464,7 +464,7 @@ void MainForm::onChangeOrderStatus(OrderObject *orderObject, int oldStatus)
             pBtn->setObjectName("mainProcBtn");
             pBtn->setProperty("orderId", orderObject->id);
             //pBtn->setProperty("operation", table->property("operation").toString());
-            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

@@ -17,7 +17,8 @@
 //#define APP_VERSION               "4.2021.5.10"
 //#define APP_VERSION               "4.2021.12.10"
 //#define APP_VERSION               "4.2022.3.3"
-#define APP_VERSION               "4.2022.4.11"
+//#define APP_VERSION               "4.2022.4.11"
+#define APP_VERSION               "4.2022.4.28"
 //修正版本号时,切记修正 FmTakeout.rc 中的版本号
 
 #define SERVER_PASSWORD         "posoperator@freemud.cn"
@@ -113,7 +114,9 @@
 #define JSON_DATA               "data"
 #define JSON_POSVERSION         "pos_version"
 #define JSON_PLUGINVERSION      "version"
+#define JSON_PCS_PLUGIN_VERSION         "posVersion"
 #define JSON_PLUGINVERSIONCOMMENTS      "versionComments"
+
 #define JSON_SYNCSTORESTATUS    "syncStoreStatus"
 #define JSON_ORDERS             "orders"
 #define JSON_COUNT              "count"