Skip to content

T
takeout_sbk
You need to sign in or sign up before continuing.
Commit 53f66b32 by wuyang.zou
Options

1. 完善WSG相关代码 

Version 2.2020.5.21
parent bc2bf128
Pipeline #21508 failed with stage
in 13 seconds
Showing with 20 additions and 26 deletions
fmTakeout/Control/flowControl.cpp
...@@ -2095,7 +2095,9 @@ bool FlowControl::_ResponseSimphony05Request(const QJsonObject &content, QJsonOb ...@@ -2095,7 +2095,9 @@ bool FlowControl::_ResponseSimphony05Request(const QJsonObject &content, QJsonOb
/***** 更新 POS本地数据库的商品数据是否成功；begin:*********/ /***** 更新 POS本地数据库的商品数据是否成功；begin:*********/
int retSyncOrderProductInfo = 1; //默认是同步POS商品数据成功; 目前只有 businessType: 20:WSG-杯贴祝福; 30: 拼团; int retSyncOrderProductInfo = 1; //默认是同步POS商品数据成功; 目前只有 businessType: 20:WSG-杯贴祝福; 30: 拼团;
if (order_p && ("20"==order_p->businessType || "30"==order_p->businessType) ) { if (order_p && ( "30"==order_p->businessType ||
("WSG-MOD" == order_p->channel && "4" == order_p->platformSource)
) ) {
if ( PrintCupStickPosDB ::getInstance().isOrderProductExist(orderId) ) { if ( PrintCupStickPosDB ::getInstance().isOrderProductExist(orderId) ) {
if (!PrintCupStickPosDB::getInstance().updateOrderProduct(order_p, posCheckNo) ) if (!PrintCupStickPosDB::getInstance().updateOrderProduct(order_p, posCheckNo) )
retSyncOrderProductInfo = 0; retSyncOrderProductInfo = 0;
...@@ -2612,13 +2614,9 @@ bool FlowControl::_ResponseSimReqFristOrderData(const QJsonObject &content, QJso ...@@ -2612,13 +2614,9 @@ bool FlowControl::_ResponseSimReqFristOrderData(const QJsonObject &content, QJso
// OMS提供的数据://订单渠道: 星巴克-MOD,百度外卖,饿了么APP,美团外卖,星巴克-MOP; // OMS提供的数据://订单渠道: 星巴克-MOD,百度外卖,饿了么APP,美团外卖,星巴克-MOP;
// MOD渠道对应的业务逻辑 ; // MOD渠道对应的业务逻辑 ;
else if ( "MOD" == orderObject->channel ) { else if ( "MOD" == orderObject->channel ) {
// platformSource:平台来源:1 app; 2 ele; 3 ors; 4 WeChat 【businessType:10-预约 20-WSG, 30-拼团】; 5 口碑; // platformSource:平台来源:1 app; 2 ele; 3 ors; 4 WeChat ; 5 口碑;
if ( "4" == orderObject->platformSource ) { if ( "4" == orderObject->platformSource ) {
if ( "20" == orderObject->businessType ) {
tempOrderType = 31;
}else {
tempOrderType = 27; tempOrderType = 27;
}
} else { } else {
tempOrderType = 9; tempOrderType = 9;
} }
...@@ -2649,7 +2647,7 @@ bool FlowControl::_ResponseSimReqFristOrderData(const QJsonObject &content, QJso ...@@ -2649,7 +2647,7 @@ bool FlowControl::_ResponseSimReqFristOrderData(const QJsonObject &content, QJso
} // 兼容渠道名称不统一问题 } // 兼容渠道名称不统一问题
else if ( "WSG-MOD" == orderObject->channel ) { else if ( "WSG-MOD" == orderObject->channel ) {
// platformSource:平台来源:1 app; 2 ele; 3 ors; 4 WeChat 【businessType:10-预约, 30-拼团】; 5 口碑; // platformSource:平台来源:1 app; 2 ele; 3 ors; 4 WeChat; 5 口碑;
if ( "4" == orderObject->platformSource ) { if ( "4" == orderObject->platformSource ) {
tempOrderType = 31; tempOrderType = 31;
} else { } else {
...@@ -2722,20 +2720,16 @@ bool FlowControl::_ResponseSimReqFristOrderData(const QJsonObject &content, QJso ...@@ -2722,20 +2720,16 @@ bool FlowControl::_ResponseSimReqFristOrderData(const QJsonObject &content, QJso
tempOrderType = 16; tempOrderType = 16;
} }
else if ( "MOD" == orderObject->channel ) { else if ( "MOD" == orderObject->channel ) {
// platformSource:平台来源:1 app; 2 ele; 3 ors; 4 WeChat【businessType:10-预约 20-WSG, 30-拼团】; 5 口碑; // platformSource:平台来源:1 app; 2 ele; 3 ors; 4 WeChat; 5 口碑;
if ( "4" == orderObject->platformSource ) { if ( "4" == orderObject->platformSource ) {
if ( "20" == orderObject->businessType ) { tempOrderType = 28;
tempOrderType = 32;
}else {
tempOrderType = 28;
}
} else { } else {
tempOrderType = 17; tempOrderType = 17;
} }
} // 兼容渠道名称不统一问题 } // 兼容渠道名称不统一问题
else if ( "WSG-MOD" == orderObject->channel ) { else if ( "WSG-MOD" == orderObject->channel ) {
// platformSource:平台来源:1 app; 2 ele; 3 ors; 4 WeChat 【businessType:10-预约, 30-拼团】; 5 口碑; // platformSource:平台来源:1 app; 2 ele; 3 ors; 4 WeChat; 5 口碑;
if ( "4" == orderObject->platformSource ) { if ( "4" == orderObject->platformSource ) {
tempOrderType = 32; tempOrderType = 32;
} else { } else {
......
fmTakeout/DTools/printCupStickPosDB.cpp
...@@ -135,8 +135,7 @@ bool PrintCupStickPosDB::insertOrderProduct(OrderObject* orderObj,const QString& ...@@ -135,8 +135,7 @@ bool PrintCupStickPosDB::insertOrderProduct(OrderObject* orderObj,const QString&
/**********************************************************************************/ /**********************************************************************************/
/********************* WSG-杯贴祝福-商品券号关联数据; **************************/ /********************* WSG-杯贴祝福-商品券号关联数据; **************************/
if ( ("WSG-MOD" == orderObj->channel && "4" == orderObj->platformSource ) if ( "WSG-MOD" == orderObj->channel && "4" == orderObj->platformSource ) {
|| ("MOD" == orderObj->channel && "4" == orderObj->platformSource && "20" == orderObj->businessType ) ) {
for (int i=0; i < orderObj->coupList.count(); i++) { for (int i=0; i < orderObj->coupList.count(); i++) {
CouponsObject* coupon = orderObj->coupList.at(i); CouponsObject* coupon = orderObj->coupList.at(i);
......
fmTakeout/DTools/printSumBillPosDB.cpp
...@@ -574,13 +574,16 @@ bool PrintSumBillPosDB::insertOrderSumBill(OrderObject* orderObj,const QString& ...@@ -574,13 +574,16 @@ bool PrintSumBillPosDB::insertOrderSumBill(OrderObject* orderObj,const QString&
// 与 oms协定此块业务出现 歧异 故在此处转换; // 与 oms协定此块业务出现 歧异 故在此处转换;
int tempBusinessType = orderObj->businessType.toInt(); int tempBusinessType = orderObj->businessType.toInt();
if ( "WSG-MOD" == orderObj->channel && "4" == orderObj->platformSource) if ( "WSG-MOD" == orderObj->channel && "4" == orderObj->platformSource)
tempBusinessType = 30; tempBusinessType = 20;
query.addBindValue( tempBusinessType ); // --订单业务类型: 10:预约单 20:WSG-杯贴祝福 30:拼单 query.addBindValue( tempBusinessType ); // --订单业务类型: 10:预约单 20:WSG-杯贴祝福 30:拼单
query.addBindValue(orderObj->appointedTime); // -- query.addBindValue(orderObj->appointedTime); // --
query.addBindValue(orderObj->appointedRemindTemplate); query.addBindValue(orderObj->appointedRemindTemplate);
query.addBindValue(orderObj->orderType); query.addBindValue(orderObj->orderType);
query.addBindValue(orderObj->channel);
QString tempChannel = ("WSG-MOD" == orderObj->channel)?"MOD" :orderObj->channel;
query.addBindValue(tempChannel);
query.addBindValue(orderObj->platformSource); query.addBindValue(orderObj->platformSource);
query.addBindValue(orderObj->payWay); query.addBindValue(orderObj->payWay);
query.addBindValue(orderObj->customerId); query.addBindValue(orderObj->customerId);
......
fmTakeout/Model/orderObject.cpp
...@@ -134,9 +134,7 @@ QString OrderObject::getChannelName() ...@@ -134,9 +134,7 @@ QString OrderObject::getChannelName()
QLOG_INFO() << QString("[<<<<---OrderObject:getChannelName [%1]--->>>>]").arg(channel); QLOG_INFO() << QString("[<<<<---OrderObject:getChannelName [%1]--->>>>]").arg(channel);
if ("MOD" == channel && 3 != orderType) { if ("MOD" == channel && 3 != orderType) {
if ( "4" == platformSource ) { if ( "4" == platformSource ) {
if ("20" == businessType) { if ( "30" == businessType) {
return QString::fromLocal8Bit("微信用星说");
} else if ( "30" == businessType) {
return QString::fromLocal8Bit("拼单-MOD"); return QString::fromLocal8Bit("拼单-MOD");
} }
return QString::fromLocal8Bit("微信-MOD"); return QString::fromLocal8Bit("微信-MOD");
......
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,2020,5,12 FILEVERSION 2,2020,5,21
PRODUCTVERSION 2,2020,5,12 PRODUCTVERSION 2,2020,5,21
//*************************************************************************// //*************************************************************************//
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.2020.5.12" VALUE "ProductVersion", "2.2020.5.21"
VALUE "FileVersion", "2.2020.5.12" VALUE "FileVersion", "2.2020.5.21"
//*************************************************************************// //*************************************************************************//
END END
END END
......
fmTakeout/preDefine.h
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
//#define APP_VERSION "2.2019.916.2" //#define APP_VERSION "2.2019.916.2"
//#define APP_VERSION "2.2020.26.1" //#define APP_VERSION "2.2020.26.1"
//#define APP_VERSION "2.2020.312.1" //#define APP_VERSION "2.2020.312.1"
#define APP_VERSION "2.2020.5.12" #define APP_VERSION "2.2020.5.21"
//修正版本号时,切记修正 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