valhalla / fw-valhalla

Commit 7423e0654a905293f163ddeb09a048f8a90fa44a

Authored by 张志伟
2 parents 3c832cf5 fbd8af07

Merge branch 'bugfix' into 'master' 

:bug: 线上环境bug修复



See merge request !4
Inline Side-by-side
Showing 1 changed file with 9 additions and 1 deletions
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/CustomerRetentionRatioBizService.java
  View file @7423e06
... ... @@ -2,12 +2,14 @@ package cn.fw.valhalla.service.bus;
2 2  
3 3 import cn.fw.valhalla.common.constant.RoleCode;
4 4 import cn.fw.valhalla.common.utils.DateUtil;
  5 +import cn.fw.valhalla.common.utils.StringUtils;
5 6 import cn.fw.valhalla.domain.db.pool.StammkundePool;
6 7 import cn.fw.valhalla.domain.db.report.CustomerRetentionRatio;
7 8 import cn.fw.valhalla.domain.enums.DefeatReasonEnum;
8 9 import cn.fw.valhalla.domain.enums.StammkundeStatusEnum;
9 10 import cn.fw.valhalla.rpc.erp.UserService;
10 11 import cn.fw.valhalla.rpc.erp.dto.PostUserDTO;
  12 +import cn.fw.valhalla.rpc.erp.dto.UserInfoDTO;
11 13 import cn.fw.valhalla.rpc.oop.OopService;
12 14 import cn.fw.valhalla.rpc.oop.dto.ShopDTO;
13 15 import cn.fw.valhalla.service.data.CustomerRetentionRatioService;
... ... @@ -77,7 +79,13 @@ public class CustomerRetentionRatioBizService {
77 79 List<PostUserDTO> userDTOS = Optional.ofNullable(userService.getUserByRole(shop.getId(), RoleCode.FWGW)).orElse(new ArrayList<>());
78 80 Set<UserInfo> set = new HashSet<>();
79 81 for (StammkundePool pool : pools) {
80   - set.add(new UserInfo(pool.getAdviserId(), pool.getAdviserName()));
  82 + Long adviserId = pool.getAdviserId();
  83 + String adviserName = pool.getAdviserName();
  84 + if (StringUtils.isEmpty(adviserName)) {
  85 + UserInfoDTO user = userService.user(adviserId);
  86 + adviserName = Objects.nonNull(user) ? user.getUserName() : adviserName;
  87 + }
  88 + set.add(new UserInfo(adviserId, adviserName));
81 89 }
82 90 for (PostUserDTO pool : userDTOS) {
83 91 set.add(new UserInfo(pool.getUserId(), pool.getUserName()));
... ...