食品

icp-deliver/app/base/db/impl/delivery/deliverDao.js

@@ -139,7 +139,39 @@ class DeliverDao extends Dao {
                     break
             }
             qc.where["$and"] = filters;
-        } else {
+        } else if (type === "foodManagement") {
+            let filters = [];
+            filters.push({
+                product_code: "food"
+            })
+            switch (qobj.bizpath) {
+                case "/foodManagement/wait":
+                    filters.push({
+                        delivery_status: {
+                            $notIn: [system.SERVERSESTATUS.SUCCESS, system.SERVERSESTATUS.CLOSED]
+                        }
+                    });
+                    break
+                case "/foodManagement/deliveryAllocated":
+                    filters.push({
+                        delivery_man_opcode: {
+                            $ne: null
+                        }
+                    });
+                    break
+                case "/foodManagement/deliveryNoAllocate":
+                    filters.push({
+                        delivery_man_opcode: {
+                            $eq: null
+                        }
+                    });
+                    break
+                case "/foodManagement/all":
+                    break
+            }
+            qc.where["$and"] = filters;
+        }
+        else {
             throw new Error("页面路径错误")
         }
         return qw;

icp-deliver/app/base/utils/toqifutongClient.js

@@ -174,6 +174,10 @@ const submitMaterials = async (deliverData, materials) => {
       607: "⼯商部未通过"
  */
 const wangwenSubmitOption = async (deliverData, materials) => {
+    const channelType = {
+        "wangwen": "esp.wangwen",
+        "food": "esp.food"
+    };
     let req = {};
     switch (deliverData.delivery_status) {
         case system.SERVERSESTATUS.COLLECTING:
@@ -224,7 +228,7 @@ const wangwenSubmitOption = async (deliverData, materials) => {
     await pushQiFuTong(deliverData.salesman_phone, {
         actionType: "serviceSubmitOption",
         actionBody: {
-            "channelTpye": "esp.wangwen",
+            "channelType": channelType[deliverData.product_code],
             "channelNeedNo": deliverData.demand_code,
             ...req,
         }