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

xggsve-order/app/base/db/impl/saas/saasorderDao.js

@@ -79,14 +79,14 @@ class SaasOrderDao extends Dao {
     if (params.createEnd) {
     if (params.createEnd) {
       sql.push("AND t1.created_at <= :createEnd");
       sql.push("AND t1.created_at <= :createEnd");
     }
     }
+    if (params.merchant_app_user_id) {
+      sql.push("AND t1.merchant_app_user_id = :merchant_app_user_id");
+    }
 
 
     if (params.legal_idno) {
     if (params.legal_idno) {
       sql.push("AND t2.legal_idno = :legal_idno");
       sql.push("AND t2.legal_idno = :legal_idno");
     }
     }
 
 
-    if (params.merchant_app_user_id) {
-      sql.push("AND t2.merchant_app_user_id = :merchant_app_user_id");
-    }
   }
   }
 
 
   async mapByIds(ids, attrs) {
   async mapByIds(ids, attrs) {

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

@@ -27,6 +27,7 @@ class SaasOrderService extends ServiceBase {
 
 
     order.bminfo = await this.saasorderbminfoDao.getById(params.id);
     order.bminfo = await this.saasorderbminfoDao.getById(params.id);
     this.handleDate(order, ["created_at"], null, -8);
     this.handleDate(order, ["created_at"], null, -8);
+    await this.setOrderStatus([order]);
     return system.getResultSuccess(order);
     return system.getResultSuccess(order);
   }
   }
 
 
@@ -164,6 +165,7 @@ class SaasOrderService extends ServiceBase {
       price: price,
       price: price,
       pay_status: 10,
       pay_status: 10,
       audit_status: 10,
       audit_status: 10,
+      handle_status: 10,
     }
     }
 
 
     let self = this;
     let self = this;
@@ -435,7 +437,7 @@ class SaasOrderService extends ServiceBase {
   async offlinePay(params) {
   async offlinePay(params) {
     let id = this.trim(params.id);
     let id = this.trim(params.id);
     let order = await this.dao.findById(id);
     let order = await this.dao.findById(id);
-    if(order.pay_status != "10") {
+    if (order.pay_status != "10") {
       return;
       return;
     }
     }