登陆返回商户name

common/src/main/java/com/jumeirah/common/service/impl/MerchantUserServiceImpl.java

@@ -14,6 +14,7 @@ import com.jumeirah.common.param.MerchantLoginParam;
 import com.jumeirah.common.param.MerchantUpdatePwdParam;
 import com.jumeirah.common.param.MerchantUpdatePwdParam;
 import com.jumeirah.common.param.MerchantUserPageParam;
 import com.jumeirah.common.param.MerchantUserPageParam;
 import com.jumeirah.common.service.MerchantPermissionService;
 import com.jumeirah.common.service.MerchantPermissionService;
+import com.jumeirah.common.service.MerchantService;
 import com.jumeirah.common.service.MerchantUserPermissionService;
 import com.jumeirah.common.service.MerchantUserPermissionService;
 import com.jumeirah.common.service.MerchantUserService;
 import com.jumeirah.common.service.MerchantUserService;
 import com.jumeirah.common.vo.LoginMerUserTokenVo;
 import com.jumeirah.common.vo.LoginMerUserTokenVo;
@@ -208,10 +209,14 @@ public class MerchantUserServiceImpl extends BaseServiceImpl<MerchantUserMapper,
         loginSysUserTokenVo.setLoginSysUserVo(loginSysUserVo);
         loginSysUserTokenVo.setLoginSysUserVo(loginSysUserVo);
         loginSysUserTokenVo.setIsAdmin(merchantUser.getIsAdmin());
         loginSysUserTokenVo.setIsAdmin(merchantUser.getIsAdmin());
         loginSysUserTokenVo.setMerchantId(merchantUser.getMcId());
         loginSysUserTokenVo.setMerchantId(merchantUser.getMcId());
+        loginSysUserTokenVo.setMerchantName(merchantService.getMerchantById(merchantUser.getMcId()).getName());
 
 
         return ApiResult.ok(loginSysUserTokenVo);
         return ApiResult.ok(loginSysUserTokenVo);
     }
     }
 
 
+    @Autowired
+    private MerchantService merchantService;
+
     @Override
     @Override
     public ApiResult<Boolean> updatePwd(MerchantUpdatePwdParam merchantUpdatePwdParam) throws Exception {
     public ApiResult<Boolean> updatePwd(MerchantUpdatePwdParam merchantUpdatePwdParam) throws Exception {
 
 

common/src/main/java/com/jumeirah/common/vo/LoginMerUserTokenVo.java

@@ -43,6 +43,9 @@ public class LoginMerUserTokenVo implements LoginToken {
     @ApiModelProperty("商户ID")
     @ApiModelProperty("商户ID")
     private Long merchantId;
     private Long merchantId;
 
 
+    @ApiModelProperty("商户name")
+    private String merchantName;
+
     /**
     /**
      * 登录用户对象
      * 登录用户对象
      */
      */