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

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

@@ -40,13 +40,17 @@ class SaasOrderService extends ServiceBase {
     if (!params.id) {
     if (!params.id) {
       return system.getResult(null, "id不存在");
       return system.getResult(null, "id不存在");
     }
     }
-    if(params.saas_id && params.saas_id!=order.saas_id){
-      return system.getResult(null,`【${params.saas_id}】错误`);
-    }
     let order = await this.dao.getById(params.id);
     let order = await this.dao.getById(params.id);
     if (!order) {
     if (!order) {
       return system.getResult(null, "订单不存在");
       return system.getResult(null, "订单不存在");
     }
     }
+    if(params.saas_id && params.saas_id!=order.saas_id){
+      return system.getResult(null,`【${params.saas_id}】错误`);
+    }
+    // let order = await this.dao.getById(params.id);
+    // if (!order) {
+    //   return system.getResult(null, "订单不存在");
+    // }
     this.handleDate(order, ["created_at"], null);
     this.handleDate(order, ["created_at"], null);
     await this.setOrderStatus([order]);
     await this.setOrderStatus([order]);
     let bminfo = await this.saasorderbminfoDao.getById(params.id) || {};
     let bminfo = await this.saasorderbminfoDao.getById(params.id) || {};