feature(*): 修改人员站岗信息

- 修改人员站岗信息

feature(*): 修改人员站岗信息
- 修改人员站岗信息
张志伟
1 parent 38443fbb
Showing 13 changed files with 107 additions and 73 deletions
fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/enums/TaskDefeatTypeEnum.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/component/consumer/FollowFlowConsumer.kt
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/CustomEventListener.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/cust/AccidentPoolBizService.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/FollowApiBizService.kt
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/NoticeBizService.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/AbstractFollowStrategy.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/PubFollowStrategy.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/bus/pub/PubStandBizService.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/data/ClueTaskService.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/data/impl/ClueTaskServiceImpl.java
@@ -31,7 +31,7 @@ public enum TaskDefeatTypeEnum implements IEnum&lt;Integer&gt; {
     /**
      * 到另一门店
      */
-    F(6, "到另一门店"),
+    F(6, "其他人成交"),
     ;
  
     /**
 package cn.fw.valhalla.component.consumer;
  
 import cn.fw.shirasawa.sdk.mq.FollowApproveDTO
+import cn.fw.valhalla.domain.enums.FollowTypeEnum
 import cn.fw.valhalla.service.bus.cust.CustomerBizService
 import cn.fw.valhalla.service.data.ClueTaskService
-import cn.fw.valhalla.service.data.FollowClueService
 import com.alibaba.fastjson.JSONObject
 import org.apache.rocketmq.spring.annotation.RocketMQMessageListener
 import org.apache.rocketmq.spring.core.RocketMQListener
@@ -24,8 +24,7 @@ import org.springframework.stereotype.Component
 )
 class FollowFlowConsumer(
     private val customerBizService: CustomerBizService,
-    private val clueTaskService: ClueTaskService,
-    private val followClueService: FollowClueService
+    private val clueTaskService: ClueTaskService
 ) : RocketMQListener<FollowApproveDTO> {
  
     private val log: Logger = LoggerFactory.getLogger(this.javaClass)
@@ -33,11 +32,8 @@ class FollowFlowConsumer(
     override fun onMessage(dto: FollowApproveDTO?) {
         log.info("跟进审批通过MQ消息回调：{}", JSONObject.toJSONString(dto));
         dto?.let { data ->
-            val clue = followClueService.getById(data.detailId.toLong())
-            clue?.let {
-                clueTaskService.queryOngoingTaskByClueId(it.id)?.apply {
-                    customerBizService.abandon(this)
-                }
+            clueTaskService.queryOngoingTaskByClueId(data.detailId.toLong(), FollowTypeEnum.ofValue(data.type))?.apply {
+                customerBizService.abandon(this)
             }
         }
     }
@@ -4,6 +4,7 @@ import cn.fw.valhalla.domain.db.follow.ClueTask;
 import cn.fw.valhalla.domain.enums.FollowTypeEnum;
 import cn.fw.valhalla.domain.vo.setting.SettingVO;
 import cn.fw.valhalla.service.bus.follow.FollowBizService;
+import cn.fw.valhalla.service.bus.follow.strategy.impl.PubFollowStrategy;
 import cn.fw.valhalla.service.bus.setting.SettingBizService;
 import cn.fw.valhalla.service.event.PublicPoolEvent;
 import cn.fw.valhalla.service.event.SettingChangeEvent;
@@ -29,12 +30,15 @@ import java.util.Optional;
 public class CustomEventListener {
     private final SettingBizService settingBizService;
     private final FollowBizService followBizService;
+    private final PubFollowStrategy pubFollowStrategy;
  
     @Autowired
     public CustomEventListener(final SettingBizService settingBizService,
-                               final FollowBizService followBizService) {
+                               final FollowBizService followBizService,
+                               final PubFollowStrategy pubFollowStrategy) {
         this.settingBizService = settingBizService;
         this.followBizService = followBizService;
+        this.pubFollowStrategy = pubFollowStrategy;
     }
  
     /**
@@ -73,7 +77,8 @@ public class CustomEventListener {
         Long groupId = event.getGroupId();
         boolean fromTask = event.isFromTask();
  
-        followBizService.stopClue(vin, groupId,fromTask);
+        followBizService.stopClue(vin, groupId, fromTask);
+        pubFollowStrategy.clueConvertFailedFromFlow(vin, groupId);
     }
  
     /**
@@ -107,7 +107,7 @@ public class AccidentPoolBizService {
     @Transactional(rollbackFor = Exception.class)
     public void closeTask(FollowClue clue) {
         clue.setClueState(ClueStatusEnum.FAILURE);
-        ClueTask clueTask = clueTaskService.queryOngoingTaskByClueId(clue.getId());
+        ClueTask clueTask = clueTaskService.queryOngoingTaskByClueId(clue.getId(), clue.getClueType());
         if (Objects.nonNull(clueTask)) {
             clueTask.setState(TaskStateEnum.DEFEAT);
             clueTask.setReason(TaskDefeatTypeEnum.C);
@@ -122,6 +122,6 @@ class FollowApiBizService(
         if (Objects.isNull(lastOngoingClue)) {
             return null;
         }
-        return clueTaskService.queryOngoingTaskByClueId(lastOngoingClue.id);
+        return clueTaskService.queryOngoingTaskByClueId(lastOngoingClue.id, lastOngoingClue.clueType);
     }
 }
@@ -160,7 +160,7 @@ public class NoticeBizService {
         record.setStatusDesc(templateResult.getSceneToken().toString());
         if (SendStatusEnum.FAILED.equals(record.getStatus())) {
             Long staffId = customer.getAdviserId();
-            ClueTask task = clueTaskService.queryOngoingTaskByClueId(cluePool.getId());
+            ClueTask task = clueTaskService.queryOngoingTaskByClueId(cluePool.getId(), cluePool.getClueType());
             if (Objects.nonNull(task)) {
                 staffId = task.getFollowUser();
             }
@@ -200,7 +200,7 @@ public class NoticeBizService {
         record.setStatusDesc(templateResult.getSceneToken().toString());
         if (SendStatusEnum.FAILED.equals(record.getStatus())) {
             Long staffId = null;
-            ClueTask task = clueTaskService.queryOngoingTaskByClueId(cluePool.getId());
+            ClueTask task = clueTaskService.queryOngoingTaskByClueId(cluePool.getId(), cluePool.getClueType());
             if (Objects.nonNull(task)) {
                 staffId = task.getFollowUser();
             }
@@ -239,7 +239,7 @@ public class NoticeBizService {
         record.setStatusDesc(templateResult.getSceneToken().toString());
         if (SendStatusEnum.FAILED.equals(record.getStatus())) {
             Long staffId = null;
-            ClueTask task = clueTaskService.queryOngoingTaskByClueId(cluePool.getId());
+            ClueTask task = clueTaskService.queryOngoingTaskByClueId(cluePool.getId(), cluePool.getClueType());
             if (Objects.nonNull(task)) {
                 staffId = task.getFollowUser();
             }
@@ -265,7 +265,7 @@ public abstract class AbstractFollowStrategy implements FollowStrategy {
         clue.setCloseTime(LocalDateTime.now());
         followClueService.updateById(clue);
         redisTemplate.opsForSet().add(generateStopKey(), String.valueOf(clue.getId()));
-        ClueTask task = clueTaskService.queryOngoingTaskByClueId(clue.getId());
+        ClueTask task = clueTaskService.queryOngoingTaskByClueId(clue.getId(), clue.getClueType());
         if (Objects.isNull(task)) {
             return;
         }
@@ -308,7 +308,7 @@ public abstract class AbstractFollowStrategy implements FollowStrategy {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void onFollowComplete(FollowClue clue, boolean overdue) {
-        ClueTask task = clueTaskService.queryOngoingTaskByClueId(clue.getId());
+        ClueTask task = clueTaskService.queryOngoingTaskByClueId(clue.getId(), clue.getClueType());
         if (!overdue && Objects.nonNull(task)) {
             Integer times = Optional.ofNullable(task.getTimes()).orElse(0);
             task.setTimes(times + 1);
@@ -419,7 +419,7 @@ public abstract class AbstractFollowStrategy implements FollowStrategy {
         if (Objects.isNull(followClue)) {
             return;
         }
-        ClueTask clueTask = clueTaskService.queryOngoingTaskByClueId(followClue.getId());
+        ClueTask clueTask = clueTaskService.queryOngoingTaskByClueId(followClue.getId(), followClue.getClueType());
         if (Objects.isNull(clueTask)) {
             return;
         }
@@ -192,7 +192,7 @@ public class ACFollowStrategy extends AbstractFollowStrategy {
         if (Objects.isNull(followClue)) {
             return;
         }
-        ClueTask clueTask = clueTaskService.queryOngoingTaskByClueId(followClue.getId());
+        ClueTask clueTask = clueTaskService.queryOngoingTaskByClueId(followClue.getId(), followClue.getClueType());
         if (Objects.isNull(clueTask)) {
             return;
         }
@@ -22,6 +22,7 @@ import cn.fw.valhalla.service.bus.follow.strategy.FollowStrategy;
 import cn.fw.valhalla.service.bus.setting.SettingBizService;
 import cn.fw.valhalla.service.data.ClueTaskService;
 import cn.fw.valhalla.service.data.PubCluePoolService;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -84,6 +85,7 @@ public class PubFollowStrategy implements FollowStrategy {
      */
     @Override
     public boolean origin2task(final OriginalData originalData) {
+        // 公共池线索不存在这种场景
         return false;
     }
  
@@ -131,7 +133,7 @@ public class PubFollowStrategy implements FollowStrategy {
         pubClue.setState(PublicClueStateEnum.COMPLETE);
         pubClue.setCloseTime(LocalDateTime.now());
  
-        ClueTask clueTask = clueTaskService.queryOngoingTaskByClueId(pubClue.getId());
+        ClueTask clueTask = clueTaskService.queryOngoingTaskByClueId(pubClue.getId(), FollowTypeEnum.PL);
         if (Objects.nonNull(clueTask)) {
             clueTask.setCloseTime(LocalDateTime.now());
             clueTask.setFinishUser(pubClue.getAdviserId());
@@ -152,8 +154,9 @@ public class PubFollowStrategy implements FollowStrategy {
     public void clueConvertFailed(final PubCluePool pubClue, Long userId, Long shopId) {
         pubClue.setState(PublicClueStateEnum.DEFEAT);
         pubClue.setCloseTime(LocalDateTime.now());
+        pubClue.setDefeatReason(TaskDefeatTypeEnum.F);
  
-        ClueTask clueTask = clueTaskService.queryOngoingTaskByClueId(pubClue.getId());
+        ClueTask clueTask = clueTaskService.queryOngoingTaskByClueId(pubClue.getId(), FollowTypeEnum.PL);
         if (Objects.nonNull(clueTask)) {
             clueTask.setCloseTime(LocalDateTime.now());
             clueTask.setFinishUser(pubClue.getAdviserId());
@@ -171,6 +174,39 @@ public class PubFollowStrategy implements FollowStrategy {
         pubCluePoolService.updateById(pubClue);
     }
  
+    /**
+     * 审批而来的数据
+     *
+     * @param vin
+     * @param groupId
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public void clueConvertFailedFromFlow(final String vin, final Long groupId) {
+        PubCluePool cluePool = pubCluePoolService.getOne(Wrappers.<PubCluePool>lambdaQuery()
+                        .eq(PubCluePool::getVin, vin)
+                        .eq(PubCluePool::getGroupId, groupId)
+                , false);
+        if (Objects.isNull(cluePool)) {
+            return;
+        }
+        cluePool.setState(PublicClueStateEnum.DEFEAT);
+        cluePool.setCloseTime(LocalDateTime.now());
+        cluePool.setDefeatReason(TaskDefeatTypeEnum.A);
+
+        ClueTask clueTask = clueTaskService.queryOngoingTaskByClueId(cluePool.getId(), FollowTypeEnum.PL);
+        if (Objects.nonNull(clueTask)) {
+            clueTask.setCloseTime(LocalDateTime.now());
+            clueTask.setState(TaskStateEnum.DEFEAT);
+            clueTask.setReason(TaskDefeatTypeEnum.A);
+            boolean rpcSucess = rpcStopTask(clueTask);
+            clueTask.setRpcSuccess(rpcSucess);
+            clueTaskService.updateById(clueTask);
+        }
+        if (PublicClueStateEnum.ONGOING.equals(cluePool.getState())) {
+            pubCluePoolService.updateById(cluePool);
+        }
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void onRoleChangeCloseTask(final ClueTask task) {
@@ -193,7 +229,7 @@ public class PubFollowStrategy implements FollowStrategy {
  
     @Override
     public void onFollowComplete(final FollowClue clue, final boolean overdue) {
-        ClueTask task = clueTaskService.queryOngoingTaskByClueId(clue.getId());
+        ClueTask task = clueTaskService.queryOngoingTaskByClueId(clue.getId(), FollowTypeEnum.PL);
         if (!overdue && Objects.nonNull(task)) {
             Integer times = Optional.ofNullable(task.getTimes()).orElse(0);
             task.setTimes(times + 1);
@@ -267,7 +267,7 @@ public class PubDistributeBizService {
                     , Boolean.FALSE
             );
             if (Objects.nonNull(clue)) {
-                ClueTask clueTask = clueTaskService.queryOngoingTaskByClueId(clue.getId());
+                ClueTask clueTask = clueTaskService.queryOngoingTaskByClueId(clue.getId(), clue.getClueType());
                 Long followUser = clueTask.getFollowUser();
                 List<UserRoleDataRangeDTO> roleDataRange = userService.getUserRoleDataRange(followUser, RoleCode.FWGW);
                 if (!staffInfo.getStaffId().equals(followUser) && !CollectionUtils.isEmpty(roleDataRange)) {
@@ -30,9 +30,6 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.BoundListOperations;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.PlatformTransactionManager;
-import org.springframework.transaction.TransactionDefinition;
-import org.springframework.transaction.TransactionStatus;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
@@ -65,8 +62,6 @@ public class PubStandBizService {
     private final PubStandStaffInfoService pubStandStaffInfoService;
     private final ShirasawaRpcService shirasawaRpcService;
     private final StringRedisTemplate redisTemplate;
-    private final PlatformTransactionManager platformTransactionManager;
-    private final TransactionDefinition transactionDefinition;
     private final SettingBizService settingBizService;
     @Value("${spring.cache.custom.global-prefix}:stand:pub")
     @Getter
@@ -166,7 +161,6 @@ public class PubStandBizService {
      *
      * @param staffId
      */
-    @DisLock(prefix = "#this.getKeyPrefix()", key = "#staffId", message = "请勿重复站岗")
     public void join(final Long staffId) {
         this.join(staffId, true);
     }
@@ -174,6 +168,7 @@ public class PubStandBizService {
     /**
      * 重置状态
      */
+    @Transactional(rollbackFor = Exception.class)
     public void reset() {
         pubStandStaffInfoService.update(Wrappers.<PubStandStaffInfo>lambdaUpdate()
                 .set(PubStandStaffInfo::getNoInvolved, Boolean.FALSE)
@@ -187,51 +182,46 @@ public class PubStandBizService {
      * @param staffId
      * @param manual  手动站岗
      */
+    @DisLock(prefix = "#this.getKeyPrefix()", key = "#staffId", message = "请勿重复站岗")
+    @Transactional(rollbackFor = Exception.class)
     public boolean join(final Long staffId, final boolean manual) {
-        TransactionStatus transactionStatus = platformTransactionManager.getTransaction(transactionDefinition);
-        try {
-            final UserInfoDTO user = ehrRpcService.user(staffId);
-            BV.notNull(user, () -> "人员信息读取失败，请稍后重试");
-            List<UserRoleDataRange> range = userRoleRpcService.getUserRoleDataRange(staffId, RoleCode.FWGW);
-            if (CollectionUtils.isEmpty(range)) {
-                if (manual) {
-                    throw new BusinessException("非服务顾问无法站岗");
-                }
-                return false;
-            }
-            UserRoleDataRange dataRange = range.get(0);
-            final Long shopId = dataRange.getRangeValue();
-            ShopDTO shop = oopService.shop(shopId);
-            BV.notNull(shop, () -> "门店信息读取失败，请稍后重试");
-            final String shopName = shop.getShortName();
-            final String cityBh = shop.getCityBh();
-            final Long groupId = user.getGroupId();
-            Optional<PubStandStaffInfo> staffInfo = pubStandStaffInfoService.queryStaffByGroupId(staffId, groupId);
-            PubStandStaffInfo info = staffInfo.orElseGet(() -> this.generateStandInfo(user))
-                    .setShopId(shopId)
-                    .setAreaCode(cityBh)
-                    .setShopName(shopName);
+        final UserInfoDTO user = ehrRpcService.user(staffId);
+        BV.notNull(user, () -> "人员信息读取失败，请稍后重试");
+        List<UserRoleDataRange> range = userRoleRpcService.getUserRoleDataRange(staffId, RoleCode.FWGW);
+        if (CollectionUtils.isEmpty(range)) {
             if (manual) {
-                info.setNoInvolved(Boolean.FALSE);
-            }
-            boolean notodo = Boolean.FALSE.equals(shirasawaRpcService.hasOngoingFollow(staffId));
-            if (!notodo && Boolean.FALSE.equals(info.getNoInvolved())) {
-                info.setLining(Boolean.FALSE);
-                info.setQueueable(Boolean.FALSE);
-                info.setReasonOfNoLining("跟进待办未完成");
-                pubStandStaffInfoService.saveOrUpdate(info);
-            } else {
-                info.setLining(Boolean.TRUE);
-                info.setQueueable(Boolean.TRUE);
-                info.setReasonOfNoLining("");
-                this.join(info);
+                throw new BusinessException("非服务顾问无法站岗");
             }
-            platformTransactionManager.commit(transactionStatus);
-            return true;
-        } catch (Exception e) {
-            platformTransactionManager.rollback(transactionStatus);
-            throw e;
+            return false;
+        }
+        UserRoleDataRange dataRange = range.get(0);
+        final Long shopId = dataRange.getRangeValue();
+        ShopDTO shop = oopService.shop(shopId);
+        BV.notNull(shop, () -> "门店信息读取失败，请稍后重试");
+        final String shopName = shop.getShortName();
+        final String cityBh = shop.getCityBh();
+        final Long groupId = user.getGroupId();
+        Optional<PubStandStaffInfo> staffInfo = pubStandStaffInfoService.queryStaffByGroupId(staffId, groupId);
+        PubStandStaffInfo info = staffInfo.orElseGet(() -> this.generateStandInfo(user))
+                .setShopId(shopId)
+                .setAreaCode(cityBh)
+                .setShopName(shopName);
+        if (manual) {
+            info.setNoInvolved(Boolean.FALSE);
+        }
+        boolean notodo = Boolean.FALSE.equals(shirasawaRpcService.hasOngoingFollow(staffId));
+        if (!notodo && Boolean.FALSE.equals(info.getNoInvolved())) {
+            info.setLining(Boolean.FALSE);
+            info.setQueueable(Boolean.FALSE);
+            info.setReasonOfNoLining("跟进待办未完成");
+            pubStandStaffInfoService.saveOrUpdate(info);
+        } else {
+            info.setLining(Boolean.TRUE);
+            info.setQueueable(Boolean.TRUE);
+            info.setReasonOfNoLining("");
+            this.join(info);
         }
+        return true;
     }
  
     /**
@@ -3,6 +3,7 @@ package cn.fw.valhalla.service.data;
 import cn.fw.valhalla.domain.db.follow.ClueTask;
 import cn.fw.valhalla.domain.dto.FollowPoolDTO;
 import cn.fw.valhalla.domain.dto.ShouldBeCompletedDTO;
+import cn.fw.valhalla.domain.enums.FollowTypeEnum;
 import cn.fw.valhalla.domain.query.BeCompletedQuery;
 import cn.fw.valhalla.domain.query.FollowPoolQueryVO;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -24,9 +25,10 @@ public interface ClueTaskService extends IService&lt;ClueTask&gt; {
      * 跟进线索id查询进行中的线索任务
      *
      * @param clueId
+     * @param followType
      * @return
      */
-    ClueTask queryOngoingTaskByClueId(Long clueId);
+    ClueTask queryOngoingTaskByClueId(Long clueId, FollowTypeEnum followType);
  
     /**
      * 跟进池查询
@@ -4,6 +4,7 @@ import cn.fw.valhalla.dao.mapper.ClueTaskMapper;
 import cn.fw.valhalla.domain.db.follow.ClueTask;
 import cn.fw.valhalla.domain.dto.FollowPoolDTO;
 import cn.fw.valhalla.domain.dto.ShouldBeCompletedDTO;
+import cn.fw.valhalla.domain.enums.FollowTypeEnum;
 import cn.fw.valhalla.domain.enums.TaskStateEnum;
 import cn.fw.valhalla.domain.query.BeCompletedQuery;
 import cn.fw.valhalla.domain.query.FollowPoolQueryVO;
@@ -16,6 +17,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
  
+import static cn.fw.common.businessvalidator.Validator.BV;
+
 /**
  * 跟进线索任务
  *
@@ -28,9 +31,11 @@ import java.util.Optional;
 @Service
 public class ClueTaskServiceImpl extends ServiceImpl<ClueTaskMapper, ClueTask> implements ClueTaskService {
     @Override
-    public ClueTask queryOngoingTaskByClueId(Long clueId) {
+    public ClueTask queryOngoingTaskByClueId(Long clueId, FollowTypeEnum followType) {
+        BV.notNull(followType, () -> "跟进类型不正确");
         return this.getOne(Wrappers.<ClueTask>lambdaQuery()
                         .eq(ClueTask::getClueId, clueId)
+                        .eq(ClueTask::getType, followType)
                         .eq(ClueTask::getState, TaskStateEnum.ONGOING)
                 , Boolean.FALSE);
     }