gsb

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

@@ -53,12 +53,13 @@ class ChannelCtl extends CtlBase {
       totalPrice = system.f2y(totalPrice);
       totalPrice = system.f2y(totalPrice);
       let info = await this.merchantSve.info({id: params.saas_merchant_id}) || {};
       let info = await this.merchantSve.info({id: params.saas_merchant_id}) || {};
       info = info.data || {};
       info = info.data || {};
+      let main = info.main || {};
       let result = {
       let result = {
         totalNum : totalNum,
         totalNum : totalNum,
         totalPrice : totalPrice,
         totalPrice : totalPrice,
-        account_name: info.account_name,
-        account_bank_name: info.account_bank_name,
-        account_bank_no: info.account_bank_no,
+        account_name: main.bank_account,
+        account_bank_name: main.bank_name,
+        account_bank_no: main.bank_no,
       }
       }
       // 获取商户信息
       // 获取商户信息
       return system.getResult(result);
       return system.getResult(result);

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

@@ -26,6 +26,7 @@ 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;
   }
   }

xgg-saas-merchant/app/base/system.js

@@ -178,7 +178,7 @@ class System {
 				// common: "http://127.0.0.1:3102" + path,
 				// common: "http://127.0.0.1:3102" + path,
 
 
 				// 商户服务
 				// 商户服务
-				merchant: domain + ":3101" + path,
+				merchant: domain2 + ":3101" + path,
 				// merchant: "http://127.0.0.1:3101" + path,
 				// merchant: "http://127.0.0.1:3101" + path,
 
 
 				// 订单服务
 				// 订单服务
@@ -190,7 +190,7 @@ class System {
 				// invoice: "http://127.0.0.1:3105" + path,
 				// invoice: "http://127.0.0.1:3105" + path,
 
 
 				// 用户服务
 				// 用户服务
-				uc: domain + ":3106" + path,
+				uc: domain2 + ":3106" + path,
 				// uc: "http://127.0.0.1:3106" + path,
 				// uc: "http://127.0.0.1:3106" + path,
 			}
 			}
 		} else {
 		} else {