组织排队开关,新增用户司机同步yms,oms预约单修改
This commit is contained in:
@@ -26,6 +26,7 @@ import com.mhd.common.log.service.AsyncLogService;
|
||||
import com.mhd.common.redis.service.RedisService;
|
||||
import com.mhd.system.api.*;
|
||||
import com.mhd.system.api.domain.*;
|
||||
import com.mhd.system.api.domain.YmsLoginUser;
|
||||
import com.mhd.system.api.domain.mall.SysTenant;
|
||||
import com.mhd.system.api.domain.mall.UserInfo;
|
||||
import com.mhd.system.api.domain.mall.UserInfoLoginDTO;
|
||||
@@ -70,6 +71,8 @@ public class SysLoginService {
|
||||
private UserServiceFeign userServiceFeign;
|
||||
@Resource
|
||||
private WlhyServiceFeign wlhyServiceFeign;
|
||||
@Resource
|
||||
private YmsServiceFeign ymsServiceFeign;
|
||||
|
||||
@Resource
|
||||
private RedisService redisService;
|
||||
@@ -459,6 +462,17 @@ public class SysLoginService {
|
||||
userInfo.setWlhyLoginUser(wlhyLoginUserR.getData());
|
||||
}
|
||||
}
|
||||
// 获取YMS登录用户基本信息
|
||||
try {
|
||||
R<YmsLoginUser> ymsLoginUserR = ymsServiceFeign.getYmsUserInfo(userInfo.getUserPo().getUserId());
|
||||
if (ymsLoginUserR.getCode() == R.SUCCESS && ymsLoginUserR.getData() != null) {
|
||||
userInfo.setYmsLoginUser(ymsLoginUserR.getData());
|
||||
log.info("获取YMS用户信息成功,userId: {}", userInfo.getUserPo().getUserId());
|
||||
}
|
||||
} catch (Exception e) {
|
||||
// 获取YMS用户信息失败时,记录日志但不影响登录
|
||||
log.warn("获取YMS用户信息失败,但不影响登录: {}", e.getMessage());
|
||||
}
|
||||
if(mallFlag == 1){
|
||||
/*单点登录,获取商城鉴权
|
||||
* 根据用户角色判断需要鉴权的服务,
|
||||
|
||||
Reference in New Issue
Block a user