gsb

xgg-saas-merchant/app/base/controller/impl/saas/orderCtl.js

@@ -51,7 +51,7 @@ class ChannelCtl extends CtlBase {
 
 
       totalNum = params.ids.length;
       totalNum = params.ids.length;
       totalPrice = system.f2y(totalPrice);
       totalPrice = system.f2y(totalPrice);
-      let info = await this.merchantSve.info({id: params.saas_merchant_id}) || {};
+      let info = await this.merchantSve.signInfo({id: params.saas_merchant_id}) || {};
       info = info.data || {};
       info = info.data || {};
       let main = info.main || {};
       let main = info.main || {};
       let result = {
       let result = {

xgg-saas-merchant/app/base/service/impl/saas/merchantSve.js

@@ -26,7 +26,6 @@ class MerchantService extends ServiceBase {
     if(rs.data && rs.data.sign) {
     if(rs.data && rs.data.sign) {
       this.transSignFields([rs.data.sign]);
       this.transSignFields([rs.data.sign]);
       await this.setChannel([rs.data]);
       await this.setChannel([rs.data]);
-      await this.setMain([rs.data]);
     }
     }
     return rs;
     return rs;
   }
   }
@@ -55,6 +54,7 @@ class MerchantService extends ServiceBase {
     var rs = await this.callms("merchant", "mchtSignInfo", params);
     var rs = await this.callms("merchant", "mchtSignInfo", params);
     if(rs.data) {
     if(rs.data) {
       this.transSignFields([rs.data]);
       this.transSignFields([rs.data]);
+      await this.setMain([rs.data]);
     }
     }
     return rs;
     return rs;
   }
   }