fix version

1、开放价格的配送费
2、Version：2.2020.8.10

fmTakeout/Control/flowControl.cpp

@@ -3231,9 +3231,9 @@ bool FlowControl::_ResponseSimReqFristOrderData(const QJsonObject &content, QJso
         //向商品列表尾部 添加 配送费项 + 配送费折扣项; 【特别说明:WSG-MOD 配送费及配送费折扣信息存储 coupons中;故在此处排除】
         if ( orderObject->deliveryPrice > 0  && ( "MOD"==orderObject->channel || "ELE" == orderObject->channel ) ) {
             QJsonObject tDeliveryFeeObj;
-            tDeliveryFeeObj.insert("consume_num", orderObject->deliveryPrice/100);
-            tDeliveryFeeObj.insert("pid", "6000101"); //配送费SKU;
-            tDeliveryFeeObj.insert("original_price", 100);
+            tDeliveryFeeObj.insert("consume_num", 1);
+            tDeliveryFeeObj.insert("pid", "710000268"); //配送费SKU变更;  Old: 6000101   -> New:710000268 (此key 不允许设置价格为0，故当配送费为0元时，使用老的key)
+            tDeliveryFeeObj.insert("original_price", orderObject->deliveryPrice);
             products.push_back(tDeliveryFeeObj);
             //星巴克APP/预约系统的支付方式是84; ELE的支付方式是83; [MOP不应该存在配送费且不存在配送费折扣]
             if(orderObject->deliveryDiscount>0 && 84 == tempOrderPayType){
@@ -3252,8 +3252,8 @@ bool FlowControl::_ResponseSimReqFristOrderData(const QJsonObject &content, QJso
         //配送费是0元时:需录入配送费[非-MOP(销售退货),非-MOP测试; ];
         } else if ( 0 == orderObject->deliveryPrice && ( "MOD"==orderObject->channel || "ELE" == orderObject->channel ) ) {
             QJsonObject tDeliveryFeeZoreObj;
-            tDeliveryFeeZoreObj.insert("consume_num", 9);
-            tDeliveryFeeZoreObj.insert("pid","6000101"); //配送费SKU;
+            tDeliveryFeeZoreObj.insert("consume_num", 1);
+            tDeliveryFeeZoreObj.insert("pid","6000101");
             tDeliveryFeeZoreObj.insert("original_price", 0);
             products.push_back(tDeliveryFeeZoreObj);
         }

fmTakeout/fmTakeout.rc

@@ -7,8 +7,8 @@ IDI_ICON   ICON DISCARDABLE "logo.ico"
 #endif
 VS_VERSION_INFO VERSIONINFO
     //***每次修改后编译发版必须变更版本号(preDefine.h中APP_VERSION 需要一致)***//
-    FILEVERSION 2,2020,7,29
-    PRODUCTVERSION 2,2020,7,29
+    FILEVERSION 2,2020,8,10
+    PRODUCTVERSION 2,2020,8,10
     //*************************************************************************//
     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.2020.7.29"
-                VALUE "FileVersion", "2.2020.7.29"
+                VALUE "ProductVersion", "2.2020.8.10"
+                VALUE "FileVersion", "2.2020.8.10"
                 //*************************************************************************//
             END
         END

fmTakeout/preDefine.h

@@ -28,7 +28,7 @@
 //#define APP_VERSION               "2.2020.312.1"
 //#define APP_VERSION               "2.2020.5.26"
 //#define APP_VERSION               "2.2020.6.29"
-#define APP_VERSION               "2.2020.7.29"
+#define APP_VERSION               "2.2020.8.10"
 
 //修正版本号时,切记修正 FmTakeout.rc 中的版本号