Add 1:获取配送员增加订单ID信息到服务端

         2:如果服务端返回空配送员信息则直接接单

fmTakeaway/Control/flowControl.cpp

@@ -208,7 +208,7 @@ bool FlowControl::_GetDelivers(const QString &orderId)
     OrderObject *orderObj;
 
     orderObj = m_ordersMap.value(orderId);
-    sendJson = DataManger::GetInstance().GetPullDeliverData(m_storeId, orderObj->channel);
+    sendJson = DataManger::GetInstance().GetPullDeliverData(m_storeId, orderObj->channel, orderId);
 
     emit showAlert(AlertForm::LOADING, "正在获取配送员信息......");
     QLOG_INFO() << QString("[---get delivers---]. [requestData:%1]").arg(_GetJsonStr(sendJson));
@@ -236,6 +236,11 @@ bool FlowControl::_GetDelivers(const QString &orderId)
                 deliverList.append(deliverObject);
             }
             emit hideAlert();
+
+            if(deliverList.isEmpty())
+            {
+                _ConfirmOrder(orderId, DeliverObject());
+            }
             emit showDeliverPickForm(orderId, deliverList);
         }
     }

fmTakeaway/DTools/dataManger.cpp

@@ -45,13 +45,17 @@ QJsonObject DataManger::GetPullOrderData(const QString &timestamp)
     return rObj;
 }
 
-QJsonObject DataManger::GetPullDeliverData(const QString &storeId, const QString &channelCode)
+QJsonObject DataManger::GetPullDeliverData(const QString &storeId, const QString &channelCode, const QString &orderId)
 {
-    QJsonObject rObj;
+    QJsonObject rObj, cObj;
     rObj.insert(JSON_REQTYPE, GET_DELIVER);
     rObj.insert(JSON_STOREID, storeId);
     rObj.insert(JSON_CHANNEL, channelCode);
     rObj.insert(JSON_TOKEN, m_token);
+
+    cObj.insert(JSON_ORDERID, orderId);
+    cObj.insert(JSON_CHANNEL, channelCode);
+    rObj.insert(JSON_ORDER, cObj);
     rObj.insert(JSON_POSVERSION, APP_VERSION);
     return rObj;
 }

fmTakeaway/DTools/dataManger.h

@@ -30,7 +30,7 @@ public:
      * 参数:[1]门店号[2]渠道代码
      * 返回:登录数据
      * */
-    QJsonObject GetPullDeliverData(const QString& storeId, const QString& channelCode);
+    QJsonObject GetPullDeliverData(const QString& storeId, const QString& channelCode, const QString& orderId);
     /* 功能:获取确认订单数据
      * 参数:[1]订单编号[2]配送员编号[3]配送员姓名[4]配送员电话
      * 返回:登录数据