Support OMS Push Order Include callBackUrl, For 获取订单详情,订单入机汇报,订单退款; 双活模式

Version: 4.2022.1.18

fmTakeout/Control/flowControl.h

@@ -65,6 +65,8 @@ private:
         int pageNumber;
         QString channel;
         QString orderId;
+        int pullErrorCount;
+        QString callBackUrl;
     }PullOrderInfo;
 
     typedef struct ORDER_OPERATION
@@ -139,12 +141,14 @@ private:
     // 是否第一次获取到门店信息
     bool m_bFirstRecvInfo;
     bool m_bLoginResult;
+    int m_loginErrorCount;
+    int m_sendHeartErrorCount;
+    bool m_bCreateSelfCheckOrderError;
     bool m_openTcpChannel;
     bool m_bOperateResult;
     // 标记目前悬浮框是否 锁住状态[false:悬浮框解锁状态; true:悬浮框锁住状态]；
     bool m_bFloatFromLockSt;
     // HttpServer
-    // JQHttpServer::TcpServerManage* m_tcpServerManage;
     LocalHttpServer* localHttpServer;
     // QtRedis Operat Process
 
@@ -178,6 +182,9 @@ private:
     bool m_initPmsOrdersDataRet;
     bool m_initPmsRedisRet;
 
+    // 新增: 记录OMS备用服务的 CallBackUrl 地址; 便于OMS服务异常时,具备热切换功能: 登录 + 订单列表 + 心跳 + 自检单;
+    QString m_serviceCallBackUrl;
+
 signals:
     // 发送信号给自己 做登陆
     // void doLogin();
@@ -328,12 +335,12 @@ public slots:
      * 参数:[1]订单编号
      * 返回:是否成功
      * */
-    bool _PullOrderDetail(const QString &orderId, const QString& channel);
+    bool _PullOrderDetail(const QString &orderId, const QString& channel, const QString &callBackUrl);
     /* 功能:拉取订单
      * 参数:NULL
      * 返回:是否成功
      * */
-    bool _PullOrderList(const int &pageSize, const int &pageNo);
+    bool _PullOrderList(const int &pageSize, const int &pageNo, const QString &callBackUrl);
     /* 功能:发送心跳
      * 参数:NULL
      * 返回:是否成功
@@ -344,11 +351,7 @@ public slots:
      * 返回:是否成功
      * */
     bool _ConfirmOrder(const QString& orderId);
-    /* 功能:拒绝订单
-     * 参数:[1]订单编号[2]拒单原因
-     * 返回:是否成功
-     * */
-    bool _RefuseOrder(const QString& orderId, int refuseCode, const QString reason);
+
     /* 功能:送出订单
      * 参数:[1]订单编号
      * 返回:是否成功
@@ -359,11 +362,7 @@ public slots:
      * 返回:是否成功
      * */
     bool _CompleteOrder(const QString& orderId);
-    /* 功能:拒绝退单
-     * 参数:NULL
-     * 返回:是否成功
-     * */
-    bool _RefuseRefund(const QString& orderId);
+
     /* 功能:退单
      * 参数:NULL
      * 返回:是否成功
@@ -406,7 +405,7 @@ public slots:
     void _GetIpAddress();
     void _AddOrderPull(const QString& orderId=0,const QString& channel=0,const int& pageNumber=1,const int& pageSize=30);
     // 避免获取较多历史订单的同时，OMS又有推单过来，导致死锁;
-    bool _TryAddOrderPull(const QString &orderId=0, const QString &channel=0, const int &pageNumber=1, const int &pageSize=30);
+    bool _TryAddOrderPull(const QString &orderId=0, const QString &channel=0, const QString &callBackUrl="", const int &pageNumber=1, const int &pageSize=30);
 
     //点击屏幕指定区域
     void _ClickOMSAssignArea();

fmTakeout/Model/orderObject.h

@@ -103,6 +103,7 @@ class OrderObject : public QObject
     Q_PROPERTY (QString remindTicketTime READ getRemindTicketTime WRITE setRemindTicketTime )
     Q_PROPERTY (QString carNumber READ getCarNumber WRITE setCarNumber)
     Q_PROPERTY (QString privacyPhone READ getPrivacyPhone WRITE setPrivacyPhone)
+    Q_PROPERTY (QString callBackUrl READ getCallBackUrl WRITE setCallBackUrl)
 
 public:
     OrderObject(QObject *parent=0)
@@ -215,6 +216,7 @@ public:
     QString remindTicketTime;  // 提醒小票时间
     QString carNumber;            // 车牌号
     QString privacyPhone;        // 隐私号
+    QString  callBackUrl;   // 为阿里云配置新域名, 用于获取订单详情, 和汇报订单入机情况: 拉取订单详情成功时手动添加到订单json报文体中为了入机汇报接口;
 
     int deliveryStatus = 0;
     int payStatus = 0;
@@ -495,6 +497,9 @@ public:
     inline QString getPrivacyPhone()const{return privacyPhone;}
     inline void setPrivacyPhone(const QString& v){privacyPhone = v;}
 
+    inline QString getCallBackUrl()const{return callBackUrl;}
+    inline void setCallBackUrl(const QString& v){callBackUrl = v;}
+
 };
 
 #endif // ORDEROBJECT_H

fmTakeout/fmTakeout.rc

@@ -7,8 +7,8 @@ IDI_ICON   ICON DISCARDABLE "logo.ico"
 #endif
 VS_VERSION_INFO VERSIONINFO
     //***每次修改后编译发版必须变更版本号(preDefine.h中APP_VERSION 需要一致)***//
-    FILEVERSION 4,2021,12,10
-    PRODUCTVERSION 4,2021,12,10
+    FILEVERSION 4,2022,1,18
+    PRODUCTVERSION 4,2022,1,18
     //*************************************************************************//
     FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
@@ -27,12 +27,12 @@ VS_VERSION_INFO VERSIONINFO
                 VALUE "CompanyName", "ShangHai.Freemud Co., Ltd."
                 VALUE "FileDescription", "PMS Plugin Application"
                 VALUE "InternalName", "PmsPlugin.exe"
-                VALUE "LegalCopyright", "Copyright (C)2014-2021"
+                VALUE "LegalCopyright", "Copyright (C)2014-2022"
                 VALUE "OriginalFilename", "PmsPlugin.exe"
                 VALUE "ProductName", "PMS Plugin"
                 //***每次修改后编译发版必须变更版本号(preDefine.h中APP_VERSION 需要一致)***//  
-                VALUE "ProductVersion", "4.2021.12.10"
-                VALUE "FileVersion", "4.2021.12.10"
+                VALUE "ProductVersion", "4.2022.1.18"
+                VALUE "FileVersion", "4.2022.1.18"
                 //*************************************************************************//
             END
         END

fmTakeout/preDefine.h

@@ -15,7 +15,8 @@
 //#define APP_VERSION               "4.2020.8.10"
 //#define APP_VERSION               "4.2021.1.8"
 //#define APP_VERSION               "4.2021.5.10"
-#define APP_VERSION               "4.2021.12.10"
+//#define APP_VERSION               "4.2021.12.10"
+#define APP_VERSION               "4.2022.1.18"
 //修正版本号时,切记修正 FmTakeout.rc 中的版本号
 
 #define SERVER_PASSWORD         "posoperator@freemud.cn"
@@ -126,6 +127,7 @@
 #define JSON_SHOPCODE           "storeId"
 #define JSON_POSIPADDRESS       "posAddress"
 #define JSON_CHANNEL            "channel"
+#define JSON_CALL_BACK_URL "callBackUrl"
 #define JSON_BUSINESSSTATUS     "business_status"
 #define JSON_CODE               "code"
 #define JSON_PAGENUMBER         "pageNo"