dd

xgg-deliver/app/base/controller/impl/order/orderCtl.js

@@ -676,7 +676,8 @@ class OrderCtl extends CtlBase {
       currentPage: Number(pobj.currentPage || 1),
       currentPage: Number(pobj.currentPage || 1),
       pageSize: Number(pobj.pageSize || 10),
       pageSize: Number(pobj.pageSize || 10),
       deliver_id: pobj.deliver_id,
       deliver_id: pobj.deliver_id,
-      status:statusMap[pobj.status],
+      // status:statusMap[pobj.status],
+      status:pobj.status,
       isMain:pobj.isMain,
       isMain:pobj.isMain,
       isManager:pobj.isManager,
       isManager:pobj.isManager,
       delier_user_id:pobj.delier_user_id,
       delier_user_id:pobj.delier_user_id,
@@ -691,6 +692,14 @@ class OrderCtl extends CtlBase {
     if(pobj.order_id){
     if(pobj.order_id){
       condition.id = this.trim(pobj.order_id);
       condition.id = this.trim(pobj.order_id);
     }
     }
+
+    if(pobj.statusArray){
+      let statusArray = [];
+      for (let item of pobj.statusArray) {
+        statusArray.push(statusMap[item]);
+      }
+      condition.statusArray = statusArray;
+    }
     this.doTimeCondition(condition, ["createdBegin", "createdEnd"]);
     this.doTimeCondition(condition, ["createdBegin", "createdEnd"]);
     return await this.orderSve.aliOrderPage(condition);
     return await this.orderSve.aliOrderPage(condition);
   }
   }