Commit d5180297 by wuyang.zou

Fix When m_hurryPrintSum Is True, PosPlugin Refund Order, Db Refund product +…

Fix When m_hurryPrintSum Is True, PosPlugin Refund Order, Db Refund product + promotion + sum + print Data Will Miss

Version: 2.2021.5.11
parent 939ebb5b
Pipeline #32716 failed with stage
in 0 seconds
...@@ -1399,7 +1399,8 @@ bool FlowControl::_RefundOrder(const QString &orderId,int reasonCode,const QStri ...@@ -1399,7 +1399,8 @@ bool FlowControl::_RefundOrder(const QString &orderId,int reasonCode,const QStri
{ {
QLOG_INFO() << QString("[<<<<---FmTakeout _RefundOrder: orderId:%1; SimProcOrderDB::getInstance().isRefundOrder: %2--->>>>]").arg(orderObject->id) QLOG_INFO() << QString("[<<<<---FmTakeout _RefundOrder: orderId:%1; SimProcOrderDB::getInstance().isRefundOrder: %2--->>>>]").arg(orderObject->id)
.arg( SimProcOrderDB::getInstance().isRefundOrder(orderObject->id)? 1: 0 ); .arg( SimProcOrderDB::getInstance().isRefundOrder(orderObject->id)? 1: 0 );
m_simValidOrdersList.insert(0,orderObject->id); // 由于m_hurryPrintSum Flag的加入;入机前先存储订单数据,为打印提供数据准备: 否则插件上退单,将不会存储 商品表+促销优惠表+汇总表+打印表的退单数据;
m_storagePosOrdersList.append(orderObject->id);
//原本应该根据 appointmentDayFlag 使用分支,但此时是退单接口,不允许使用退单: //原本应该根据 appointmentDayFlag 使用分支,但此时是退单接口,不允许使用退单:
orderObject->pushOrderType = 0; orderObject->pushOrderType = 0;
orderObject->pushOrderTimes = 0; orderObject->pushOrderTimes = 0;
...@@ -1426,8 +1427,10 @@ bool FlowControl::_RefundOrder(const QString &orderId,int reasonCode,const QStri ...@@ -1426,8 +1427,10 @@ bool FlowControl::_RefundOrder(const QString &orderId,int reasonCode,const QStri
m_OrderEntryMutex.lock(); m_OrderEntryMutex.lock();
if ( !m_simValidOrdersList.contains(orderObject->id) && ( orderObject->decouplePosVersion < 20 ) ) //不存在队列中,且需要录单,则将其加入到队列中; if ( !m_simValidOrdersList.contains(orderObject->id) && ( orderObject->decouplePosVersion < 20 ) ) //不存在队列中,且需要录单,则将其加入到队列中;
{ {
QLOG_INFO() << QString("[<<<<---FmTakeout _RefundOrder: SimExceptRefund : orderId:%1 ;(SimProcOrderDB::getInstance().isRefundOrder:--->>>>]").arg(orderObject->id)<<SimProcOrderDB::getInstance().isRefundOrder(orderObject->id); QLOG_INFO() << QString("[<<<<---FmTakeout _RefundOrder: SimExceptRefund : orderId:%1 ;(SimProcOrderDB::getInstance().isRefundOrder:--->>>>]")
m_simValidOrdersList.insert(0,orderObject->id); .arg(orderObject->id)<<SimProcOrderDB::getInstance().isRefundOrder(orderObject->id);
// 由于m_hurryPrintSum Flag的加入;入机前先存储订单数据,为打印提供数据准备: 否则插件上退单,将不会存储 商品表+促销优惠表+汇总表+打印表的退单数据;
m_storagePosOrdersList.append(orderObject->id);
//原本应该根据 appointmentDayFlag 使用分支,但此时是退单接口,不允许使用退单: //原本应该根据 appointmentDayFlag 使用分支,但此时是退单接口,不允许使用退单:
orderObject->pushOrderType = 0; orderObject->pushOrderType = 0;
orderObject->pushOrderTimes = 0; orderObject->pushOrderTimes = 0;
......
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