a

fmTakeaway/Control/flowControl.cpp

@@ -152,6 +152,20 @@ bool FlowControl::_PullOrder()
                                    .arg(orderObject->order_id, orderObject->status_desc)
                                    .arg(_GetJsonStr(jsonObject));
 
+                    if(orderObject->status==2)
+                    {
+                        // 打印
+                            QLOG_INFO() << QString("[---begin print---].");
+                            if(FmPrinter::GetInstance().DoPrint(ConfigManger::GetInstance().GetPrinterName(), orderObject))
+                            {
+                                QLOG_INFO() << QString("print sucessful");
+                            }else
+                            {
+                                QLOG_INFO() << QString("print failed");
+                            }
+
+                    }
+
                     // 订单完成状态再重新录一遍
                     bool bRed = false;
                     if(orderObject->status==6 || orderObject->status==200)
@@ -180,6 +194,20 @@ bool FlowControl::_PullOrder()
                                    .arg(orderObject->order_id, orderObject->status_desc)
                                    .arg(_GetJsonStr(jsonObject));
 
+                    if(oldStatus==1 && orderObject->status==2)
+                    {
+                        // 打印
+                            QLOG_INFO() << QString("[---begin print---].");
+                            if(FmPrinter::GetInstance().DoPrint(ConfigManger::GetInstance().GetPrinterName(), orderObject))
+                            {
+                                QLOG_INFO() << QString("print sucessful");
+                            }else
+                            {
+                                QLOG_INFO() << QString("print failed");
+                            }
+
+                    }
+
                     // 订单完成状态再重新录一遍
                     bool bRed = false;
                     if(orderObject->status==6 || orderObject->status==200)
@@ -203,15 +231,6 @@ bool FlowControl::_PullOrder()
                     }
                     if(oldcourier!=orderObject->courier_name)
                     {
-                    // 打印
-                        QLOG_INFO() << QString("[---begin print---].");
-                        if(FmPrinter::GetInstance().DoPrint(ConfigManger::GetInstance().GetPrinterName(), orderObject))
-                        {
-                            QLOG_INFO() << QString("print sucessful");
-                        }else
-                        {
-                            QLOG_INFO() << QString("print failed");
-                        }
                         //写入销售单
                         QLOG_INFO() << QString("[---begin entry order [%1]---].").arg(QString(FmPlugin::GetInstance()._GetOrderEntryData(orderObject)));
 
@@ -312,7 +331,6 @@ bool FlowControl::_ConfirmOrder(const QString &orderId, const DeliverObject &del
             remark = remark.isEmpty()? "" : QString("\r\n[备注: %1]").arg(remark);
             deliveryTime = QString("\r\n[期望送达时间: %1]").arg(QDateTime::fromTime_t(orderObject->delivery_time).toString("MM/dd hh:mm"));
             emit showAlert(AlertForm::SUCCESS, QString("接单成功!%1%2").arg(remark).arg(deliveryTime));
-
             // 通知主界面移动订单
             int oldStatus = orderObject->status;
             orderObject->status = recvJson[JSON_STATUS].toInt();
@@ -367,11 +385,12 @@ bool FlowControl::_RefuseOrder(const QString &orderId, int refuseCode)
 
 bool FlowControl::_SendOrder(const QString& orderId)
 {
-    if(m_ordersMap.value(orderId)->courier_name.isEmpty())
-    {
-        emit showAlert(AlertForm::ERROR,QString("配送员暂未接单，请等待"));
-        return true;
-    }
+    //! TODO
+//    if(m_ordersMap.value(orderId)->courier_name.isEmpty())
+//    {
+//        emit showAlert(AlertForm::ERROR,QString("配送员暂未接单，请等待"));
+//        return true;
+//    }
     QString error;
     bool result;
     QJsonObject sendJson;

run/config.ini

 ;非码外卖拉取订单服务器地址
 [FmServer]
-url=http://waimaitest.freemudorder.com/api
+url=http://waimaiapi.freemudorder.com/api
 ;非码外卖监听端口
 [TcpServer]
 port=34953