From 91c29e23faa969304abbdbad07799f3f3d9f61ac Mon Sep 17 00:00:00 2001 From: Kurisu Date: Thu, 28 Jan 2021 18:00:15 +0800 Subject: [PATCH] :fire: 新增接车时作废档案后结束跟进任务等数据的逻辑 --- fw-valhalla-server/src/main/java/cn/fw/valhalla/controller/api/CustomerApiServiceImpl.java | 2 +- fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/CustomEventListener.java | 11 +++++++++-- fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/cust/CustomerBizService.java | 19 +++++++------------ fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/cust/CustomerChangeBizService.java | 7 +++++++ fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/FollowBizService.java | 53 ++++++++++++++++++++++++++++++++++++++++++++++------- fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/AbstractFollowStrategy.java | 60 +++++++++++++++++++++++++++++++++++------------------------- fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/FollowStrategy.java | 7 +++++++ fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/impl/ACFollowStrategy.java | 2 +- fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/impl/FMFollowStrategy.java | 4 ++-- fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/impl/IRFollowStrategy.java | 4 ++-- fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/impl/RMFollowStrategy.java | 4 ++-- fw-valhalla-service/src/main/java/cn/fw/valhalla/service/event/PublicPoolEvent.java | 1 + 12 files changed, 120 insertions(+), 54 deletions(-) diff --git a/fw-valhalla-server/src/main/java/cn/fw/valhalla/controller/api/CustomerApiServiceImpl.java b/fw-valhalla-server/src/main/java/cn/fw/valhalla/controller/api/CustomerApiServiceImpl.java index 66720e3..efd26af 100644 --- a/fw-valhalla-server/src/main/java/cn/fw/valhalla/controller/api/CustomerApiServiceImpl.java +++ b/fw-valhalla-server/src/main/java/cn/fw/valhalla/controller/api/CustomerApiServiceImpl.java @@ -73,7 +73,7 @@ public class CustomerApiServiceImpl implements CustomerApiService { final String msg = "查询保有客档案[queryById]"; log.info("{}: param[{}]", msg, customerId); try { - CustomerDetailDto detailDto = customerBiz.queryById(customerId, Boolean.FALSE); + CustomerDetailDto detailDto = customerBiz.queryById(customerId); if (Objects.isNull(detailDto)) { log.info("{} 成功: 查无此档案", msg); return success(); diff --git a/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/CustomEventListener.java b/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/CustomEventListener.java index e400f5f..76a8cb6 100644 --- a/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/CustomEventListener.java +++ b/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/CustomEventListener.java @@ -79,7 +79,12 @@ public class CustomEventListener { @EventListener(PublicPoolEvent.class) public void stopTaskAndAddPublic(final PublicPoolEvent event) { Long getCustomerId = event.getCustomerId(); - followBizService.stopTask(getCustomerId, event.getGroupId()); + Boolean forbidden = event.getForbidden(); + if (Boolean.TRUE.equals(forbidden)) { + followBizService.onForbidden(getCustomerId, event.getGroupId()); + } else { + followBizService.stopTask(getCustomerId, event.getGroupId()); + } } /** @@ -95,6 +100,7 @@ public class CustomEventListener { /** * 取消审批 + * * @param event */ @EventListener(CancelApproveEvent.class) @@ -107,7 +113,7 @@ public class CustomEventListener { .eq(ApproveRecord::getState, ApproveStateEnum.WAIT) .last("limit 1") ); - if (Objects.isNull(approveRecord)) { + if (Objects.isNull(approveRecord)) { return; } //FIXME 优化项 处理审批取消失败的场景 @@ -118,6 +124,7 @@ public class CustomEventListener { /** * 档案专属顾问发生改变后 + * * @param event */ @EventListener(CustomerDefeatedEvent.class) diff --git a/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/cust/CustomerBizService.java b/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/cust/CustomerBizService.java index b2a8683..6c21e73 100644 --- a/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/cust/CustomerBizService.java +++ b/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/cust/CustomerBizService.java @@ -96,7 +96,7 @@ public class CustomerBizService extends AbstractCustomerService { * @return */ public CustomerDetailVO getDetailById(final Long cusId) { - CustomerDetailDto detailDto = queryById(cusId, Boolean.FALSE); + CustomerDetailDto detailDto = queryById(cusId); BV.notNull(detailDto, () -> "查无此档案"); BV.isTrue(detailDto.getYn(), () -> "此档案已经作废，无法再继续查看"); CustomerDetailVO vo = new CustomerDetailVO(); @@ -297,13 +297,8 @@ public class CustomerBizService extends AbstractCustomerService { * @param cusId * @return */ - public CustomerDetailDto queryById(final Long cusId, final Boolean needInvalid) { - Customer customer; - if (Boolean.TRUE.equals(needInvalid)) { - customer = customerService.queryByIdWithInvalid(cusId); - } else { - customer = customerService.queryById(cusId); - } + public CustomerDetailDto queryById(final Long cusId) { + Customer customer = customerService.queryById(cusId); if (Objects.isNull(customer)) { return null; } @@ -341,7 +336,7 @@ public class CustomerBizService extends AbstractCustomerService { */ @Transactional(rollbackFor = Exception.class) public void abandon(final Long customerId, final String reason) { - CustomerDetailDto detailDto = queryById(customerId, Boolean.FALSE); + CustomerDetailDto detailDto = queryById(customerId); BV.notNull(detailDto, () -> "档案不存在"); if (publicPoolService.queryByPlate(detailDto.getPlateNo(), detailDto.getGroupId()).isPresent()) { return; @@ -359,7 +354,7 @@ public class CustomerBizService extends AbstractCustomerService { affiliationRecordService.save(entity); publicPoolService.save(publicPool); stammkundePoolService.reject(customerId, detailDto.getGroupId(), DefeatReasonEnum.GU); - PublicPoolEvent poolEvent = new PublicPoolEvent(customerId, detailDto.getGroupId()); + PublicPoolEvent poolEvent = new PublicPoolEvent(customerId, detailDto.getGroupId(), false); eventPublisher.publishEvent(poolEvent); } @@ -370,7 +365,7 @@ public class CustomerBizService extends AbstractCustomerService { */ @Transactional(rollbackFor = Exception.class) public void abandon(final FollowTask task, boolean flow) { - CustomerDetailDto detailDto = queryById(task.getCustomerId(), Boolean.FALSE); + CustomerDetailDto detailDto = queryById(task.getCustomerId()); if (Objects.isNull(detailDto)) { return; } @@ -409,7 +404,7 @@ public class CustomerBizService extends AbstractCustomerService { publicPoolService.save(publicPool); stammkundePoolService.reject(task.getCustomerId(), task.getGroupId(), reasonEnum); - PublicPoolEvent poolEvent = new PublicPoolEvent(task.getCustomerId(), task.getGroupId()); + PublicPoolEvent poolEvent = new PublicPoolEvent(task.getCustomerId(), task.getGroupId(), false); eventPublisher.publishEvent(poolEvent); } diff --git a/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/cust/CustomerChangeBizService.java b/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/cust/CustomerChangeBizService.java index e73d3d0..7f94f96 100644 --- a/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/cust/CustomerChangeBizService.java +++ b/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/cust/CustomerChangeBizService.java @@ -40,6 +40,7 @@ import cn.fw.valhalla.sdk.enums.ReasonEnum; import cn.fw.valhalla.sdk.param.ChangeAdviserReq; import cn.fw.valhalla.service.data.*; import cn.fw.valhalla.service.event.CustomerDefeatedEvent; +import cn.fw.valhalla.service.event.PublicPoolEvent; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; @@ -205,6 +206,8 @@ public class CustomerChangeBizService extends AbstractCustomerService { if (!bool) { stammkundePoolService.reject(saveDto.getId(), saveDto.getGroupId(), DefeatReasonEnum.CI); customerService.forbidden(saveDto.getMotoId()); + PublicPoolEvent poolEvent = new PublicPoolEvent(saveDto.getMotoId(), saveDto.getGroupId(), true); + eventPublisher.publishEvent(poolEvent); } Customer customer = customerService.queryById(saveDto.getId()); BV.notNull(customer, "档案信息异常"); @@ -218,6 +221,8 @@ public class CustomerChangeBizService extends AbstractCustomerService { } else { stammkundePoolService.reject(saveDto.getId(), saveDto.getGroupId(), DefeatReasonEnum.CI); customerService.forbidden(saveDto.getMotoId()); + PublicPoolEvent poolEvent = new PublicPoolEvent(saveDto.getMotoId(), saveDto.getGroupId(), true); + eventPublisher.publishEvent(poolEvent); Customer customer = new Customer(); BeanUtils.copyProperties(saveDto, customer); customer.setUseType(CarUseTypeEnum.ofValue(saveDto.getUseType())); @@ -229,6 +234,8 @@ public class CustomerChangeBizService extends AbstractCustomerService { if (Objects.nonNull(saveDto.getId())) { stammkundePoolService.reject(saveDto.getId(), saveDto.getGroupId(), DefeatReasonEnum.CI); customerService.forbidden(saveDto.getId()); + PublicPoolEvent poolEvent = new PublicPoolEvent(saveDto.getMotoId(), saveDto.getGroupId(), true); + eventPublisher.publishEvent(poolEvent); saveDto.setId(null); } Customer customer = new Customer(); diff --git a/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/FollowBizService.java b/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/FollowBizService.java index 138b11c..6d41237 100644 --- a/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/FollowBizService.java +++ b/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/FollowBizService.java @@ -400,23 +400,62 @@ public class FollowBizService { @Transactional(rollbackFor = Exception.class) public void stopTask(Long customerId, Long groupId) { List typeList = Arrays.asList(FollowTypeEnum.FM, FollowTypeEnum.RM); - List statusList = Arrays.asList(ClueStatusEnum.WAITING, ClueStatusEnum.ONGOING); List cluePoolList = customerCluePoolService.list(Wrappers.lambdaQuery() - .in(CustomerCluePool::getClueStatus, statusList) + .eq(CustomerCluePool::getClueStatus, ClueStatusEnum.ONGOING) .in(CustomerCluePool::getClueType, typeList) .eq(CustomerCluePool::getRefererId, customerId) .eq(CustomerCluePool::getGroupId, groupId) ); - if (CollectionUtils.isEmpty(cluePoolList)) { + if (!CollectionUtils.isEmpty(cluePoolList)) { + for (CustomerCluePool clue : cluePoolList) { + FollowStrategy strategy = followMap.get(clue.getClueType()); + if (Objects.nonNull(strategy)) { + strategy.forceStopClue(clue); + } + } + customerCluePoolService.updateBatchById(cluePoolList); + } + List cluePoolWaitList = customerCluePoolService.list(Wrappers.lambdaQuery() + .eq(CustomerCluePool::getClueStatus, ClueStatusEnum.WAITING) + .in(CustomerCluePool::getClueType, typeList) + .eq(CustomerCluePool::getRefererId, customerId) + .eq(CustomerCluePool::getGroupId, groupId) + ); + + if (CollectionUtils.isEmpty(cluePoolWaitList)) { return; } - for (CustomerCluePool clue : cluePoolList) { - FollowStrategy strategy = followMap.get(clue.getClueType()); - if (Objects.nonNull(strategy)) { - strategy.forceStopClue(clue); + customerCluePoolService.removeByIds(cluePoolWaitList); + } + + @Transactional(rollbackFor = Exception.class) + public void onForbidden(Long customerId, Long groupId) { + List typeList = Arrays.asList(FollowTypeEnum.FM, FollowTypeEnum.RM, FollowTypeEnum.IR); + List cluePoolList = customerCluePoolService.list(Wrappers.lambdaQuery() + .eq(CustomerCluePool::getClueStatus, ClueStatusEnum.ONGOING) + .in(CustomerCluePool::getClueType, typeList) + .eq(CustomerCluePool::getRefererId, customerId) + .eq(CustomerCluePool::getGroupId, groupId) + ); + if (!CollectionUtils.isEmpty(cluePoolList)) { + for (CustomerCluePool clue : cluePoolList) { + FollowStrategy strategy = followMap.get(clue.getClueType()); + if (Objects.nonNull(strategy)) { + strategy.onForbiddenStopClue(clue); + } } } customerCluePoolService.updateBatchById(cluePoolList); + List cluePoolWaitList = customerCluePoolService.list(Wrappers.lambdaQuery() + .eq(CustomerCluePool::getClueStatus, ClueStatusEnum.WAITING) + .in(CustomerCluePool::getClueType, typeList) + .eq(CustomerCluePool::getRefererId, customerId) + .eq(CustomerCluePool::getGroupId, groupId) + ); + + if (!CollectionUtils.isEmpty(cluePoolWaitList)) { + customerCluePoolService.removeByIds(cluePoolWaitList); + } } /** diff --git a/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/AbstractFollowStrategy.java b/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/AbstractFollowStrategy.java index 252bced..3ec9f1f 100644 --- a/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/AbstractFollowStrategy.java +++ b/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/AbstractFollowStrategy.java @@ -635,32 +635,13 @@ public abstract class AbstractFollowStrategy implements FollowStrategy { @Override @Transactional(rollbackFor = Exception.class) public void forceStopClue(CustomerCluePool clue) { - clue.setClueStatus(ClueStatusEnum.FAILURE); - clue.setCloseTime(new Date()); - FollowTask task = followTaskService.queryOngoingTaskByClueId(clue.getId()); - if (Objects.isNull(task)) { - return; - } - task.setState(TaskStateEnum.DEFEAT); - task.setCloseTime(new Date()); - task.setReason(TaskDefeatTypeEnum.A); - followTaskService.updateById(task); + onStopClue(clue, TaskDefeatTypeEnum.A); + } - List recordList = followRecordService.list(Wrappers.lambdaQuery() - .eq(FollowRecord::getTaskId, task.getId()) - .eq(FollowRecord::getCustomerId, clue.getRefererId()) - .eq(FollowRecord::getOutTime, Boolean.FALSE) - .isNull(FollowRecord::getFollowTime) - ); - if (!CollectionUtils.isEmpty(recordList)) { - for (FollowRecord record : recordList) { - if (Boolean.TRUE.equals(record.getAddTodo())) { - completeRecordAndEnd(record); - } else { - followRecordService.removeById(record.getId()); - } - } - } + @Override + @Transactional(rollbackFor = Exception.class) + public void onForbiddenStopClue(CustomerCluePool clue) { + onStopClue(clue, TaskDefeatTypeEnum.E); } @Transactional(rollbackFor = Exception.class) @@ -806,6 +787,35 @@ public abstract class AbstractFollowStrategy implements FollowStrategy { followTaskService.updateById(task); } + private void onStopClue(CustomerCluePool clue, TaskDefeatTypeEnum defeatTypeEnum) { + clue.setClueStatus(ClueStatusEnum.FAILURE); + clue.setCloseTime(new Date()); + FollowTask task = followTaskService.queryOngoingTaskByClueId(clue.getId()); + if (Objects.isNull(task)) { + return; + } + task.setState(TaskStateEnum.DEFEAT); + task.setCloseTime(new Date()); + task.setReason(defeatTypeEnum); + followTaskService.updateById(task); + + List recordList = followRecordService.list(Wrappers.lambdaQuery() + .eq(FollowRecord::getTaskId, task.getId()) + .eq(FollowRecord::getCustomerId, clue.getRefererId()) + .eq(FollowRecord::getOutTime, Boolean.FALSE) + .isNull(FollowRecord::getFollowTime) + ); + if (!CollectionUtils.isEmpty(recordList)) { + for (FollowRecord record : recordList) { + if (Boolean.TRUE.equals(record.getAddTodo())) { + completeRecordAndEnd(record); + } else { + followRecordService.removeById(record.getId()); + } + } + } + } + /** * 生成新的跟进 * diff --git a/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/FollowStrategy.java b/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/FollowStrategy.java index 66ea0f9..ad8333c 100644 --- a/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/FollowStrategy.java +++ b/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/FollowStrategy.java @@ -137,6 +137,13 @@ public interface FollowStrategy { void forceStopClue(CustomerCluePool clue); /** + * 当档案作废是强制结束任务 + * + * @param clue + */ + void onForbiddenStopClue(CustomerCluePool clue); + + /** * 更新跟进任务 * * @param customerId diff --git a/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/impl/ACFollowStrategy.java b/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/impl/ACFollowStrategy.java index 2dd96b7..048957d 100644 --- a/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/impl/ACFollowStrategy.java +++ b/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/impl/ACFollowStrategy.java @@ -303,7 +303,7 @@ public class ACFollowStrategy extends AbstractFollowStrategy { vo.setPlateNo(accidentPool.getPlateNo()); vo.setCarModel(getStrWithDefault(accidentPool.getBrandName(), "") + " " + getStrWithDefault(accidentPool.getSeriesName(), "")); if (Objects.nonNull(customer)) { - CustomerDetailDto customerDetailDto = customerBizService.queryById(customer.getId(), Boolean.TRUE); + CustomerDetailDto customerDetailDto = customerBizService.queryById(customer.getId()); vo.setCustomerId(customer.getId()); vo.setAdviserId(customerDetailDto.getAdviserId()); vo.setAdviserName(customerDetailDto.getAdviserName()); diff --git a/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/impl/FMFollowStrategy.java b/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/impl/FMFollowStrategy.java index 7e6b522..2c94d6a 100644 --- a/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/impl/FMFollowStrategy.java +++ b/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/impl/FMFollowStrategy.java @@ -52,7 +52,7 @@ public class FMFollowStrategy extends AbstractFollowStrategy { vo.setTaskId(followRecord.getTaskId()); vo.setCustomerId(followRecord.getCustomerId()); vo.setDeadline(followRecord.getDeadline()); - CustomerDetailDto customerDetailDto = customerBizService.queryById(followRecord.getCustomerId(), Boolean.FALSE); + CustomerDetailDto customerDetailDto = customerBizService.queryById(followRecord.getCustomerId()); if (Objects.nonNull(customerDetailDto)) { vo.setName(customerDetailDto.getName()); vo.setPlateNo(customerDetailDto.getPlateNo()); @@ -174,7 +174,7 @@ public class FMFollowStrategy extends AbstractFollowStrategy { @Override public FMDetailVO assemble(Long customerId) { - CustomerDetailDto customerDetailDto = customerBizService.queryById(customerId, Boolean.TRUE); + CustomerDetailDto customerDetailDto = customerBizService.queryById(customerId); FMDetailVO vo = new FMDetailVO(); vo.setVin(customerDetailDto.getFrameNo()); vo.setCustomerId(customerId); diff --git a/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/impl/IRFollowStrategy.java b/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/impl/IRFollowStrategy.java index 0126c2a..2a55655 100644 --- a/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/impl/IRFollowStrategy.java +++ b/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/impl/IRFollowStrategy.java @@ -62,7 +62,7 @@ public class IRFollowStrategy extends AbstractFollowStrategy { vo.setTaskId(followRecord.getTaskId()); vo.setCustomerId(followRecord.getCustomerId()); vo.setDeadline(followRecord.getDeadline()); - CustomerDetailDto customerDetailDto = customerBizService.queryById(followRecord.getCustomerId(), Boolean.TRUE); + CustomerDetailDto customerDetailDto = customerBizService.queryById(followRecord.getCustomerId()); vo.setName(customerDetailDto.getName()); vo.setCarImage(customerDetailDto.getCarImage()); vo.setPlateNo(customerDetailDto.getPlateNo()); @@ -407,7 +407,7 @@ public class IRFollowStrategy extends AbstractFollowStrategy { @Override public IRDetailVO assemble(Long customerId) { - CustomerDetailDto detailDto = customerBizService.queryById(customerId, Boolean.TRUE); + CustomerDetailDto detailDto = customerBizService.queryById(customerId); IRDetailVO vo = new IRDetailVO(); vo.setCustomerId(customerId); vo.setAdviserId(detailDto.getAdviserId()); diff --git a/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/impl/RMFollowStrategy.java b/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/impl/RMFollowStrategy.java index 72036b3..9e6238c 100644 --- a/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/impl/RMFollowStrategy.java +++ b/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/impl/RMFollowStrategy.java @@ -73,7 +73,7 @@ public class RMFollowStrategy extends AbstractFollowStrategy { vo.setTaskId(followRecord.getTaskId()); vo.setCustomerId(followRecord.getCustomerId()); vo.setDeadline(followRecord.getDeadline()); - CustomerDetailDto customerDetailDto = customerBizService.queryById(followRecord.getCustomerId(), Boolean.TRUE); + CustomerDetailDto customerDetailDto = customerBizService.queryById(followRecord.getCustomerId()); vo.setName(customerDetailDto.getName()); vo.setCarImage(customerDetailDto.getCarImage()); vo.setPlateNo(customerDetailDto.getPlateNo()); @@ -237,7 +237,7 @@ public class RMFollowStrategy extends AbstractFollowStrategy { @Override public RMDetailVO assemble(Long customerId) { - CustomerDetailDto customerDetailDto = customerBizService.queryById(customerId, Boolean.TRUE); + CustomerDetailDto customerDetailDto = customerBizService.queryById(customerId); RMDetailVO vo = new RMDetailVO(); vo.setCustomerId(customerId); vo.setName(customerDetailDto.getName()); diff --git a/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/event/PublicPoolEvent.java b/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/event/PublicPoolEvent.java index 32079e0..44c6eac 100644 --- a/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/event/PublicPoolEvent.java +++ b/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/event/PublicPoolEvent.java @@ -14,4 +14,5 @@ import lombok.Data; public class PublicPoolEvent { private Long customerId; private Long groupId; + private Boolean forbidden; } -- libgit2 0.22.2