Merge branch 'xggsve-order' of gitlab.gongsibao.com:jiangyong/zhichan into xggsve-order

xggsve-order/app/base/api/impl/op/action.js

@@ -138,11 +138,11 @@ class ActionAPI extends APIBase {
                 case "saasOrderPage":       // 订单信息
                     opResult = await this.saasorderSve.pageByCondition(action_body);
                     break;
-                case "saasOrderAudit":       // 订单信息
-                    opResult = await this.saasorderSve.audit(action_body);
+                case "saasOrderBulkAudit":       // 订单信息
+                    opResult = await this.saasorderSve.bulkAudit(action_body);
                     break;
-                case "saasOrderDeliver":       // 订单信息
-                    opResult = await this.saasorderSve.deliver(action_body);
+                case "saasOrderBulkDeliver":       // 订单信息
+                    opResult = await this.saasorderSve.bulkDeliver(action_body);
                     break;
                 case "saasOrderBulkOfflinePay":       // 订单信息
                     opResult = await this.saasorderSve.bulkOfflinePay(action_body);

xggsve-order/app/base/service/impl/saas/saasorderSve.js

@@ -302,6 +302,20 @@ class SaasOrderService extends ServiceBase {
     }
   }
 
+  async bulkAudit(params) {
+    let ids = params.ids || [];
+    for (let id of ids) {
+      try {
+        params.id = id;
+        await this.audit(params);
+        console.log(id);
+      } catch (e) {
+        console.log(e);
+      }
+    }
+    return system.getResultSuccess();
+  }
+
   async audit(params) {
     let id = this.trim(params.id);
     let audit_status = this.trim(params.audit_status);
@@ -321,7 +335,6 @@ class SaasOrderService extends ServiceBase {
       return system.getResult(null, "订单已审核");
     }
 
-
     let _order = {id: id};
     _order.audit_status = audit_status;
     _order.handle_status = "10";
@@ -357,6 +370,20 @@ class SaasOrderService extends ServiceBase {
     return system.getResultSuccess();
   }
 
+  async bulkDeliver(params) {
+    let ids = params.ids || [];
+    for (let id of ids) {
+      try {
+        params.id = id;
+        await this.deliver(params);
+        console.log(id);
+      } catch (e) {
+        console.log(e);
+      }
+    }
+    return system.getResultSuccess();
+  }
+
   async deliver(params) {
     let id = this.trim(params.id);
     let deliver_express_no = this.trim(params.deliver_express_no);