Merge remote-tracking branch 'origin/test'

张志伟
2 parents b28a22bf d65977e3
Showing 8 changed files with 32 additions and 13 deletions
fw-valhalla-server/src/main/java/cn/fw/valhalla/controller/api/CustomerApiServiceImpl.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/cust/CustomerBizService.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/impl/ACFollowStrategy.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/impl/FMFollowStrategy.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/impl/IRFollowStrategy.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/impl/RMFollowStrategy.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/data/CustomerService.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/data/impl/CustomerServiceImpl.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);
+            CustomerDetailDto detailDto = customerBiz.queryById(customerId, Boolean.FALSE);
             if (Objects.isNull(detailDto)) {
                 log.info("{} 成功: 查无此档案", msg);
                 return success();
@@ -96,7 +96,7 @@ public class CustomerBizService extends AbstractCustomerService {
      * @return
      */
     public CustomerDetailVO getDetailById(final Long cusId) {
-        CustomerDetailDto detailDto = queryById(cusId);
+        CustomerDetailDto detailDto = queryById(cusId, Boolean.FALSE);
         BV.notNull(detailDto, () -> "查无此档案");
         CustomerDetailVO vo = new CustomerDetailVO();
         BeanUtils.copyProperties(detailDto, vo);
@@ -296,8 +296,13 @@ public class CustomerBizService extends AbstractCustomerService {
      * @param cusId
      * @return
      */
-    public CustomerDetailDto queryById(final Long cusId) {
-        Customer customer = customerService.queryById(cusId);
+    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);
+        }
         if (Objects.isNull(customer)) {
             return null;
         }
@@ -335,7 +340,7 @@ public class CustomerBizService extends AbstractCustomerService {
      */
     @Transactional(rollbackFor = Exception.class)
     public void abandon(final Long customerId, final String reason) {
-        CustomerDetailDto detailDto = queryById(customerId);
+        CustomerDetailDto detailDto = queryById(customerId, Boolean.FALSE);
         BV.notNull(detailDto, () -> "档案不存在");
         if (publicPoolService.queryByPlate(detailDto.getPlateNo(), detailDto.getGroupId()).isPresent()) {
             return;
@@ -364,7 +369,7 @@ public class CustomerBizService extends AbstractCustomerService {
      */
     @Transactional(rollbackFor = Exception.class)
     public void abandon(final FollowTask task, boolean flow) {
-        CustomerDetailDto detailDto = queryById(task.getCustomerId());
+        CustomerDetailDto detailDto = queryById(task.getCustomerId(), Boolean.FALSE);
         if (Objects.isNull(detailDto)) {
             return;
         }
@@ -287,7 +287,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());
+            CustomerDetailDto customerDetailDto = customerBizService.queryById(customer.getId(), Boolean.TRUE);
             vo.setCustomerId(customer.getId());
             vo.setAdviserId(customerDetailDto.getAdviserId());
             vo.setAdviserName(customerDetailDto.getAdviserName());
@@ -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());
+            CustomerDetailDto customerDetailDto = customerBizService.queryById(followRecord.getCustomerId(), Boolean.FALSE);
             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);
+        CustomerDetailDto customerDetailDto = customerBizService.queryById(customerId, Boolean.TRUE);
         FMDetailVO vo = new FMDetailVO();
         vo.setVin(customerDetailDto.getFrameNo());
         vo.setCustomerId(customerId);
@@ -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());
+            CustomerDetailDto customerDetailDto = customerBizService.queryById(followRecord.getCustomerId(), Boolean.TRUE);
             vo.setName(customerDetailDto.getName());
             vo.setCarImage(customerDetailDto.getCarImage());
             vo.setPlateNo(customerDetailDto.getPlateNo());
@@ -408,7 +408,7 @@ public class IRFollowStrategy extends AbstractFollowStrategy {
  
     @Override
     public IRDetailVO assemble(Long customerId) {
-        CustomerDetailDto detailDto = customerBizService.queryById(customerId);
+        CustomerDetailDto detailDto = customerBizService.queryById(customerId, Boolean.TRUE);
         IRDetailVO vo = new IRDetailVO();
         vo.setCustomerId(customerId);
         vo.setAdviserId(detailDto.getAdviserId());
@@ -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());
+            CustomerDetailDto customerDetailDto = customerBizService.queryById(followRecord.getCustomerId(), Boolean.TRUE);
             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);
+        CustomerDetailDto customerDetailDto = customerBizService.queryById(customerId, Boolean.TRUE);
         RMDetailVO vo = new RMDetailVO();
         vo.setCustomerId(customerId);
         vo.setName(customerDetailDto.getName());
@@ -36,6 +36,13 @@ public interface CustomerService extends IService&lt;Customer&gt; {
     Customer queryById(Long id);
  
     /**
+     * 查询档案需要无效的
+     * @param id
+     * @return
+     */
+    Customer queryByIdWithInvalid(Long id);
+
+    /**
      * 根据车牌号查询档案信息
      *
      * @param plateNo
@@ -41,6 +41,13 @@ public class CustomerServiceImpl extends ServiceImpl&lt;CustomerMapper, Customer&gt; i
     }
  
     @Override
+    public Customer queryByIdWithInvalid(Long id) {
+        return this.getBaseMapper().selectOne(Wrappers.<Customer>lambdaQuery()
+                .eq(Customer::getId, id)
+                .last("limit 1"));
+    }
+
+    @Override
     public Customer queryByPlateNo(String plateNo, Long groupId) {
         return this.getBaseMapper().selectOne(Wrappers.<Customer>lambdaQuery()
                 .eq(Customer::getPlateNo, plateNo)