1.修复退单自动打印小票的bug

takeout/control/ordergetwork.cpp

@@ -427,6 +427,8 @@ bool OrderGetWork::loginToServer(QString &error)
 
     QString tcptoken;
 
+    SetStoreInfoToConfig();
+
     if(OrderGetDataProcess::getToken(recvjson, tcptoken))
         POSTEVENTTYPE(PosEvent::s_token_change,tcptoken,QString);
 

takeout/model/posorderpool.cpp

@@ -207,14 +207,14 @@ bool PosOrderPool::TryInsertOrder(OrderObject order)
 
         INITORDERINFO(order, info);
 
-        QLOG_INFO() << "%%%%%%%%%%%%%%%%%%%%%%%%%%%" << info.order_id << info.order_refund << info.order_last_refund;
-        QLOG_INFO() << "%%%%%%%%%%%%%%%%%%%%%%%%%%%" << info.order_id << info.order_status << info.order_last_status;
+        QLOG_DEBUG() << "%%%%%%%%%%%%%%%%%%%%%%%%%%%" << info.order_id << info.order_refund << info.order_last_refund;
+        QLOG_DEBUG() << "%%%%%%%%%%%%%%%%%%%%%%%%%%%" << info.order_id << info.order_status << info.order_last_status;
 
         s_order_pool.insert(order.order_id,info);
 
         DEFAULTPOSTEVENT(PosEvent::s_change_order, order.order_id);
 
-        if(order.status == FirmOrder)
+        if(order.status == FirmOrder && order.refund_status == DefaultOrder)
         {
             QVariantMap map;
 
@@ -232,14 +232,14 @@ bool PosOrderPool::TryInsertOrder(OrderObject order)
 
     Order_Info info;
 
-    QLOG_INFO() << "$$$$$$$$$$$$$$$$$$$$$$$$$$$" << info.order_id << info.order_refund << info.order_last_refund;
-    QLOG_INFO() << "$$$$$$$$$$$$$$$$$$$$$$$$$$$" << info.order_id << info.order_status << info.order_last_status;
+    QLOG_DEBUG() << "$$$$$$$$$$$$$$$$$$$$$$$$$$$" << info.order_id << info.order_refund << info.order_last_refund;
+    QLOG_DEBUG() << "$$$$$$$$$$$$$$$$$$$$$$$$$$$" << info.order_id << info.order_status << info.order_last_status;
 
 
     UPDATEORDERINFO(oldinfo, order, info);
 
-    QLOG_INFO() << "@@@@@@@@@@@@@@@@@@@@@@@@@@@" <<  info.order_id << info.order_refund << info.order_last_refund;
-    QLOG_INFO() << "@@@@@@@@@@@@@@@@@@@@@@@@@@@" <<  info.order_id << info.order_status << info.order_last_status;
+    QLOG_DEBUG() << "@@@@@@@@@@@@@@@@@@@@@@@@@@@" <<  info.order_id << info.order_refund << info.order_last_refund;
+    QLOG_DEBUG() << "@@@@@@@@@@@@@@@@@@@@@@@@@@@" <<  info.order_id << info.order_status << info.order_last_status;
 
 
     if(oldinfo.order_status != order.status || oldinfo.order_refund != order.refund_status)
@@ -248,7 +248,7 @@ bool PosOrderPool::TryInsertOrder(OrderObject order)
 
         DEFAULTPOSTEVENT(PosEvent::s_change_order, order.order_id);
 
-        if(order.status == FirmOrder && info.order_print_status == 0)
+        if(order.status == FirmOrder && order.refund_status == DefaultOrder && info.order_print_status == 0)
         {
             QVariantMap map;
 
@@ -292,9 +292,9 @@ bool PosOrderPool::TryChangeOrderStatus(QString key, int order_status, int refun
                 info.order_data.refund_status = refundstatus;
             }
 
-//            QLOG_INFO() << "+++++++++++++++++++++++++++" << info.order_refund << info.order_last_refund;
-//            QLOG_INFO() << "+++++++++++++++++++++++++++" << info.order_status << info.order_last_status;
-//            QLOG_INFO() << "+++++++++++++++++++++++++++" << order_status << refundstatus;
+            QLOG_DEBUG() << "+++++++++++++++++++++++++++" << info.order_refund << info.order_last_refund;
+            QLOG_DEBUG() << "+++++++++++++++++++++++++++" << info.order_status << info.order_last_status;
+            QLOG_DEBUG() << "+++++++++++++++++++++++++++" << order_status << refundstatus;
 
 
             info.order_change_time = QDateTime::currentDateTime().toTime_t();
@@ -302,7 +302,7 @@ bool PosOrderPool::TryChangeOrderStatus(QString key, int order_status, int refun
 
             DEFAULTPOSTEVENT(PosEvent::s_change_order, key);
 
-            if(info.order_status == FirmOrder && info.order_print_status == 0)
+            if(info.order_status == FirmOrder  && info.order_refund == DefaultOrder && info.order_print_status == 0)
             {
                 QVariantMap map;
 
@@ -373,7 +373,7 @@ bool PosOrderPool::GetOrderObject(QString key, OrderObject &order, int &last_sta
 
     GetOrderStatusAndLastStatus(info, status, last_status);
 
-    QLOG_WARN() << "####################" << info.order_id << "order status : " << status << "; last status : " << last_status;
+    QLOG_DEBUG() << "####################" << info.order_id << "order status : " << status << "; last status : " << last_status;
 
     order = info.order_data;
     order.status = status;
@@ -392,7 +392,7 @@ bool PosOrderPool::GetOrderStatus(QString key, int &status, int &last_status)
 
     GetOrderStatusAndLastStatus(info, status, last_status);
 
-    QLOG_WARN() << "###############order status : " << status << "; last status : " << last_status;
+    QLOG_DEBUG() << "###############order status : " << status << "; last status : " << last_status;
 
     return true;
 }