Merge remote-tracking branch 'origin/dev' into test

张志伟
2 parents 73c540e5 73102043
Showing 1 changed file with 2 additions and 3 deletions
fw-shirasawa-service/src/main/java/cn/fw/shirasawa/service/bus/follow/strategy/AbstractFollowStrategy.java
@@ -204,9 +204,6 @@ public abstract class AbstractFollowStrategy implements FollowStrategy {
                 cluePool.setFinishShopName(shop.getShortName());
             }
             cluePool.setCloseTime(DateUtil.date2LocalDateTime(taskCompleteDTO.getCompleteTime()));
-            cluePool.setClueStatus(ClueStatusEnum.COMPLETE);
-            cluePoolService.updateById(cluePool);
-
             if (ClueStatusEnum.ONGOING.equals(cluePool.getClueStatus())) {
                 FollowTask task = followTaskService.queryOngoingTaskByClueId(cluePool.getId());
                 if (Objects.isNull(task)) {
@@ -228,6 +225,8 @@ public abstract class AbstractFollowStrategy implements FollowStrategy {
                     eventPublisher.publishEvent(event);
                 }
             }
+            cluePool.setClueStatus(ClueStatusEnum.COMPLETE);
+            cluePoolService.updateById(cluePool);
         }
     }