g

xgg-saas-merchant/app/base/controller/impl/uc/userCtl.js

@@ -12,7 +12,7 @@ class UserCtl extends CtlBase {
     this.redisClient = system.getObject("util.redisClient");
     this.redisClient = system.getObject("util.redisClient");
     this.captchaSve = system.getObject("service.common.captchaSve");
     this.captchaSve = system.getObject("service.common.captchaSve");
     this.deliverSve = system.getObject("service.common.deliverSve");
     this.deliverSve = system.getObject("service.common.deliverSve");
-    this.merchantCtl = system.getObject("service.saas.merchantSve");
+    this.merchantSve = system.getObject("service.saas.merchantSve");
   }
   }
 
 
   async login(pobj, pobj2, req, res) {
   async login(pobj, pobj2, req, res) {
@@ -29,7 +29,7 @@ class UserCtl extends CtlBase {
 
 
       loginUser = loginUser.data;
       loginUser = loginUser.data;
 
 
-      let channel = await this.merchantCtl.info({id:loginUser.saas_merchant_id});
+      let channel = await this.merchantSve.info({id:loginUser.saas_merchant_id});
       if (channel.status != 0) {
       if (channel.status != 0) {
         return system.getResult(null, `渠道【${loginName}】不存在`);
         return system.getResult(null, `渠道【${loginName}】不存在`);
       }
       }
@@ -94,6 +94,15 @@ class UserCtl extends CtlBase {
   }
   }
 
 
   async currentUser(qobj, pobj, req) {
   async currentUser(qobj, pobj, req) {
+    let saas_merchant_id = req.loginUser.saas_merchant_id;
+    if(!saas_merchant_id){
+      return system.getResult(null, `登录失效，请重新登录`);
+    }
+    let _merchant = await this.merchantSve.info({id:saas_merchant_id});
+    if(_merchant.status!=0  ){
+      return system.getResult(null, `商户不存在`);
+    }
+    req.loginUser.saas_merchant_name = _merchant.data.name;
     return system.getResultSuccess(req.loginUser);
     return system.getResultSuccess(req.loginUser);
   }
   }
 
 

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

@@ -188,22 +188,22 @@ class System {
 			let dev = "http://39.107.234.14";
 			let dev = "http://39.107.234.14";
 			return {
 			return {
 				// 公共服务
 				// 公共服务
-				common: local + ":3102" + path,
+				common: dev + ":3102" + path,
 
 
 				// 商户服务
 				// 商户服务
-				merchant: local + ":3101" + path,
+				merchant: dev + ":3101" + path,
 
 
 				// 订单服务
 				// 订单服务
-				order: local + ":3103" + path,
+				order: dev + ":3103" + path,
 
 
 				// 发票服务
 				// 发票服务
 				invoice: dev + ":3105" + path,
 				invoice: dev + ":3105" + path,
 
 
 				// 用户服务
 				// 用户服务
-				uc: local + ":3106" + path,
+				uc: dev + ":3106" + path,
 
 
 				// 交易
 				// 交易
-				trade: local + ":3107" + path,
+				trade: dev + ":3107" + path,
 			}
 			}
 		} else {
 		} else {
 			return {
 			return {