Skip to content

T
takeout_sbk
Commit a428c627 by wuyang.zou
Options

fix 

   优化 10分钟 循环拉取订单列表功能；
   依据 心跳接口 返回的 orderCount 进行漏单检查
parent 5c2dc1cd
Showing with 9 additions and 6 deletions
fmTakeout/Control/flowControl.h
...@@ -114,7 +114,8 @@ private: ...@@ -114,7 +114,8 @@ private:
QTimer *m_loginTimer; QTimer *m_loginTimer;
QTimer *m_remindCasherBlinkFloatTimer; //插件程序收到外卖订单后，需要一致提醒店员[直到此外卖订单被全部录入到POS系统] QTimer *m_remindCasherBlinkFloatTimer; //插件程序收到外卖订单后，需要一致提醒店员[直到此外卖订单被全部录入到POS系统]
QTimer *m_notifyPmsPullTimer; QTimer *m_notifyPmsPullTimer;
QTimer *m_cyclePullAllOrderTimer; //由于定时器是为了周期性获取全部订单; 原因: PmsPlugin set StoreServiceCenter; aviod missing Orders; //QTimer *m_cyclePullAllOrderTimer; //由于定时器是为了周期性获取全部订单; 原因: PmsPlugin set StoreServiceCenter; aviod missing Orders;
//已经通过心跳返回当天有效订单数据进行 漏单检查，故无需 周期性获取订单列表;
// 网络通信 // 网络通信
BillSocket *m_loginSocket; BillSocket *m_loginSocket;
BillSocket *m_pullOrderSocket; BillSocket *m_pullOrderSocket;
......
fmTakeout/fmTakeout.rc
...@@ -7,8 +7,8 @@ IDI_ICON ICON DISCARDABLE "logo.ico" ...@@ -7,8 +7,8 @@ IDI_ICON ICON DISCARDABLE "logo.ico"
#endif #endif
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
//***每次修改后编译发版必须变更版本号(preDefine.h中APP_VERSION 需要一致)***// //***每次修改后编译发版必须变更版本号(preDefine.h中APP_VERSION 需要一致)***//
FILEVERSION 4,2020,6,29 FILEVERSION 4,2020,6,30
PRODUCTVERSION 4,2020,6,29 PRODUCTVERSION 4,2020,6,30
//*************************************************************************// //*************************************************************************//
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
...@@ -31,8 +31,8 @@ VS_VERSION_INFO VERSIONINFO ...@@ -31,8 +31,8 @@ VS_VERSION_INFO VERSIONINFO
VALUE "OriginalFilename", "PmsPlugin.exe" VALUE "OriginalFilename", "PmsPlugin.exe"
VALUE "ProductName", "PMS Plugin" VALUE "ProductName", "PMS Plugin"
//***每次修改后编译发版必须变更版本号(preDefine.h中APP_VERSION 需要一致)***// //***每次修改后编译发版必须变更版本号(preDefine.h中APP_VERSION 需要一致)***//
VALUE "ProductVersion", "4.2020.6.29" VALUE "ProductVersion", "4.2020.6.30"
VALUE "FileVersion", "4.2020.6.29" VALUE "FileVersion", "4.2020.6.30"
//*************************************************************************// //*************************************************************************//
END END
END END
......
fmTakeout/preDefine.h
...@@ -10,7 +10,8 @@ ...@@ -10,7 +10,8 @@
//#define APP_VERSION "4.2020.423.1" //#define APP_VERSION "4.2020.423.1"
//#define APP_VERSION "4.2020.520.1" //#define APP_VERSION "4.2020.520.1"
//#define APP_VERSION "4.2020.526.1" //#define APP_VERSION "4.2020.526.1"
#define APP_VERSION "4.2020.6.29" //#define APP_VERSION "4.2020.6.29"
#define APP_VERSION "4.2020.6.30"
//修正版本号时,切记修正 FmTakeout.rc 中的版本号 //修正版本号时,切记修正 FmTakeout.rc 中的版本号
#define SERVER_PASSWORD "posoperator@freemud.cn" #define SERVER_PASSWORD "posoperator@freemud.cn"
...@@ -75,6 +76,7 @@ ...@@ -75,6 +76,7 @@
#define JSON_ERRCODE "code" #define JSON_ERRCODE "code"
#define JSON_STATUS "status" #define JSON_STATUS "status"
#define JSON_ORDERSTATUS "orderStatus" #define JSON_ORDERSTATUS "orderStatus"
#define JSON_ORDERCOUNT "orderCount"
#define JSON_REFUNDFMID "refundFmId" #define JSON_REFUNDFMID "refundFmId"
#define JSON_STATUSDESC "status_desc" #define JSON_STATUSDESC "status_desc"
#define JSON_MESSAGE "message" #define JSON_MESSAGE "message"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment