feature(*): bug修复

- bug修复

feature(*): bug修复
- bug修复
张志伟
1 parent 53f17218
Showing 5 changed files with 55 additions and 18 deletions
fw-valhalla-service/src/main/java/cn/fw/valhalla/component/consumer/FollowFlowConsumer.kt
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/pub/PubDistributeBizService.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/data/PublicPoolService.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/data/impl/PublicPoolServiceImpl.java
 package cn.fw.valhalla.component.consumer;
  
 import cn.fw.shirasawa.sdk.mq.FollowApproveDTO
-import cn.fw.valhalla.domain.enums.FollowTypeEnum
+import cn.fw.valhalla.domain.enums.FollowTypeEnum.PL
+import cn.fw.valhalla.domain.enums.FollowTypeEnum.ofValue
+import cn.fw.valhalla.domain.enums.PublicPoolTypeEnum
 import cn.fw.valhalla.service.bus.cust.CustomerBizService
 import cn.fw.valhalla.service.data.ClueTaskService
+import cn.fw.valhalla.service.data.PubCluePoolService
 import com.alibaba.fastjson.JSONObject
 import org.apache.rocketmq.spring.annotation.RocketMQMessageListener
 import org.apache.rocketmq.spring.core.RocketMQListener
@@ -24,7 +27,8 @@ import org.springframework.stereotype.Component
 )
 class FollowFlowConsumer(
     private val customerBizService: CustomerBizService,
-    private val clueTaskService: ClueTaskService
+    private val clueTaskService: ClueTaskService,
+    private val pubCluePoolService: PubCluePoolService
 ) : RocketMQListener<FollowApproveDTO> {
  
     private val log: Logger = LoggerFactory.getLogger(this.javaClass)
@@ -32,8 +36,18 @@ class FollowFlowConsumer(
     override fun onMessage(dto: FollowApproveDTO?) {
         log.info("跟进审批通过MQ消息回调：{}", JSONObject.toJSONString(dto));
         dto?.let { data ->
-            clueTaskService.queryOngoingTaskByClueId(data.detailId.toLong(), FollowTypeEnum.ofValue(data.type))?.apply {
-                customerBizService.abandon(this)
+            clueTaskService.queryOngoingTaskByClueId(data.detailId.toLong(), ofValue(data.type))?.apply {
+                when (this.type) {
+                    PL -> {
+                        pubCluePoolService.getById(this.clueId)?.let {
+                            customerBizService.abandon(it.vin, it.groupId, PublicPoolTypeEnum.AD)
+                        }
+                    }
+
+                    else -> {
+                        customerBizService.abandon(this)
+                    }
+                }
             }
         }
     }
@@ -474,7 +474,8 @@ public class CustomerBizService extends AbstractCustomerService {
     public void abandon(final Long customerId, final String reason) {
         CustomerDetailDto detailDto = queryById(customerId);
         BV.notNull(detailDto, () -> "档案不存在");
-        if (publicPoolService.queryByPlate(detailDto.getPlateNo(), detailDto.getGroupId()).isPresent()) {
+        PublicPool publicData = publicPoolService.queryByVin(detailDto.getFrameNo(), detailDto.getGroupId());
+        if (Objects.nonNull(publicData)) {
             return;
         }
         PublicPool publicPool = createPublicPool(detailDto, PublicPoolTypeEnum.AD, reason);
@@ -521,7 +522,24 @@ public class CustomerBizService extends AbstractCustomerService {
         if (FollowTypeEnum.RM.equals(task.getType())) {
             type = PublicPoolTypeEnum.RM;
         }
-        if (publicPoolService.queryByPlate(detailDto.getPlateNo(), detailDto.getGroupId()).isPresent()) {
+        abandon(detailDto.getFrameNo(), detailDto.getGroupId(), type);
+    }
+
+    /**
+     * 审批通过客户档案处理
+     *
+     * @param vin
+     * @param groupId
+     * @param type
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public void abandon(String vin, final Long groupId, PublicPoolTypeEnum type) {
+        CustomerDetailDto detailDto = queryByFrameNo(vin, groupId);
+        if (Objects.isNull(detailDto)) {
+            return;
+        }
+        PublicPool publicData = publicPoolService.queryByVin(detailDto.getFrameNo(), detailDto.getGroupId());
+        if (Objects.nonNull(publicData)) {
             return;
         }
         PublicPool publicPool = createPublicPool(detailDto, type, "系统判定");
@@ -532,15 +550,14 @@ public class CustomerBizService extends AbstractCustomerService {
         if (!updated) {
             return;
         }
-
         AffiliationRecord entity = createEntity(detailDto);
         entity.setReason(DefeatReasonEnum.GU.getName());
         affiliationRecordService.save(entity);
         publicPoolService.save(publicPool);
-        stammkundePoolService.reject(detailDto.getId(), task.getGroupId(), DefeatReasonEnum.GU);
+        stammkundePoolService.reject(detailDto.getId(), groupId, DefeatReasonEnum.GU);
         publicCluePoolService.removeClue(detailDto.getId(), detailDto.getAdviserId());
  
-        PublicPoolEvent poolEvent = new PublicPoolEvent(detailDto.getFrameNo(), task.getGroupId());
+        PublicPoolEvent poolEvent = new PublicPoolEvent(detailDto.getFrameNo(), groupId);
         eventPublisher.publishEvent(poolEvent);
     }
  
@@ -578,7 +595,8 @@ public class CustomerBizService extends AbstractCustomerService {
             entity.setOriginShopId(task.getFollowShop());
         }
         affiliationRecordService.save(entity);
-        if (publicPoolService.queryByPlate(detailDto.getPlateNo(), detailDto.getGroupId()).isPresent()) {
+        PublicPool publicData = publicPoolService.queryByVin(detailDto.getFrameNo(), detailDto.getGroupId());
+        if (Objects.nonNull(publicData)) {
             return;
         }
         PublicPool publicPool = createPublicPool(detailDto, type, "跟进超期");
@@ -609,7 +627,8 @@ public class CustomerBizService extends AbstractCustomerService {
         AffiliationRecord entity = createEntity(detailDto);
         entity.setReason("跟进超期");
         affiliationRecordService.save(entity);
-        if (publicPoolService.queryByPlate(detailDto.getPlateNo(), detailDto.getGroupId()).isPresent()) {
+        PublicPool publicData = publicPoolService.queryByVin(detailDto.getFrameNo(), detailDto.getGroupId());
+        if (Objects.nonNull(publicData)) {
             return;
         }
         PublicPool publicPool = createPublicPool(detailDto, PublicPoolTypeEnum.PD, PublicPoolTypeEnum.PD.getName());
@@ -380,6 +380,7 @@ public class PubDistributeBizService {
         customerService.afterDistributePubClue(vinArr, staffId, shopId, groupId);
         pubCluePoolService.saveBatch(clueList);
         stammkundePoolService.saveBatch(stammkundePoolList);
+        publicPoolService.removeBatchByVin(vinArr, groupId);
         return true;
     }
  
@@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import org.springframework.transaction.annotation.Transactional;
  
 import java.util.List;
-import java.util.Optional;
  
 /**
  * @author : kurisu
@@ -19,11 +18,11 @@ public interface PublicPoolService extends IService&lt;PublicPool&gt; {
     /**
      * 根据车牌号查询
      *
-     * @param plateNo
+     * @param vin
      * @param groupId
      * @return
      */
-    Optional<PublicPool> queryByPlate(String plateNo, Long groupId);
+    PublicPool queryByVin(String vin, Long groupId);
  
     /**
      * 移除公共池
@@ -33,6 +32,7 @@ public interface PublicPoolService extends IService&lt;PublicPool&gt; {
      */
     @Transactional(rollbackFor = Exception.class)
     void removeByCustomerId(Long customerId, Long groupId);
+
     /**
      * 移除公共池
      *
@@ -41,6 +41,7 @@ public interface PublicPoolService extends IService&lt;PublicPool&gt; {
      */
     @Transactional(rollbackFor = Exception.class)
     void removeByVin(String vin, Long groupId);
+
     /**
      * 移除公共池
      *
@@ -49,6 +50,7 @@ public interface PublicPoolService extends IService&lt;PublicPool&gt; {
      */
     @Transactional(rollbackFor = Exception.class)
     void removeBatchByVin(List<String> vinList, Long groupId);
+
     /**
      * 查询公共池
      *
@@ -67,6 +69,7 @@ public interface PublicPoolService extends IService&lt;PublicPool&gt; {
  
     /**
      * 根据门店id查询对应车架号
+     *
      * @param shopIds
      * @return
      */
@@ -26,14 +26,14 @@ import java.util.Optional;
 @Slf4j
 @Service
 public class PublicPoolServiceImpl extends ServiceImpl<PublicPoolMapper, PublicPool> implements PublicPoolService {
+
     @Override
-    public Optional<PublicPool> queryByPlate(String plateNo, Long groupId) {
-        PublicPool pool = getOne(Wrappers.<PublicPool>lambdaQuery()
+    public PublicPool queryByVin(final String vin, final Long groupId) {
+        return getOne(Wrappers.<PublicPool>lambdaQuery()
                 .eq(PublicPool::getGroupId, groupId)
-                .eq(PublicPool::getPlateNo, plateNo)
+                .eq(PublicPool::getFrameNo, vin)
                 .last("limit 1")
         );
-        return Optional.ofNullable(pool);
     }
  
     @Transactional(rollbackFor = Exception.class)