|
|
@@ -74,17 +74,26 @@ public class CorpUserServiceImpl implements CorpUserService {
|
|
|
log.info("该客户{}不是微信用户或未关联unionId", externalUserid);
|
|
|
return new YHLXUserDetailView();
|
|
|
}
|
|
|
- if (corpUser.getUserId() == 0) {
|
|
|
- User user = userMapper.selectOne(Wrappers.lambdaQuery(User.class).eq(User::getUnionid, corpUser.getUnionid()).last("limit 1"));
|
|
|
+ Long corpUserUserId = corpUser.getUserId();
|
|
|
+ User user;
|
|
|
+ if (corpUserUserId == 0) {
|
|
|
+ user = userMapper.selectOne(Wrappers.lambdaQuery(User.class).eq(User::getUnionid, corpUser.getUnionid()).last("limit 1"));
|
|
|
if (user == null) {
|
|
|
log.info("该客户{}不是银河用户", externalUserid);
|
|
|
return new YHLXUserDetailView();
|
|
|
}
|
|
|
corpUser.setUserId(user.getId());
|
|
|
corpUserMapper.updateById(corpUser);
|
|
|
+ }else {
|
|
|
+ user = Optional.ofNullable(userMapper.selectById(corpUserUserId)).orElseGet(()->{
|
|
|
+ User user1 = userMapper.selectOne(Wrappers.lambdaQuery(User.class).eq(User::getUnionid, corpUser.getUnionid()).last("limit 1"));
|
|
|
+ corpUser.setUserId(user1.getId());
|
|
|
+ corpUserMapper.updateById(corpUser);
|
|
|
+ return user1;
|
|
|
+ });
|
|
|
}
|
|
|
//关联关系
|
|
|
- List<Long> userIdList = userBindRelationService.getRelationUserIdList(corpUser.getUserId(), null);
|
|
|
+ List<Long> userIdList = userBindRelationService.getRelationUserIdList(corpUser.getUserId(), user);
|
|
|
YHLXUserDetailView view = Optional.ofNullable(beanSearcher.searchFirst(YHLXUserDetailView.class, MapUtils.builder().field(YHLXUserDetailView::getUserId, corpUser.getUserId()).op(Operator.Equal).build())).orElse(new YHLXUserDetailView());
|
|
|
if (view.getUserId() != null) {
|
|
|
view.setAddress(addressMapper.selectOne(Wrappers.lambdaQuery(Address.class).eq(Address::getUserId, view.getUserId()).eq(Address::getIsDefault, true).last("limit 1")));
|