修改判断订单由配送员姓名改为具体状态字段

fmTakeaway/Control/flowControl.cpp

@@ -146,7 +146,7 @@ bool FlowControl::_PullOrder()
                                    .arg(orderObject->order_id, orderObject->status_desc)
                                    .arg(_GetJsonStr(jsonObject));
                     emit changeOrderStatus(orderObject);
-                    if(orderObject->status==2&&orderObject->courier_name.isEmpty())
+                    if(orderObject->status==2&&orderObject->delivery_status==0)
                     {
                         emit startRemind(0);
                         QLOG_INFO()<<QString("[---begin to tip---]");
@@ -175,6 +175,7 @@ bool FlowControl::_PullOrder()
                        emit changeOrderStatus(orderObject, oldStatus);
                     }
                 }
+                /*
                 if(orderObject->status != 1 && orderObject->status != 2)
                 {
                     QString error;
@@ -186,6 +187,7 @@ bool FlowControl::_PullOrder()
                         QLOG_INFO() << QString("_PullOrder DoOrderEntry failed %1").arg(error);
                     }
                 }
+                */
                 m_timestamp = orderObject->timestamp;
             }
             syncTime = recvJson[JSON_SYNCTIME].toInt()*1000;

takeaway.pro.user

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.0.0, 2017-01-03T18:27:25. -->
+<!-- Written by QtCreator 4.0.0, 2017-01-20T18:19:02. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>