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

xggsve-order/app/base/service/impl/order/oorderstatusSve.js

@@ -613,8 +613,8 @@ class OorderstatusService extends ServiceBase {
     _obusinessmenProperty.legal_name = _orderInfo.legal_name;
     _obusinessmenProperty.legal_name = _orderInfo.legal_name;
     _obusinessmenProperty.legal_mobile = _orderInfo.legal_mobile;
     _obusinessmenProperty.legal_mobile = _orderInfo.legal_mobile;
     _obusinessmenProperty.legal_idcard = _orderInfo.id_card;
     _obusinessmenProperty.legal_idcard = _orderInfo.id_card;
-    _obusinessmenProperty.bd_id = this.trim(params.bd_id);
-    _obusinessmenProperty.bd_path = this.trim(params.bd_path);
+    _obusinessmenProperty.bd_id = this.trim(_order.bd_id);
+    _obusinessmenProperty.bd_path = this.trim(_order.bd_path);
 
 
     let orderProperty = {};
     let orderProperty = {};
     orderProperty.id = _order.id;
     orderProperty.id = _order.id;

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

@@ -77,10 +77,47 @@ class SaasOrderService extends ServiceBase {
       }
       }
 
 
       await this.setBminfo(page.rows);
       await this.setBminfo(page.rows);
+      await this.setOrderStatus(page.rows);
     }
     }
     return system.getResultSuccess(page);
     return system.getResultSuccess(page);
   }
   }
 
 
+  async setOrderStatus(rows) {
+    if (!rows || rows.length == 0) {
+      return;
+    }
+
+    // 订单状态总结   1010 待付款, 2010 待审核, 2030 审核驳回, 3010 业务办理中, 3020待交付, 3030 已交付
+    for (let row of rows) {
+      let status = "";
+      // 支付状态 10待支付 20已支付
+      if(row.pay_status === "10") {
+        row.status = "1010";
+        row.status_name = "待付款";
+        continue;
+      }
+
+      // 10待审核 20审核通过 30审核驳回
+      if(row.audit_status != "20") {
+        row.status = row.audit_status == "10" ? "2010": "2030";;
+        row.status_name = row.audit_status == "10" ? "待审核": "审核驳回";
+      }
+
+      // 审核状态
+      if(row.handle_status == "10") {
+        row.status = "3010";
+        row.status_name = "业务办理中";
+      } else if (row.handle_status == "20") {
+        row.status = "3010";
+        row.status_name = "待交付";
+      } else if (row.handle_status == "30") {
+        row.status = "3020";
+        row.status_name = "已交付";
+      }
+    }
+
+  }
+
   async mapByIds(params) {
   async mapByIds(params) {
     if(!params.ids || params.ids.length == 0) {
     if(!params.ids || params.ids.length == 0) {
       return system.getResultSuccess({});
       return system.getResultSuccess({});