Skip to content

T
takeout_sbk
Commit 215db0a4 by wuyang.zou
Options

fix Bug: 

    配送费没有正常折扣优惠，但是有 Tender B账户优惠: WSG+SVC,将会把这部分B账户优惠金额出现丢失

Verison：2.2021.2.26
parent 2e62a6be
Pipeline #30307 failed with stage
in 0 seconds
Showing with 7 additions and 6 deletions
fmTakeout/Control/flowControl.cpp
...@@ -3055,6 +3055,7 @@ bool FlowControl::_ResponseSimReqFristOrderData(const QJsonObject &content, QJso ...@@ -3055,6 +3055,7 @@ bool FlowControl::_ResponseSimReqFristOrderData(const QJsonObject &content, QJso
} }
tDeliveryDiscountObj.insert("original_price", orderObject->deliveryDiscount); tDeliveryDiscountObj.insert("original_price", orderObject->deliveryDiscount);
products.push_back(tDeliveryDiscountObj); products.push_back(tDeliveryDiscountObj);
}
// 添加B账户优惠促销金额; // 添加B账户优惠促销金额;
if ( orderObject->tenderDeliveryDiscountB > 0 && orderObject->tenderDeliveryDiscountBSku.length() ) { if ( orderObject->tenderDeliveryDiscountB > 0 && orderObject->tenderDeliveryDiscountBSku.length() ) {
QJsonObject tDeliveryDiscountTenderBObj; QJsonObject tDeliveryDiscountTenderBObj;
...@@ -3063,7 +3064,6 @@ bool FlowControl::_ResponseSimReqFristOrderData(const QJsonObject &content, QJso ...@@ -3063,7 +3064,6 @@ bool FlowControl::_ResponseSimReqFristOrderData(const QJsonObject &content, QJso
tDeliveryDiscountTenderBObj.insert("original_price", orderObject->tenderDeliveryDiscountB); tDeliveryDiscountTenderBObj.insert("original_price", orderObject->tenderDeliveryDiscountB);
products.push_back(tDeliveryDiscountTenderBObj); products.push_back(tDeliveryDiscountTenderBObj);
} }
}
//配送费是0元时:需录入配送费[非-MOP(销售退货),非-MOP测试; ]; //配送费是0元时:需录入配送费[非-MOP(销售退货),非-MOP测试; ];
} else if ( 0 == orderObject->deliveryPrice && ( "MOD"==orderObject->channel || "ELE" == orderObject->channel ) ) { } else if ( 0 == orderObject->deliveryPrice && ( "MOD"==orderObject->channel || "ELE" == orderObject->channel ) ) {
QJsonObject tDeliveryFeeZoreObj; QJsonObject tDeliveryFeeZoreObj;
......
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 2,2021,2,22 FILEVERSION 2,2021,2,26
PRODUCTVERSION 2,2021,2,22 PRODUCTVERSION 2,2021,2,26
//*************************************************************************// //*************************************************************************//
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", "fmTakeout.exe" VALUE "OriginalFilename", "fmTakeout.exe"
VALUE "ProductName", "Delivery Order Plugin" VALUE "ProductName", "Delivery Order Plugin"
//***每次修改后编译发版必须变更版本号(preDefine.h中APP_VERSION 需要一致)***// //***每次修改后编译发版必须变更版本号(preDefine.h中APP_VERSION 需要一致)***//
VALUE "ProductVersion", "2.2021.2.22" VALUE "ProductVersion", "2.2021.2.26"
VALUE "FileVersion", "2.2021.2.22" VALUE "FileVersion", "2.2021.2.26"
//*************************************************************************// //*************************************************************************//
END END
END END
......
fmTakeout/preDefine.h
...@@ -33,7 +33,8 @@ ...@@ -33,7 +33,8 @@
//#define APP_VERSION "2.2020.10.27" //#define APP_VERSION "2.2020.10.27"
//#define APP_VERSION "2.2020.12.18" //#define APP_VERSION "2.2020.12.18"
//#define APP_VERSION "2.2021.1.11" //#define APP_VERSION "2.2021.1.11"
#define APP_VERSION "2.2021.2.22" //#define APP_VERSION "2.2021.2.22"
#define APP_VERSION "2.2021.2.26"
//修正版本号时,切记修正 FmTakeout.rc 中的版本号 //修正版本号时,切记修正 FmTakeout.rc 中的版本号
......
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