Skip to content

T
takeout_sbk
Commit 1ba5e648 by wuyang.zou
Options

<1> 支持 WSG-MOP 美好咖啡; [OK] 

<2> 插件支持获取 o2o-fulfillment(EC-MOP)新履约链路的订单(订单列表) [ok];
<3> 兼容上一版本(未测试发版): Aliy CallBackUrl;
parent c0567f97
Showing with 168 additions and 22 deletions
fmTakeout/Control/flowControl.cpp
...@@ -63,6 +63,7 @@ FlowControl::FlowControl() ...@@ -63,6 +63,7 @@ FlowControl::FlowControl()
m_pullDishesSocket = nullptr; m_pullDishesSocket = nullptr;
m_pullOrderListSocket = nullptr; m_pullOrderListSocket = nullptr;
m_orderCount = 0; m_orderCount = 0;
m_o2ofulfillmentOrderCount = 0;
m_serviceCallBackUrl = ""; m_serviceCallBackUrl = "";
m_clearTimer=new QTimer(this); m_clearTimer=new QTimer(this);
...@@ -198,7 +199,7 @@ void FlowControl::_GetIpAddress() ...@@ -198,7 +199,7 @@ void FlowControl::_GetIpAddress()
} }
void FlowControl::_AddOrderPull(const QString &orderId, const QString &channel, const int &pageNumber, const int &pageSize) void FlowControl::_AddOrderPull(const QString &orderId, const QString &channel, const QString& callBackUrl, const int &pageNumber, const int &pageSize)
{ {
bool btryLock = m_PullOrderDataMutex.tryLock(VALUE_TRYLOCKNETTIMEOUT); bool btryLock = m_PullOrderDataMutex.tryLock(VALUE_TRYLOCKNETTIMEOUT);
if (btryLock) { if (btryLock) {
...@@ -208,8 +209,9 @@ void FlowControl::_AddOrderPull(const QString &orderId, const QString &channel, ...@@ -208,8 +209,9 @@ void FlowControl::_AddOrderPull(const QString &orderId, const QString &channel,
orderPull->channel=channel; orderPull->channel=channel;
orderPull->pageNumber=pageNumber; orderPull->pageNumber=pageNumber;
orderPull->pageSize=pageSize; orderPull->pageSize=pageSize;
orderPull->callBackUrl=callBackUrl;
orderPull->pullErrorCount = 0; orderPull->pullErrorCount = 0;
QLOG_INFO()<<QString::fromLocal8Bit("[<<<<---FlowControl::_AddOrderPull orderId:%1--->>>>]").arg(orderId); QLOG_INFO()<<QString::fromLocal8Bit("[<<<<---FlowControl::_AddOrderPull orderId: %1 , callBackUrl: %2--->>>>]").arg(orderId).arg(callBackUrl);
m_orderPullList.append(orderPull); m_orderPullList.append(orderPull);
m_PullOrderDataMutex.unlock(); m_PullOrderDataMutex.unlock();
}else { }else {
...@@ -764,7 +766,21 @@ bool FlowControl::_Login() ...@@ -764,7 +766,21 @@ bool FlowControl::_Login()
<<m_initPmsGetStoreConfigDBRet <<m_initPmsOrdersDataRet; <<m_initPmsGetStoreConfigDBRet <<m_initPmsOrdersDataRet;
emit showAlert(AlertForm::MSGERROR, QString::fromLocal8Bit("尝试打开PMS数据库(StoreConfig**)失败")); emit showAlert(AlertForm::MSGERROR, QString::fromLocal8Bit("尝试打开PMS数据库(StoreConfig**)失败"));
} else { } else {
_AddOrderPull(QString(),QString());
// 获取原生链路的全量订单列表数据;
_AddOrderPull( QString(), QString() );
// 获取 o2ofulfillment 链路的全量订单列表数据;
if ( ConfigManger::GetInstance().GetLoginServerUrl().contains(".stg") ) {
_AddOrderPull( QString(), QString(), GET_O2OFULFILLMENT_STG_CBL );
} else if ( ConfigManger::GetInstance().GetLoginServerUrl().contains(".dev") ) {
_AddOrderPull( QString(), QString(), GET_O2OFULFILLMENT_DEV_CBL );
} else if ( ConfigManger::GetInstance().GetLoginServerUrl().contains(".uat") ) {
_AddOrderPull( QString(), QString(), GET_O2OFULFILLMENT_UAT_CBL );
} else {
_AddOrderPull( QString(), QString(), GET_O2OFULFILLMENT_PRO_CBL );
}
} }
} }
} }
...@@ -810,10 +826,18 @@ void FlowControl::_PullOrderData() ...@@ -810,10 +826,18 @@ void FlowControl::_PullOrderData()
m_orderPullList.removeOne(info); m_orderPullList.removeOne(info);
// 获取 o2ofulfillment 订单列表数据失败3次,之后丢弃 此拉单列表请求 item, 不切换域名重试获取;
if ( info->orderId.isEmpty() && info->callBackUrl.contains("o2ofulfillment") ) {
QLOG_ERROR() << QString("[<<<<---FlowControl::_PullOrderData <o2ofulfillment> Error, And Don't Display Error--->>>>]");
delete info;
m_PullOrderDataMutex.unlock();
return;
}
// 特殊处理: 获取订单列表接口, 默认接口地址拉取失败，则尝试一次从备用OMS 回调地址在此进行拉取; // 特殊处理: 获取订单列表接口, 默认接口地址拉取失败，则尝试一次从备用OMS 回调地址在此进行拉取;
if ( info->orderId.isEmpty() && m_serviceCallBackUrl.length() && info->callBackUrl != m_serviceCallBackUrl ) { if ( info->orderId.isEmpty() && m_serviceCallBackUrl.length() && info->callBackUrl != m_serviceCallBackUrl ) {
info->callBackUrl = m_serviceCallBackUrl; info->callBackUrl = m_serviceCallBackUrl;
info->pullErrorCount = 0; // Pull Error Must Rest Zero, Or No Change Goto Pull All Order; info->pullErrorCount = 0; // Pull Error Must Rest Zero, Or No Chance Goto Pull All Order;
m_orderPullList.append(info); m_orderPullList.append(info);
} else { } else {
delete info; delete info;
...@@ -853,7 +877,7 @@ void FlowControl::_PullOrderData() ...@@ -853,7 +877,7 @@ void FlowControl::_PullOrderData()
return ; return ;
} }
bool FlowControl::_PullOrderDetail(const QString& orderId, const QString& channel, const QString &callBackUrl ) bool FlowControl::_PullOrderDetail(const QString& orderId, const QString& channel, const QString &callBackUrl, const bool &skipErrorDisplay )
{ {
if(m_pullOrderSocket==nullptr) if(m_pullOrderSocket==nullptr)
m_pullOrderSocket =new BillSocket(this); m_pullOrderSocket =new BillSocket(this);
...@@ -888,9 +912,11 @@ bool FlowControl::_PullOrderDetail(const QString& orderId, const QString& channe ...@@ -888,9 +912,11 @@ bool FlowControl::_PullOrderDetail(const QString& orderId, const QString& channe
QLOG_INFO() << QString("[<<<<---Pull Order Detail Finsh--->>>>][result:%1][msg:%2]") QLOG_INFO() << QString("[<<<<---Pull Order Detail Finsh--->>>>][result:%1][msg:%2]")
.arg(result).arg(error)<<recvJson; .arg(result).arg(error)<<recvJson;
if(!result) { if(!result) {
if ( !skipErrorDisplay ) {
emit setNetStatus(QString::fromLocal8Bit("<font color='#ff0000'>网络不稳定,正在重试</font>")); emit setNetStatus(QString::fromLocal8Bit("<font color='#ff0000'>网络不稳定,正在重试</font>"));
// refresh gui defaultStoreStatus; // refresh gui defaultStoreStatus;
emit doUpdateStoreStatus(0,0,0); emit doUpdateStoreStatus(0,0,0);
}
} else { } else {
qDebug()<<recvJson; qDebug()<<recvJson;
emit setNetStatus(QString::fromLocal8Bit("正常")); emit setNetStatus(QString::fromLocal8Bit("正常"));
...@@ -898,7 +924,9 @@ bool FlowControl::_PullOrderDetail(const QString& orderId, const QString& channe ...@@ -898,7 +924,9 @@ bool FlowControl::_PullOrderDetail(const QString& orderId, const QString& channe
{ {
QString error = recvJson[JSON_ERRMSG].toString(); QString error = recvJson[JSON_ERRMSG].toString();
QLOG_ERROR() << QString("[<<<<---Pull Order Detail Error--->>>>][msg->%1]").arg(error); QLOG_ERROR() << QString("[<<<<---Pull Order Detail Error--->>>>][msg->%1]").arg(error);
if ( !skipErrorDisplay ) {
emit showAlert(AlertForm::MSGERROR, QString::fromLocal8Bit("获取订单失败![%1]").arg(error)); emit showAlert(AlertForm::MSGERROR, QString::fromLocal8Bit("获取订单失败![%1]").arg(error));
}
result=false; result=false;
} else { } else {
QJsonObject order = recvJson[JSON_DATA].toObject(); QJsonObject order = recvJson[JSON_DATA].toObject();
...@@ -950,26 +978,49 @@ bool FlowControl::_PullOrderList(const int &pageSize, const int &pageNo, const Q ...@@ -950,26 +978,49 @@ bool FlowControl::_PullOrderList(const int &pageSize, const int &pageNo, const Q
QLOG_INFO() << QString("[<<<<---FlowControl::_PullOrderList:Pull Order List Finish.--->>>>][result:%1][msg:%2]").arg(result).arg(error)<<recvJson; QLOG_INFO() << QString("[<<<<---FlowControl::_PullOrderList:Pull Order List Finish.--->>>>][result:%1][msg:%2]").arg(result).arg(error)<<recvJson;
if ( !result ) { if ( !result ) {
if ( callBackUrl.length() && callBackUrl.contains("o2ofulfillment") ) {
QLOG_ERROR() << QString("[<<<<---FlowControl::_PullOrderList:Pull Order List <o2ofulfillment> Error, And Don't Display Error--->>>>]");
} else {
emit setNetStatus(QString::fromLocal8Bit("<font color='#ff0000'>网络不稳定，正在重试</font>")); emit setNetStatus(QString::fromLocal8Bit("<font color='#ff0000'>网络不稳定，正在重试</font>"));
// refresh gui defaultStoreStatus; // refresh gui defaultStoreStatus;
emit doUpdateStoreStatus(0,0,0); emit doUpdateStoreStatus(0,0,0);
}
} else { } else {
qDebug()<<recvJson;
emit setNetStatus(QString::fromLocal8Bit("正常")); emit setNetStatus(QString::fromLocal8Bit("正常"));
if(JSON_STATUSCODE_OK != recvJson[JSON_ERRCODE].toInt()) { if(JSON_STATUSCODE_OK != recvJson[JSON_ERRCODE].toInt()) {
QString error = recvJson[JSON_ERRMSG].toString(); QString error = recvJson[JSON_ERRMSG].toString();
QLOG_ERROR() << QString("[<<<<---FlowControl::_PullOrderList:Pull Order List Error--->>>>][msg->%1]").arg(error); QLOG_ERROR() << QString("[<<<<---FlowControl::_PullOrderList:Pull Order List Error--->>>>][msg->%1]").arg(error);
if ( callBackUrl.length() && callBackUrl.contains("o2ofulfillment") ) {
QLOG_ERROR() << QString("[<<<<---FlowControl::_PullOrderList:Pull Order List <o2ofulfillment> Error, And Don't Display Error--->>>>]");
m_o2ofulfillmentOrderCount = 0;
} else {
emit showAlert(AlertForm::MSGERROR, QString::fromLocal8Bit("获取订单失败![%1]").arg(error)); emit showAlert(AlertForm::MSGERROR, QString::fromLocal8Bit("获取订单失败![%1]").arg(error));
result=false;
m_orderCount = 0; m_orderCount = 0;
}
result=false;
} else { } else {
QJsonArray orders = recvJson[JSON_DATA].toObject()[JSON_ORDERS].toArray(); QJsonArray orders = recvJson[JSON_DATA].toObject()[JSON_ORDERS].toArray();
foreach(QJsonValue order, orders) { foreach(QJsonValue order, orders) {
_OrderAnalysis(order.toObject()); _OrderAnalysis(order.toObject());
} }
ordertotalSum=recvJson[JSON_DATA].toObject()[JSON_COUNT].toInt(); ordertotalSum=recvJson[JSON_DATA].toObject()[JSON_COUNT].toInt();
// 1、o2ofulfillment 地址获取订单列表分页操作;
// 2、原生拉取订单列表分页操作;
bool bLocalPullOrderCountNotFull = false;
if ( callBackUrl.length() && callBackUrl.contains("o2ofulfillment") ) {
m_o2ofulfillmentOrderCount += orders.size();
bLocalPullOrderCountNotFull = m_o2ofulfillmentOrderCount < ordertotalSum;
} else {
m_orderCount += orders.size(); m_orderCount += orders.size();
if ( m_orderCount < ordertotalSum ) { bLocalPullOrderCountNotFull = m_orderCount < ordertotalSum;
}
if ( bLocalPullOrderCountNotFull ) {
//避免出现存在多页数据，导致出现死锁: 先调用定时器的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);
...@@ -986,10 +1037,16 @@ bool FlowControl::_PullOrderList(const int &pageSize, const int &pageNo, const Q ...@@ -986,10 +1037,16 @@ bool FlowControl::_PullOrderList(const int &pageSize, const int &pageNo, const Q
//避免出现存在多页数据，导致出现死锁; //避免出现存在多页数据，导致出现死锁;
} else { } else {
//分页拉取订单列表最后一页成功后,需要重置本地拉单计数缓存, 防止影响下一次获取订单列表判断; //分页拉取订单列表最后一页成功后,需要重置本地拉单计数缓存, 防止影响下一次获取订单列表判断;
if ( callBackUrl.length() && callBackUrl.contains("o2ofulfillment") ) {
m_o2ofulfillmentOrderCount = 0;
QLOG_INFO()<<QString::fromLocal8Bit("[<<<<---FlowControl::_PullOrderList < o2ofulfillment > Had Finished: The Last Request PageNo:%1--->>>>]").arg(pageNo);
} 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::fromLocal8Bit("[<<<<---FlowControl::_PullOrderList Had Finished: The Last Request PageNo:%1--->>>>]").arg(pageNo);
} }
} }
}
} }
// 如果出现拉取订单列表失败，触发下一次拉门店有效订单的时间间隔变更为10(如果一开始就获取订单列表成功:时间间隔为2s) // 如果出现拉取订单列表失败，触发下一次拉门店有效订单的时间间隔变更为10(如果一开始就获取订单列表成功:时间间隔为2s)
if(!result) { if(!result) {
...@@ -1905,6 +1962,9 @@ bool FlowControl::_ResponseHttpRequest(const QJsonObject &content,QJsonObject &d ...@@ -1905,6 +1962,9 @@ bool FlowControl::_ResponseHttpRequest(const QJsonObject &content,QJsonObject &d
case 12://推送门店营业状态 case 12://推送门店营业状态
result=_ResponseOMS12Request(content,data,error); result=_ResponseOMS12Request(content,data,error);
break; break;
case 13: //推送 宣导提醒消息
result=_ResponseOMS13Request(content,data,error);
break;
case 21://盒马生鲜 推送订单 case 21://盒马生鲜 推送订单
result=_ResponseHM21Request(content,data,error); result=_ResponseHM21Request(content,data,error);
break; break;
...@@ -2048,6 +2108,38 @@ bool FlowControl::_ResponseOMS12Request(const QJsonObject &content, QJsonObject ...@@ -2048,6 +2108,38 @@ bool FlowControl::_ResponseOMS12Request(const QJsonObject &content, QJsonObject
} }
bool FlowControl::_ResponseOMS13Request(const QJsonObject &content, QJsonObject &data, QString &error)
{
QLOG_INFO()<<__FUNCTION__;
Q_UNUSED(data);
//判断当前POS插件是否登录成功: 如果没有登录成功，尝试在次登录;
QLOG_INFO()<<"FlowControl::_ResponseOMS13Request:"<<content;
bool result = true;
if ( !m_bLoginResult && content.contains("storeId") ) {
result = _ResponseSimReqTryLogin(content,error);
}
//无论插件是否登录成功: 插件接受到消息 则 return true 同时返回有意义的错误信息;
QString noticeTitle = content[JSON_NOTICE_TITLE].toString();
QString noticeContent = content[JSON_NOTICE_CONTENT].toString();
noticeTitle = QString::fromUtf8( noticeTitle.toUtf8() );
noticeContent = QString::fromUtf8( noticeContent.toUtf8() );
// emit showNotice(NoticeForm::ACK_MSG, noticeTitle, noticeContent);
result = true;
if ( !content["storeId"].toString().compare(m_storeId) ) {
error=QString::fromLocal8Bit("插件接受消息成功, 插件目前登陆状态");
} else {
error=QString::fromLocal8Bit("插件接受消息成功, 但插件未登陆成功 或 门店号不匹配");
}
// 待完善, Plugin收到 门店通告消息 后,要想能够在oms侧进行统计，需要通过Plugin 向上游系统进汇报;
return result;
}
bool FlowControl::_ResponseHM21Request(const QJsonObject &content, QJsonObject &data, QString &error) bool FlowControl::_ResponseHM21Request(const QJsonObject &content, QJsonObject &data, QString &error)
{ {
...@@ -2238,7 +2330,21 @@ void FlowControl::onGetOMSAllOrders() ...@@ -2238,7 +2330,21 @@ void FlowControl::onGetOMSAllOrders()
} }
// 类登陆后的获取全部订单动作; // 类登陆后的获取全部订单动作;
QLOG_INFO() << QString(" FlowControl::onGetOMSAllOrders only _AddOrderPull begin."); QLOG_INFO() << QString(" FlowControl::onGetOMSAllOrders only _AddOrderPull begin.");
_AddOrderPull(QString(),QString());
// 获取原生链路的全量订单列表数据;
_AddOrderPull( QString(), QString() );
// 获取 o2ofulfillment 链路的全量订单列表数据;
if ( ConfigManger::GetInstance().GetLoginServerUrl().contains(".stg") ) {
_AddOrderPull( QString(), QString(), GET_O2OFULFILLMENT_STG_CBL );
} else if ( ConfigManger::GetInstance().GetLoginServerUrl().contains(".dev") ) {
_AddOrderPull( QString(), QString(), GET_O2OFULFILLMENT_DEV_CBL );
} else if ( ConfigManger::GetInstance().GetLoginServerUrl().contains(".uat") ) {
_AddOrderPull( QString(), QString(), GET_O2OFULFILLMENT_UAT_CBL );
} else {
_AddOrderPull( QString(), QString(), GET_O2OFULFILLMENT_PRO_CBL );
}
emit showAlert(AlertForm::SYNCDATA, QString::fromLocal8Bit("正在获取平台全部订单,稍后刷新......")); emit showAlert(AlertForm::SYNCDATA, QString::fromLocal8Bit("正在获取平台全部订单,稍后刷新......"));
QLOG_INFO() << QString(" FlowControl::onGetOMSAllOrders only _AddOrderPull end."); QLOG_INFO() << QString(" FlowControl::onGetOMSAllOrders only _AddOrderPull end.");
} }
......
fmTakeout/Control/flowControl.h
...@@ -118,6 +118,7 @@ private: ...@@ -118,6 +118,7 @@ private:
int m_modStoreStatus; int m_modStoreStatus;
bool m_bLastHeartIsError; bool m_bLastHeartIsError;
int m_orderCount; int m_orderCount;
int m_o2ofulfillmentOrderCount;
//订单清除定时器 //订单清除定时器
QTimer *m_clearTimer; QTimer *m_clearTimer;
QTimer *m_heartTimer; QTimer *m_heartTimer;
...@@ -335,7 +336,7 @@ public slots: ...@@ -335,7 +336,7 @@ public slots:
* 参数:[1]订单编号 * 参数:[1]订单编号
* 返回:是否成功 * 返回:是否成功
* */ * */
bool _PullOrderDetail(const QString &orderId, const QString& channel, const QString &callBackUrl); bool _PullOrderDetail(const QString &orderId, const QString& channel, const QString &callBackUrl, const bool &skipErrorDisplay = false );
/* 功能:拉取订单 /* 功能:拉取订单
* 参数:NULL * 参数:NULL
* 返回:是否成功 * 返回:是否成功
...@@ -403,7 +404,7 @@ public slots: ...@@ -403,7 +404,7 @@ public slots:
QString _Penny2Dollar(int penny); QString _Penny2Dollar(int penny);
void _GetIpAddress(); void _GetIpAddress();
void _AddOrderPull(const QString& orderId=0,const QString& channel=0,const int& pageNumber=1,const int& pageSize=30); void _AddOrderPull( const QString& orderId=0, const QString& channel=0, const QString& callBackUrl="", const int& pageNumber=1, const int& pageSize=30 );
// 避免获取较多历史订单的同时，OMS又有推单过来，导致死锁; // 避免获取较多历史订单的同时，OMS又有推单过来，导致死锁;
bool _TryAddOrderPull(const QString &orderId=0, const QString &channel=0, const QString &callBackUrl="", const int &pageNumber=1, const int &pageSize=30); bool _TryAddOrderPull(const QString &orderId=0, const QString &channel=0, const QString &callBackUrl="", const int &pageNumber=1, const int &pageSize=30);
...@@ -591,6 +592,12 @@ public slots: ...@@ -591,6 +592,12 @@ public slots:
**/ **/
bool _ResponseOMS12Request(const QJsonObject &content, QJsonObject &data,QString &error); bool _ResponseOMS12Request(const QJsonObject &content, QJsonObject &data,QString &error);
/**
*功能:FM外卖插件为响应OMS推送 宣导提醒消息 请求[action:13 -> OMS->POS 推送宣导提醒消息]准备返回数据
*参数:1、请求json参数；2、准备返回请求数据的Buff；3、返回错误信息；
*返回:是否准备成功；
**/
bool _ResponseOMS13Request(const QJsonObject &content, QJsonObject &data, QString &error);
/** /**
*功能:FM外卖插件为响应盒马生鲜 推订单请求[action:21]准备返回数据 *功能:FM外卖插件为响应盒马生鲜 推订单请求[action:21]准备返回数据
......
fmTakeout/DTools/pmsOrdersData.cpp
...@@ -52,6 +52,7 @@ PmsOrdersData &PmsOrdersData::getInstance() { ...@@ -52,6 +52,7 @@ PmsOrdersData &PmsOrdersData::getInstance() {
//* App-MOP[18-销售,19-退货] KouBei-MOP[29-销售,30-退货] App-MOD[9-销售,17-退货] 客诉单[12 (无退单)] Wechat-MOD[27-销售, 28-退货 ] //* App-MOP[18-销售,19-退货] KouBei-MOP[29-销售,30-退货] App-MOD[9-销售,17-退货] 客诉单[12 (无退单)] Wechat-MOD[27-销售, 28-退货 ]
//* ELEME[11-销售, 16-退货] ORS[21-实物-销售(实物无退货), 23-配送费-销售, 24-配送费-退货] MOP自测[20-销售(无退单) ] STC[25-未使用] HM[14-已停用]】 //* ELEME[11-销售, 16-退货] ORS[21-实物-销售(实物无退货), 23-配送费-销售, 24-配送费-退货] MOP自测[20-销售(无退单) ] STC[25-未使用] HM[14-已停用]】
//* 无需转换 ServiceType , 已经被其他字段替代;
int PmsOrdersData::convertPosServiceTypeId( const OrderObject* orderObj, const int &OrderStatus ) { int PmsOrdersData::convertPosServiceTypeId( const OrderObject* orderObj, const int &OrderStatus ) {
int tempOrderTypeId = 0; int tempOrderTypeId = 0;
...@@ -219,6 +220,7 @@ bool PmsOrdersData::insertOrderData(OrderObject* orderObj,QString& pmsOrderRef) ...@@ -219,6 +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;
query.addBindValue(tempChannel); // --订单渠道 query.addBindValue(tempChannel); // --订单渠道
query.addBindValue(orderObj->orderType); // --订单类型 query.addBindValue(orderObj->orderType); // --订单类型
...@@ -281,7 +283,7 @@ bool PmsOrdersData::insertOrderData(OrderObject* orderObj,QString& pmsOrderRef) ...@@ -281,7 +283,7 @@ bool PmsOrdersData::insertOrderData(OrderObject* orderObj,QString& pmsOrderRef)
// 与 oms协定此块业务出现 歧异 故在此处转换; 【与PMS协定: businessType -> 10: 预约; 20: WSG-用星说: 21: WSG-美好咖啡; 30: 拼团】 // 与 oms协定此块业务出现 歧异 故在此处转换; 【与PMS协定: businessType -> 10: 预约; 20: WSG-用星说: 21: WSG-美好咖啡; 30: 拼团】
int tempBusinessType = orderObj->businessType.toInt(); int tempBusinessType = orderObj->businessType.toInt();
if ( "WSG-MOD" == orderObj->channel && "4" == orderObj->platformSource) { if ( ( "WSG-MOD" == orderObj->channel || "WSG-MOP" == orderObj->channel ) && "4" == orderObj->platformSource) {
if ( 1 == orderObj->isGiftitForward ) if ( 1 == orderObj->isGiftitForward )
tempBusinessType = 21; tempBusinessType = 21;
else else
...@@ -338,7 +340,7 @@ bool PmsOrdersData::insertOrderData(OrderObject* orderObj,QString& pmsOrderRef) ...@@ -338,7 +340,7 @@ bool PmsOrdersData::insertOrderData(OrderObject* orderObj,QString& pmsOrderRef)
pmsOrderRef = query.lastInsertId().toString(); pmsOrderRef = query.lastInsertId().toString();
QString ProInIdRef; QString ProInIdRef;
if ( "WSG-MOD" == orderObj->channel && "4" == orderObj->platformSource ) { if ( ( "WSG-MOD" == orderObj->channel || "WSG-MOP" == orderObj->channel ) && "4" == orderObj->platformSource ) {
result = insertConponData(orderObj->coupList, orderObj->id, ProInIdRef); result = insertConponData(orderObj->coupList, orderObj->id, ProInIdRef);
}else { }else {
result = insertProductData(orderObj->proList, orderObj->id, ProInIdRef); result = insertProductData(orderObj->proList, orderObj->id, ProInIdRef);
......
fmTakeout/Model/orderObject.cpp
...@@ -155,10 +155,21 @@ QString OrderObject::getChannelName() ...@@ -155,10 +155,21 @@ QString OrderObject::getChannelName()
return QString::fromLocal8Bit("美团-MOD"); return QString::fromLocal8Bit("美团-MOD");
} }
} else if("WSG-MOD" == channel ) { // 兼容渠道名称不统一问题 } else if ("WSG-MOD" == channel ) { // 兼容渠道名称不统一问题
return QString::fromLocal8Bit("微信用星说"); if ( 1 == isGiftitForward ) {
return QString::fromLocal8Bit("美好咖啡");
} else {
return QString::fromLocal8Bit("用星说");
}
} else if ("WSG-MOP" == channel) {
if ( 1 == isGiftitForward ) {
return QString::fromLocal8Bit("美好咖啡");
} else {
return QString::fromLocal8Bit("WSG-MOP");
}
}else if("ELE" == channel){ } else if ("ELE" == channel) {
if ( 7 == orderType ) { if ( 7 == orderType ) {
return QString::fromLocal8Bit("预-饿了么-当日"); return QString::fromLocal8Bit("预-饿了么-当日");
} else if ( 11 == orderType ) { } else if ( 11 == orderType ) {
...@@ -167,7 +178,7 @@ QString OrderObject::getChannelName() ...@@ -167,7 +178,7 @@ QString OrderObject::getChannelName()
return QString::fromLocal8Bit("饿了么"); return QString::fromLocal8Bit("饿了么");
} }
}else if( "MOP" == channel ){ } else if( "MOP" == channel ) {
if (4 == orderType ) { if (4 == orderType ) {
return QString::fromLocal8Bit("星-自测"); return QString::fromLocal8Bit("星-自测");
} else if ( 7 == orderType ) { } else if ( 7 == orderType ) {
...@@ -190,6 +201,15 @@ QString OrderObject::getChannelName() ...@@ -190,6 +201,15 @@ QString OrderObject::getChannelName()
} }
} }
} else if ( "MT-MOP" == channel ) {
if ( 7 == orderType ) {
return QString::fromLocal8Bit("预-美团-当日");
} else if ( 11 == orderType ) {
return QString::fromLocal8Bit("预-美团-隔日");
} else {
return QString::fromLocal8Bit("美团-MOP");
}
} else if ( "EC-MOP" == channel ){ } else if ( "EC-MOP" == channel ){
return QString::fromLocal8Bit("电商MOP"); return QString::fromLocal8Bit("电商MOP");
......
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,1,18 FILEVERSION 4,2022,3,3
PRODUCTVERSION 4,2022,1,18 PRODUCTVERSION 4,2022,3,3
//*************************************************************************// //*************************************************************************//
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.1.18" VALUE "ProductVersion", "4.2022.3.3"
VALUE "FileVersion", "4.2022.1.18" VALUE "FileVersion", "4.2022.3.3"
//*************************************************************************// //*************************************************************************//
END END
END END
......
fmTakeout/preDefine.h
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
//#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.1.18" #define APP_VERSION "4.2022.3.3"
//修正版本号时,切记修正 FmTakeout.rc 中的版本号 //修正版本号时,切记修正 FmTakeout.rc 中的版本号
#define SERVER_PASSWORD "posoperator@freemud.cn" #define SERVER_PASSWORD "posoperator@freemud.cn"
...@@ -70,6 +70,10 @@ ...@@ -70,6 +70,10 @@
#define JSON_ELESTORESTS "eleStoreStatus" #define JSON_ELESTORESTS "eleStoreStatus"
#define JSON_MODSTORESTS "modStoreStatus" #define JSON_MODSTORESTS "modStoreStatus"
#define JSON_MOPSTORESTS "mopStoreStatus" #define JSON_MOPSTORESTS "mopStoreStatus"
#define JSON_MTMODSTORESTS "mtModStoreStatus"
#define JSON_NOTICE_TITLE "noticeTitle"
#define JSON_NOTICE_CONTENT "noticeContent"
#define JSON_SKIPRECORDPOS "skipRecord"
#define JSON_PASSWORD "password" #define JSON_PASSWORD "password"
#define JSON_IPADDRESS "iPAddress" #define JSON_IPADDRESS "iPAddress"
#define JSON_IP_ADDRESS "ipAddress" #define JSON_IP_ADDRESS "ipAddress"
...@@ -287,4 +291,11 @@ ...@@ -287,4 +291,11 @@
#define OPENSTORE 1 #define OPENSTORE 1
#define CLOSESTORE 2 #define CLOSESTORE 2
// o2ofulfillment 履约服务 CallBackUrl 地址;
#define GET_O2OFULFILLMENT_STG_CBL "https://o2ofulfillment.stg.starbucks.net/fulfillment/pos"
#define GET_O2OFULFILLMENT_PRO_CBL "https://o2ofulfillment.starbucks.net/fulfillment/pos"
#define GET_O2OFULFILLMENT_UAT_CBL "https://o2ofulfillment.uat.starbucks.net/fulfillment/pos"
#define GET_O2OFULFILLMENT_DEV_CBL "https://o2ofulfillment.dev.starbucks.net/fulfillment/pos"
#define GET_O2OFULFILLMENT_GRAY_CBL "https://o2ofulfillment.gray.starbucks.net/fulfillment/pos"
#endif // PREDEFINE_H #endif // PREDEFINE_H
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