添加咖啡小程序状态逻辑处理

base/BaseDefine.h

-#ifndef BASE_DEFINE_H
+#ifndef BASE_DEFINE_H
 #define BASE_DEFINE_H
 
 #define IN
@@ -41,6 +41,9 @@
 #define PLUGIN_TO_ODS_SCANCODE_DONE                   1024          //已完成（扫码购）
 #define PLUGIN_TO_ODS_SCANCODE_REFUND                 1025          //pos退款（扫码购）
 
+//咖啡小程序 插件向ods请求码
+#define PLUGIN_TO_ODS_COFFEE_REFUND                   400011        //pos退款（咖啡小程序）
+
 //配送类型对照表
 #define DELIVERY_TYPE_SELF                "self"        //自配送 
 #define DELIVERY_TYPE_PLATFORM            "platform"    //平台配送 
@@ -67,6 +70,11 @@
 #define PLANTFORM_CODE_ONLINE_BAIDU                         206     //线上百度外卖 
 #define PLANTFORM_CODE_ONLINE_ELEMA                         207     //线上饿了吗外卖 
 #define PLANTFORM_CODE_ONLINE_JINGDONG                      208     //线上京东外卖 
+#define PLANTFORM_CODE_ONLINE_EBAI                          209     //线上饿百外卖
+#define PLANTFORM_CODE_ONLINE_JIXIANG                       210     //集享外卖
+#define PLANTFORM_CODE_ONLINE_APPOINTMENT                   211     //点取分离
+#define PLANTFORM_CODE_ONLINE_QUANJIA                       212     //全家外卖
+#define PLANTFORM_CODE_ONLINE_COFFEE                        213     //咖啡小程序
 
 //响应状态对照表
 #define RESPONSE_CODE_SUCCESS              100           //成功 
@@ -84,6 +92,7 @@
 #define OPERATION_POS_APPOINTMENT_CONFIRM              1019          //确认接单（点取分离）
 #define OPERATION_POS_SCANCODE_DONE                    1020          //已完成（扫码购）
 #define OPERATION_POS_SCANCODE_REFUND                  1021          //pos退款（扫码购）
+#define OPERATION_POS_COFFEE_REFUND                    1022          //pos退款（咖啡小程序）
 
 
 /***********************************
@@ -115,6 +124,14 @@
 #define ODS_ORDERSTATUS_APPOINTMENT_PAID      20004	     //已支付（点取分离）
 #define ODS_ORDERSTATUS_APPOINTMENT_REFUND    20005	     //用户退款（点取分离）
 #define ODS_ORDERSTATUS_SCANCODE_PAID         30004	     //已支付（扫码购）
+#define ODS_ORDERSTATUS_COFFEE_CANCEL         40002	     //已取消(咖啡小程序)
+#define ODS_ORDERSTATUS_COFFEE_TIMEOUT_CANCEL 40003	     //超时取消(咖啡小程序)
+#define ODS_ORDERSTATUS_COFFEE_PAID           40004	     //已支付(咖啡小程序)
+#define ODS_ORDERSTATUS_COFFEE_REFUND_USER    40005	     //用户退款申请成功(咖啡小程序)
+#define ODS_ORDERSTATUS_COFFEE_CONFIRMED      40006	     //已接单(咖啡小程序)
+#define ODS_ORDERSTATUS_COFFEE_DONE           40007	     //已完成(咖啡小程序)
+#define ODS_ORDERSTATUS_COFFEE_SHIPPING       40008	     //配送中(咖啡小程序)
+#define ODS_ORDERSTATUS_COFFEE_MAKED          40010	     //制作完成(咖啡小程序)
 
 
 //推送类型

src/JsonModule.cpp

@@ -941,7 +941,8 @@ bool JsonModule::convertDataPos2Ods(const std::string &data, std::string &result
         || fm_cmd == OPERATION_POS_APPOINTMENT_REFUND
         || fm_cmd == OPERATION_POS_APPOINTMENT_CONFIRM
         || fm_cmd == OPERATION_POS_SCANCODE_DONE
-        || fm_cmd == OPERATION_POS_SCANCODE_REFUND) {
+        || fm_cmd == OPERATION_POS_SCANCODE_REFUND
+        || fm_cmd == OPERATION_POS_COFFEE_REFUND) {
         result = _convertToAppointmentAndScancodeReqJson(data.data());
         rlt = true;
     }
@@ -1693,6 +1694,30 @@ int JsonModule::_getPOSOrderStatus(int status)
         case ODS_ORDERSTATUS_SCANCODE_PAID:
             rltStatus = ORDERSTATUS_SCANCODE_PAID;
             break;
+        case ODS_ORDERSTATUS_COFFEE_CANCEL:
+            rltStatus = ORDERSTATUS_CANCELED;
+            break;
+        case ODS_ORDERSTATUS_COFFEE_TIMEOUT_CANCEL:
+            rltStatus = ORDERSTATUS_CANCELED;
+            break;
+        case ODS_ORDERSTATUS_COFFEE_PAID:
+            rltStatus = ORDERSTATUS_NEW;
+            break;
+        case ODS_ORDERSTATUS_COFFEE_REFUND_USER:
+            rltStatus = ORDERSTATUS_REFUND_COMPLETE;
+            break;
+        case ODS_ORDERSTATUS_COFFEE_CONFIRMED:
+            rltStatus = ORDERSTATUS_CONFIRMED;
+            break;
+        case ODS_ORDERSTATUS_COFFEE_DONE:
+            rltStatus = ORDERSTATUS_COMPLETE;
+            break;
+        case ODS_ORDERSTATUS_COFFEE_SHIPPING:
+            rltStatus = ORDERSTATUS_SHIPPING;
+            break;
+        case ODS_ORDERSTATUS_COFFEE_MAKED:
+            rltStatus = ORDERSTATUS_CONFIRMED;
+            break;
         default:
             break;
     }
@@ -2123,7 +2148,14 @@ std::string JsonModule::_convertToAppointmentAndScancodeReqJson(IN const char* j
     writer.String(order_id.c_str());
 
     writer.Key("orderStatus");
-    std::string strType = _getODSTypeByPOSReq(reqType);
+    std::string strType;
+    if (reqType== OPERATION_POS_COFFEE_REFUND) {
+        strType = std::to_string(PLUGIN_TO_ODS_COFFEE_REFUND);
+    }
+    else {
+        strType = _getODSTypeByPOSReq(reqType);
+    }
+    
     writer.String(strType.c_str());
 
     writer.EndObject();

src/main.cpp

@@ -19,7 +19,7 @@
 
 INITIALIZE_EASYLOGGINGPP
 
-#define VERSION         "1.0.7"     //版本号
+#define VERSION         "1.0.7 beta 1"     //版本号
 
 std::string g_init_data;
 std::string g_init_data_ods_back;