fix bug: 修复 星巴克退款类型

         实现 手动接单后模拟点单，打印小票

fmTakeout/Control/flowControl.cpp

@@ -259,7 +259,24 @@ void FlowControl::_OrderAnalysis(const QJsonObject& jsonObject)
     QLOG_INFO() << QString("[<<<<---FmTakeout _OrderAnalysis-> orderObject->orderStatus:--->>>>]")<<orderObject->orderStatus;
     switch (orderObject->orderStatus){
     case OrderObject::NewOrder:
+        break;
     case OrderObject::Confirmed:
+        if(!orderObject->isPush)
+        {
+            orderObject->pushOrderType = 1;
+            orderObject->pushOrderTimes = 0;
+            m_OrderEntryMutex.lock();
+            if(!m_simValidOrdersList.contains(orderObject->id))
+            {
+                m_simValidOrdersList.append(orderObject->id);
+            }
+            m_OrderEntryMutex.unlock();
+            QLOG_INFO() << QString("[<<<<---FmTakeout _OrderAnalysis:OrderConfirmed  m_simValidOrdersList.num:%1 --->>>>]")<< m_simValidOrdersList.count();
+            QLOG_INFO() << QString("[<<<<---FmTakeout _OrderAnalysis:OrderConfirmed  m_simValidOrdersList:%1 --->>>>]")<< m_simValidOrdersList;
+            QLOG_INFO() << QString("[<<<<---FmTakeout _OrderAnalysis:OrderConfirmed  _ClickOMSAssignArea --->>>>]");
+            _ClickOMSAssignArea();
+        }
+        break;
     case OrderObject::Sendout:
     case OrderObject::ToSend:
     case OrderObject::Finished:
@@ -282,7 +299,7 @@ void FlowControl::_OrderAnalysis(const QJsonObject& jsonObject)
         }
         break;
     case OrderObject::AgreeRefund:
-    case OrderObject::Refunded:
+    case OrderObject::Refunded:  /*退单目前本佳那边不区分 OrderObject::Refunded=100*/
     case OrderObject::Cancled:
     /***case:同意退单、退单、取消订单: 此退单还没push到POS[POS没有确认退单或没有返回确认退单的小票号]***/
         if(!orderObject->isCancle)
@@ -623,6 +640,23 @@ bool FlowControl::_ConfirmOrder(const QString &orderId)
                 int oldOrderStatus = orderObject->orderStatus;
                 orderObject->orderStatus = orderStatus;
                 emit changeOrderStatus(orderObject, oldOrderStatus);
+                if (OrderObject::Confirmed == orderStatus){
+                    if(!orderObject->isPush)
+                    {
+                        orderObject->pushOrderType = 1;
+                        orderObject->pushOrderTimes = 0;
+                        m_OrderEntryMutex.lock();
+                        if(!m_simValidOrdersList.contains(orderObject->id))
+                        {
+                            m_simValidOrdersList.append(orderObject->id);
+                        }
+                        m_OrderEntryMutex.unlock();
+                        QLOG_INFO() << QString("[<<<<---FmTakeout _ConfirmOrder:  m_simValidOrdersList.num:%1 --->>>>]")<< m_simValidOrdersList.count();
+                        QLOG_INFO() << QString("[<<<<---FmTakeout _ConfirmOrder:  m_simValidOrdersList:%1 --->>>>]")<< m_simValidOrdersList;
+                        QLOG_INFO() << QString("[<<<<---FmTakeout _ConfirmOrder:  _ClickOMSAssignArea --->>>>]");
+                        _ClickOMSAssignArea();
+                    }
+                }
             }
             else
             {

fmTakeout/Model/orderObject.h

@@ -68,7 +68,7 @@ public:
     typedef enum {
         NewOrder=2,Confirmed,Cancled,Sendout,ToSend,
         Finished,Locked=-1,RequestRefund=20,
-        AgreeRefund=30,RefuseRefund=40,Refunded=100
+        AgreeRefund=30,RefuseRefund=40,Refunded=100 /*退单目前本佳那边不区分:Refunded=100*/
     }OrderStatus;
 
     /* 功能:从Json对象初获取数据