Skip to content

T
takeout_sbk
Commit 16c60a45 by wuyang.zou
Options

<1> 根据POS逻辑调整 顾客性别存储逻辑; 

<2> PCS插件优化履约拉订单列表逻辑;
<3> PCS插件渠道 MT-MOP 订单转换为 MOP;

Version: 4.2022.4.11
parent 1ba5e648
Showing with 25 additions and 25 deletions
fmTakeout/Control/SocketCommunicate.cpp
...@@ -193,7 +193,7 @@ bool SocketCommunicate::connectTcpSvr() ...@@ -193,7 +193,7 @@ bool SocketCommunicate::connectTcpSvr()
QVariantMap tmpMap; QVariantMap tmpMap;
tmpMap.insert(JSON_TCP_DEVICE_ID , _macAddress); tmpMap.insert(JSON_TCP_DEVICE_ID , _macAddress);
tmpMap.insert(JSON_TCP_DEVICE_HOST_NAME , _hostName); tmpMap.insert(JSON_TCP_DEVICE_HOST_NAME , _hostName);
tmpMap.insert(JSON_TCP_DEVICE_WORKS_NUM , _workStationNum); // tmpMap.insert(JSON_TCP_DEVICE_WORKS_NUM , _workStationNum); // PCS Plugin Can't Self Define Works Num;
tmpMap.insert(JSON_TCP_DEVICE_IP , _localIp); tmpMap.insert(JSON_TCP_DEVICE_IP , _localIp);
tmpMap.insert(JSON_TCP_DEVICE_PORT , _localPort); tmpMap.insert(JSON_TCP_DEVICE_PORT , _localPort);
tmpMap.insert(JSON_TCP_DEVICE_TYPE , "pcsPlugin"); tmpMap.insert(JSON_TCP_DEVICE_TYPE , "pcsPlugin");
......
fmTakeout/Control/SocketCommunicate.h
...@@ -282,11 +282,11 @@ private: ...@@ -282,11 +282,11 @@ private:
return; return;
} }
DATAHEAD_INIT( head, DEFT_MAGIC , DEFT_VERSION, 0, CMD_RECV_HEARTBEAT_REQ, 0, 4 ); DATAHEAD_INIT( head, DEFT_MAGIC , DEFT_VERSION, 0, CMD_SEND_HEARTBEAT_REQ, 0, 4 );
memcpy(buf, (void *)&head, sizeof(Data_Head)); memcpy(buf, (void *)&head, sizeof(Data_Head));
// 在消息头后, 填充消息内容 // 在消息头后, 填充消息内容
memcpy(buf + sizeof(Data_Head) , "pong", 4); memcpy(buf + sizeof(Data_Head) , "ping", 4);
data = QByteArray(buf, sizeof(Data_Head) + 4); data = QByteArray(buf, sizeof(Data_Head) + 4);
free(buf); free(buf);
...@@ -367,16 +367,12 @@ private: ...@@ -367,16 +367,12 @@ private:
static bool getJsonFormatLoginReq(QVariantMap map, QJsonObject &json ) static bool getJsonFormatLoginReq(QVariantMap map, QJsonObject &json )
{ {
Q_UNUSED(json);
if(!map.contains(JSON_STOREID)) if(!map.contains(JSON_STOREID))
return false; return false;
json = QJsonDocument::fromJson( QJsonDocument::fromVariant( QVariant(map) ).toJson() ).object();
json.insert(JSON_TCP_DEVICE_ID, map[JSON_TCP_DEVICE_ID].toString()); /* JSON_TCP_DEVICE_ID JSON_TCP_DEVICE_IP JSON_TCP_DEVICE_PORT JSON_TCP_DEVICE_TYPE
json.insert(JSON_TCP_DEVICE_IP, map[JSON_TCP_DEVICE_IP].toString()); * JSON_TCP_DEVICE_VER JSON_STOREID */
json.insert(JSON_TCP_DEVICE_PORT, map[JSON_TCP_DEVICE_PORT].toString()); QLOG_INFO() << "getJsonFormatLoginReq:: "<< json;
json.insert(JSON_TCP_DEVICE_TYPE, map[JSON_TCP_DEVICE_TYPE].toString());
json.insert(JSON_TCP_DEVICE_VER, map[JSON_TCP_DEVICE_VER].toString());
json.insert(JSON_STOREID, map[JSON_STOREID].toString());
return true; return true;
} }
}; };
......
fmTakeout/Control/flowControl.cpp
...@@ -1020,7 +1020,7 @@ bool FlowControl::_PullOrderList(const int &pageSize, const int &pageNo, const Q ...@@ -1020,7 +1020,7 @@ bool FlowControl::_PullOrderList(const int &pageSize, const int &pageNo, const Q
bLocalPullOrderCountNotFull = m_orderCount < ordertotalSum; bLocalPullOrderCountNotFull = m_orderCount < ordertotalSum;
} }
if ( bLocalPullOrderCountNotFull ) { if ( bLocalPullOrderCountNotFull && orders.size() > 0 ) {
//避免出现存在多页数据，导致出现死锁: 先调用定时器的timeout 触发槽函数:_PullOrderData, //避免出现存在多页数据，导致出现死锁: 先调用定时器的timeout 触发槽函数:_PullOrderData,
//_PullOrderData:内部会有加锁并且会调用分页获取订单函数_AddOrderPull(QString(),QString(),pageNo+1,pageSize): 内部也有加锁，所以导致死锁; //_PullOrderData:内部会有加锁并且会调用分页获取订单函数_AddOrderPull(QString(),QString(),pageNo+1,pageSize): 内部也有加锁，所以导致死锁;
//_AddOrderPull(QString(),QString(),pageNo+1,pageSize); //_AddOrderPull(QString(),QString(),pageNo+1,pageSize);
...@@ -1039,10 +1039,10 @@ bool FlowControl::_PullOrderList(const int &pageSize, const int &pageNo, const Q ...@@ -1039,10 +1039,10 @@ bool FlowControl::_PullOrderList(const int &pageSize, const int &pageNo, const Q
//分页拉取订单列表最后一页成功后,需要重置本地拉单计数缓存, 防止影响下一次获取订单列表判断; //分页拉取订单列表最后一页成功后,需要重置本地拉单计数缓存, 防止影响下一次获取订单列表判断;
if ( callBackUrl.length() && callBackUrl.contains("o2ofulfillment") ) { if ( callBackUrl.length() && callBackUrl.contains("o2ofulfillment") ) {
m_o2ofulfillmentOrderCount = 0; m_o2ofulfillmentOrderCount = 0;
QLOG_INFO()<<QString::fromLocal8Bit("[<<<<---FlowControl::_PullOrderList < o2ofulfillment > Had Finished: The Last Request PageNo:%1--->>>>]").arg(pageNo); QLOG_INFO()<<QString("[<<<<---FlowControl::_PullOrderList < o2ofulfillment > Had Finished: The Last Request PageNo:%1, Last Get Orders =%2 --->>>>]").arg( pageNo ).arg( orders.size() );
} else { } else {
m_orderCount = 0; m_orderCount = 0;
QLOG_INFO()<<QString::fromLocal8Bit("[<<<<---FlowControl::_PullOrderList Had Finished: The Last Request PageNo:%1--->>>>]").arg(pageNo); QLOG_INFO()<<QString("[<<<<---FlowControl::_PullOrderList Had Finished: The Last Request PageNo:%1, Last Get Orders =%2 --->>>>]").arg( pageNo ).arg( orders.size() );
} }
} }
...@@ -1507,6 +1507,7 @@ void FlowControl::_ReportOMSRecordOrderInfo() ...@@ -1507,6 +1507,7 @@ void FlowControl::_ReportOMSRecordOrderInfo()
sendJson.insert(JSON_POS_MAC_ADDRESS, m_posMacAddress); sendJson.insert(JSON_POS_MAC_ADDRESS, m_posMacAddress);
// sendJson.insert(JSON_POS_PLUGIN_VERSION, RepOMSRecOrderIn->posPluginVersion); // sendJson.insert(JSON_POS_PLUGIN_VERSION, RepOMSRecOrderIn->posPluginVersion);
sendJson.insert(JSON_PMSMACHINENO,m_pmsMachineNo); sendJson.insert(JSON_PMSMACHINENO,m_pmsMachineNo);
sendJson.insert(JSON_TCP_DEVICE_TYPE , "pcsPlugin");
QString orderNoTemp = RepOMSRecOrderIn->orderNo; QString orderNoTemp = RepOMSRecOrderIn->orderNo;
...@@ -1892,7 +1893,7 @@ void FlowControl::_CrondClearExpireOrder() ...@@ -1892,7 +1893,7 @@ void FlowControl::_CrondClearExpireOrder()
// 清理汇报入机结果的列表; // 清理汇报入机结果的列表;
if ( !m_orderRecordRepOMSList.isEmpty() ) { if ( !m_orderRecordRepOMSList.isEmpty() ) {
bool btryLock = m_RepOMSRecordOrderMutex.tryLock(VALUE_TRYLOCKNETTIMEOUT); bool btryLock = m_RepOMSRecordOrderMutex.tryLock(VALUE_TRYLOCKMEMTIMEOUT);
if ( !btryLock ) { //加锁失败后，直接return; if ( !btryLock ) { //加锁失败后，直接return;
QLOG_INFO()<<"[<<<<----FlowControl::_ReportOMSRecordOrderInfo tryLock Failed ---->>>>>]"; QLOG_INFO()<<"[<<<<----FlowControl::_ReportOMSRecordOrderInfo tryLock Failed ---->>>>>]";
} else { } else {
......
fmTakeout/DTools/pmsOrdersData.cpp
...@@ -220,7 +220,7 @@ bool PmsOrdersData::insertOrderData(OrderObject* orderObj,QString& pmsOrderRef) ...@@ -220,7 +220,7 @@ bool PmsOrdersData::insertOrderData(OrderObject* orderObj,QString& pmsOrderRef)
query.addBindValue(updateTimeString); // --订单更新时间 query.addBindValue(updateTimeString); // --订单更新时间
QString tempChannel = ("WSG-MOD"==orderObj->channel) ? "MOD" : orderObj->channel; QString tempChannel = ("WSG-MOD"==orderObj->channel) ? "MOD" : orderObj->channel;
tempChannel = ("WSG-MOP" == tempChannel ) ? "MOP" : tempChannel; tempChannel = ( "WSG-MOP" == tempChannel || "MT-MOP" == tempChannel ) ? "MOP" : tempChannel;
query.addBindValue(tempChannel); // --订单渠道 query.addBindValue(tempChannel); // --订单渠道
query.addBindValue(orderObj->orderType); // --订单类型 query.addBindValue(orderObj->orderType); // --订单类型
...@@ -259,12 +259,14 @@ bool PmsOrdersData::insertOrderData(OrderObject* orderObj,QString& pmsOrderRef) ...@@ -259,12 +259,14 @@ bool PmsOrdersData::insertOrderData(OrderObject* orderObj,QString& pmsOrderRef)
query.addBindValue(orderObj->cancelReason); // --取消原因 cancelReason; query.addBindValue(orderObj->cancelReason); // --取消原因 cancelReason;
query.addBindValue(orderObj->confirmTime); // --确认订单时间 confirmTime; query.addBindValue(orderObj->confirmTime); // --确认订单时间 confirmTime;
query.addBindValue(orderObj->customerId); // --消费者ID; query.addBindValue(orderObj->customerId); // --消费者ID;
QString temp_customerSex; QString temp_customerSex = "";
if( !orderObj->customerSex.compare(QString::fromLocal8Bit(FM_MALE)) || !orderObj->customerSex.compare(QString("Male")) ){ if ( !orderObj->customerSex.compare(QString::fromLocal8Bit(FM_MALE)) || !orderObj->customerSex.compare(QString("Male")) ) {
temp_customerSex = "Male"; temp_customerSex = "Male";
}else if( !orderObj->customerSex.compare(QString::fromLocal8Bit(FM_FEMALE)) || !orderObj->customerSex.compare(QString("Female")) ){ } else if ( !orderObj->customerSex.compare(QString::fromLocal8Bit(FM_FEMALE)) || !orderObj->customerSex.compare(QString("Female")) ){
temp_customerSex = "Female"; temp_customerSex = "Female";
}else{ temp_customerSex = ""; } } else if ( orderObj->customerSex.length() ) {
temp_customerSex = orderObj->customerSex;
} else{ temp_customerSex = ""; }
query.addBindValue(temp_customerSex); // --消费者性别; query.addBindValue(temp_customerSex); // --消费者性别;
query.addBindValue(orderObj->waybillId); // --运单号; query.addBindValue(orderObj->waybillId); // --运单号;
query.addBindValue(orderObj->storeId); // --门店号; query.addBindValue(orderObj->storeId); // --门店号;
......
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,2022,3,3 FILEVERSION 4,2022,4,11
PRODUCTVERSION 4,2022,3,3 PRODUCTVERSION 4,2022,4,11
//*************************************************************************// //*************************************************************************//
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.2022.3.3" VALUE "ProductVersion", "4.2022.4.11"
VALUE "FileVersion", "4.2022.3.3" VALUE "FileVersion", "4.2022.4.11"
//*************************************************************************// //*************************************************************************//
END END
END END
......
fmTakeout/preDefine.h
...@@ -16,7 +16,8 @@ ...@@ -16,7 +16,8 @@
//#define APP_VERSION "4.2021.1.8" //#define APP_VERSION "4.2021.1.8"
//#define APP_VERSION "4.2021.5.10" //#define APP_VERSION "4.2021.5.10"
//#define APP_VERSION "4.2021.12.10" //#define APP_VERSION "4.2021.12.10"
#define APP_VERSION "4.2022.3.3" //#define APP_VERSION "4.2022.3.3"
#define APP_VERSION "4.2022.4.11"
//修正版本号时,切记修正 FmTakeout.rc 中的版本号 //修正版本号时,切记修正 FmTakeout.rc 中的版本号
#define SERVER_PASSWORD "posoperator@freemud.cn" #define SERVER_PASSWORD "posoperator@freemud.cn"
......
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