1.修复已知bug

takeout/base/Print/newprintlib.cpp

@@ -283,7 +283,7 @@ bool NewPrintLib::GetProdList(const QStringList &stallsprods, OrderObject *order
     QList<ProductObject *> list = order->proList;
 
     foreach (auto v, list) {
-        if(stallsprods.contains(v->pid))
+        if(stallsprods.contains(v->pid) || (stallsprods.size() == 1 && QString("DEFAULT").compare(stallsprods[0]) == 0))
             prodlist.append(v->pid);
     }
     return (!prodlist.isEmpty());
@@ -409,6 +409,8 @@ bool NewPrintLib::DoBackPrint(int page_depart, int prod_depart, int page_num, co
         return false;
     }
 
+    QLOG_DEBUG() << "GetProdList(stallsprods, order, list)" << stallsprods;
+
     QStringList list;
 
     if(GetProdList(stallsprods, order, list) == false)

takeout/control/networkcheckwork.cpp

@@ -61,9 +61,9 @@ void NetworkCheckWork::workstart()
 
         bool status = index < _checkNum;
 
-        QLOG_DEBUG() << "status : "  << status;
-        QLOG_DEBUG() << "flag : "  << flag;
-        QLOG_DEBUG() << "index : "  << index;
+        //QLOG_DEBUG() << "status : "  << status;
+        //QLOG_DEBUG() << "flag : "  << flag;
+        //QLOG_DEBUG() << "index : "  << index;
 
         //如果当前状态不等于网络状态推送信息
         if(_status != status)

takeout/model/posorderpool.cpp

@@ -148,7 +148,7 @@ void PosOrderPool::loadOrders()
         info.order_data.status = DefaultOrder;
         info.order_data.refund_status = DefaultOrder;
 
-        QLOG_DEBUG() << "info : " << info.order_id << "; info.reserved1 : " << info.reserved1;
+        //QLOG_DEBUG() << "info : " << info.order_id << "; info.reserved1 : " << info.reserved1;
 
         s_mutex.lock();
         s_order_pool.insert(info.order_id, info);

takeout/model/posstallspool.cpp

@@ -118,7 +118,13 @@ void PosStallsPool::praseGetStallsInfo(QJsonArray array)
             QJsonArray prodarray = obj[STALLS_KEY_PRODUCTLIST].toArray();
             praseGetProdInfo(prodarray, prodids, prodnames);
 
-            if(!prodids.empty() && !prodnames.isEmpty())
+            //0默认 1新加
+            int isdefault = 1;
+
+            if(obj.contains(STALLS_KEY_DEFAULT))
+                isdefault = obj[STALLS_KEY_DEFAULT].toInt();
+
+            if(!prodids.empty() && !prodnames.isEmpty() && isdefault == 1)
             {
                 if(obj.contains(STALLS_KEY_PAGEDEPART) && obj.contains(STALLS_KEY_PORDDEPART) && obj.contains(STALLS_KEY_PAGENUM))
                 {
@@ -137,6 +143,30 @@ void PosStallsPool::praseGetStallsInfo(QJsonArray array)
                 _stallsid_prodnames_map.insert(stallsid, prodnames);
                 _stallsid_stallsname_map.insert(stallsid, stallsname);
             }
+            else if(isdefault == 0)
+            {
+                if(obj.contains(STALLS_KEY_PAGEDEPART) && obj.contains(STALLS_KEY_PORDDEPART) && obj.contains(STALLS_KEY_PAGENUM))
+                {
+                    pagedepart = obj[STALLS_KEY_PAGEDEPART].toInt();
+                    proddepart = obj[STALLS_KEY_PORDDEPART].toInt();
+                    pagenum = obj[STALLS_KEY_PAGENUM].toInt();
+
+                    pagenum = (pagenum == 0 ? 1 : pagenum);
+
+                    _stalls_pagenum_map.insert(stallsid, pagenum);
+                    _stalls_pagedepart_map.insert(stallsid, pagedepart);
+                    _stalls_proddepart_map.insert(stallsid, proddepart);
+                }
+
+                QStringList tmplist1,tmplist2;
+
+                tmplist2.append(QString::fromUtf8("\xE6\x89\x80\xE6\x9C\x89\xE5\x95\x86\xE5\x93\x81"));
+                tmplist1.append("DEFAULT");
+
+                _stallsid_prodids_map.insert(stallsid, tmplist1);
+                _stallsid_prodnames_map.insert(stallsid, tmplist2);
+                _stallsid_stallsname_map.insert(stallsid, stallsname);
+            }
         }
     }
 

takeout/preDefine.h

@@ -221,6 +221,7 @@
 #define STALLS_KEY_PAGEDEPART         "is_file_depart"
 #define STALLS_KEY_PORDDEPART         "is_product_depart"
 #define STALLS_KEY_PAGENUM            "print_number"
+#define STALLS_KEY_DEFAULT            "is_default"
 
 #define EVENT_KEY_SEASIONCODE        "reason_code"
 #define EVENT_KEY_SEASION            "reason"

takeout/view/newdetailform.cpp

@@ -83,9 +83,9 @@ void NewDetailForm::InitData(OrderObject *orderObject, bool flag)
         else
         {
             if(type == TimelyTakeout)
-                ui->deliveryInfoLb_dec->setText(QString::fromLocal8Bit("【外卖】【%1】").arg(timeStr));
+                ui->deliveryInfoLb_dec->setText(QString::fromLocal8Bit("【外卖】【尽快送出】").arg(timeStr));
             else
-                ui->deliveryInfoLb_dec->setText(QString::fromLocal8Bit("【自提】【%1】").arg(timeStr));
+                ui->deliveryInfoLb_dec->setText(QString::fromLocal8Bit("【自提】【我已到店】").arg(timeStr));
         }
     }
     else
@@ -109,9 +109,13 @@ void NewDetailForm::InitData(OrderObject *orderObject, bool flag)
     QList<DiscountObject *> list = orderObject->disList;
     QString disStr;
     for(int i = 0; i < list.size(); i++) {
-        disStr += QString::fromLocal8Bit("【");
-        disStr += list.at(i)->name;
-        disStr += QString::fromLocal8Bit("】");
+
+        if(list[i]->type != 3 && list[i]->type != 1)
+        {
+            disStr += QString::fromLocal8Bit("【");
+            disStr += list.at(i)->name;
+            disStr += QString::fromLocal8Bit("】");
+        }
     }
 
     ui->promotionInfoLb_dec->setText(QString(disStr));

takeout/view/newmainform.cpp

@@ -487,6 +487,15 @@ void NewMainForm::ClassifyOrderWithOrderStatus(int order_status)
             else
                 table->setRowHidden(i, true);
             break;
+        case RefusedOrder:
+            pwd = (OrderTypeForm *)table->cellWidget(i, 1);
+            if(pwd->GetOrderStatus() == RefusedOrder)
+            {
+                table->setRowHidden(i, false);
+                ++_curr_page_num;
+            }
+            else
+                table->setRowHidden(i, true);
         default:
             table->setRowHidden(i, true);
             break;
@@ -567,8 +576,8 @@ bool NewMainForm::event(QEvent *e)
         if(!PosOrderPool::GetOrderObject(orderid, order))
             return true;
 
-        if(order.status == RefusedOrder)
-            return true;
+//        if(order.status == RefusedOrder)
+//            return true;
 
         Order_Index tmp = {order.status, order.refund_status};