Commit 4706d7d655485df4b6de81212c4d5b0c17bbd454
Merge remote-tracking branch 'origin/dev' into test
Showing
7 changed files
with
23 additions
and
2 deletions
fw-shirasawa-dao/src/main/resources/mapper/FollowTaskMapper.xml
fw-shirasawa-domain/src/main/java/cn/fw/shirasawa/domain/db/follow/FollowTask.java
fw-shirasawa-domain/src/main/java/cn/fw/shirasawa/domain/dto/FollowPoolDTO.java
fw-shirasawa-domain/src/main/java/cn/fw/shirasawa/domain/vo/follow/FollowDetailVO.java
fw-shirasawa-domain/src/main/java/cn/fw/shirasawa/domain/vo/pool/FollowPoolListVO.java
fw-shirasawa-service/src/main/java/cn/fw/shirasawa/service/bus/follow/PoolBizService.java
... | ... | @@ -22,7 +22,6 @@ import cn.fw.shirasawa.rpc.erp.UserService; |
22 | 22 | import cn.fw.shirasawa.rpc.erp.dto.UserInfoDTO; |
23 | 23 | import cn.fw.shirasawa.rpc.oop.OopService; |
24 | 24 | import cn.fw.shirasawa.rpc.oop.dto.ShopDTO; |
25 | -import cn.fw.shirasawa.rpc.order.OrderRpcService; | |
26 | 25 | import cn.fw.shirasawa.service.data.CluePoolService; |
27 | 26 | import cn.fw.shirasawa.service.data.FollowTaskService; |
28 | 27 | import cn.fw.shirasawa.service.data.SecretReportHistoryService; |
... | ... | @@ -49,7 +48,6 @@ public class PoolBizService { |
49 | 48 | private final CluePoolService cluePoolService; |
50 | 49 | private final OopService oopService; |
51 | 50 | private final UserService userService; |
52 | - private final OrderRpcService orderRpcService; | |
53 | 51 | private final SecretReportHistoryService secretReportHistoryService; |
54 | 52 | |
55 | 53 | ... | ... |
fw-shirasawa-service/src/main/java/cn/fw/shirasawa/service/bus/follow/strategy/AbstractFollowStrategy.java
... | ... | @@ -420,6 +420,11 @@ public abstract class AbstractFollowStrategy implements FollowStrategy { |
420 | 420 | * @return |
421 | 421 | */ |
422 | 422 | protected FollowTask createTask(CluePool cluePool) { |
423 | + String memberName = null; | |
424 | + MemberUserDTO user = memberRpcService.user(cluePool.getMemberId()); | |
425 | + if (Objects.nonNull(user)) { | |
426 | + memberName = StringUtils.isValid(user.getRealName()) ? user.getRealName() : user.getNickName(); | |
427 | + } | |
423 | 428 | FollowTask task = new FollowTask(); |
424 | 429 | task.setClueId(cluePool.getId()); |
425 | 430 | task.setCustomerId(cluePool.getCustomerId()); |
... | ... | @@ -433,6 +438,7 @@ public abstract class AbstractFollowStrategy implements FollowStrategy { |
433 | 438 | task.setFollowShop(cluePool.getOriginalShopId()); |
434 | 439 | task.setGroupId(cluePool.getGroupId()); |
435 | 440 | task.setMemberId(cluePool.getMemberId()); |
441 | + task.setCustomerName(memberName); | |
436 | 442 | return task; |
437 | 443 | } |
438 | 444 | ... | ... |