valhalla / fw-shirasawa

Commit 4b4494401daac337599f40d2b70f0445fb4904bf

Authored by 张志伟
1 parent 3e2ed0d2

:rocket: 新增客户名称的字段

Inline Side-by-side
Showing 7 changed files with 23 additions and 2 deletions
fw-shirasawa-dao/src/main/resources/mapper/FollowTaskMapper.xml
  View file @4b44944
... ... @@ -9,6 +9,7 @@
9 9 SELECT t1.id,
10 10 t2.plate_no plate_no,
11 11 t2.frame_no frame_no,
  12 + t1.customer_name customer_name,
12 13 t1.type type,
13 14 t1.follow_user user_id,
14 15 t1.follow_user_name follow_user_name,
... ...
fw-shirasawa-domain/src/main/java/cn/fw/shirasawa/domain/db/follow/FollowTask.java
  View file @4b44944
... ... @@ -31,6 +31,10 @@ public class FollowTask extends BaseAuditableTimeEntity<FollowTask, Long> {
31 31 */
32 32 private Long memberId;
33 33 /**
  34 + * 客户名称
  35 + */
  36 + private String customerName;
  37 + /**
34 38 * 跟进类型
35 39 */
36 40 private FollowTypeEnum type;
... ...
fw-shirasawa-domain/src/main/java/cn/fw/shirasawa/domain/dto/FollowPoolDTO.java
  View file @4b44944
... ... @@ -17,6 +17,10 @@ public class FollowPoolDTO {
17 17 */
18 18 private String plateNo;
19 19 /**
  20 + * 客户姓名
  21 + */
  22 + private String customerName;
  23 + /**
20 24 * 车架号
21 25 */
22 26 private String frameNo;
... ...
fw-shirasawa-domain/src/main/java/cn/fw/shirasawa/domain/vo/follow/FollowDetailVO.java
  View file @4b44944
... ... @@ -19,6 +19,10 @@ public class FollowDetailVO {
19 19 * 档案id
20 20 */
21 21 private Long customerId;
  22 + /**
  23 + * 客户姓名
  24 + */
  25 + private String customerName;
22 26 private Integer type;
23 27 private Integer bizType;
24 28 /**
... ...
fw-shirasawa-domain/src/main/java/cn/fw/shirasawa/domain/vo/pool/FollowPoolListVO.java
  View file @4b44944
... ... @@ -15,6 +15,10 @@ import java.util.Objects;
15 15 public class FollowPoolListVO {
16 16 private Long id;
17 17 /**
  18 + * 客户姓名
  19 + */
  20 + private String customerName;
  21 + /**
18 22 * 车牌号
19 23 */
20 24 private String plateNo;
... ...
fw-shirasawa-service/src/main/java/cn/fw/shirasawa/service/bus/follow/PoolBizService.java
  View file @4b44944
... ... @@ -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
  View file @4b44944
... ... @@ -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  
... ...