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

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

@@ -252,8 +252,12 @@ class SaasOrderService extends ServiceBase {
       }
       }
       let saasorderbusinessmen = await this.saasorderbusinessmenDao.findById(this.trim(order.id));
       let saasorderbusinessmen = await this.saasorderbusinessmenDao.findById(this.trim(order.id));
       if(saasorderbusinessmen) {
       if(saasorderbusinessmen) {
-        saasorderbusinessmen.saas_id = order.saas_id;
         this.setBusinessmenProperty(saasorderbusinessmen, params);
         this.setBusinessmenProperty(saasorderbusinessmen, params);
+        saasorderbusinessmen.saas_id = order.saas_id;
+        saasorderbusinessmen.merchant_id = order.merchant_id;
+        saasorderbusinessmen.product_id = order.product_id;
+        saasorderbusinessmen.saas_order_id = order.saas_order_id;
+        saasorderbusinessmen.merchant_app_user_id = order.merchant_app_user_id || "";
         await saasorderbusinessmen.save();
         await saasorderbusinessmen.save();
       } else {
       } else {
         console.log("xggsve-order saasorderSve saveSaasOrderBusinessmen ------------------"+JSON.stringify(params))
         console.log("xggsve-order saasorderSve saveSaasOrderBusinessmen ------------------"+JSON.stringify(params))

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

@@ -25,6 +25,9 @@ class SaasorderbusinessmenService extends ServiceBase {
     if (params.name) {
     if (params.name) {
       where.name = this.trim(params.name);
       where.name = this.trim(params.name);
     }
     }
+    if (params.merchant_app_user_id) {
+      where.merchant_app_user_id = this.trim(params.merchant_app_user_id);
+    }
     if (params.legal_idcard) {
     if (params.legal_idcard) {
       where.legal_idcard = this.trim(params.legal_idcard);
       where.legal_idcard = this.trim(params.legal_idcard);
     }
     }