Commit acca3918150704e2f882511c87dd04d43e793c27
Merge remote-tracking branch 'origin/test'
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 { |
204 | 204 | cluePool.setFinishShopName(shop.getShortName()); |
205 | 205 | } |
206 | 206 | cluePool.setCloseTime(DateUtil.date2LocalDateTime(taskCompleteDTO.getCompleteTime())); |
207 | - cluePool.setClueStatus(ClueStatusEnum.COMPLETE); | |
208 | - cluePoolService.updateById(cluePool); | |
209 | - | |
210 | 207 | if (ClueStatusEnum.ONGOING.equals(cluePool.getClueStatus())) { |
211 | 208 | FollowTask task = followTaskService.queryOngoingTaskByClueId(cluePool.getId()); |
212 | 209 | if (Objects.isNull(task)) { |
... | ... | @@ -228,6 +225,8 @@ public abstract class AbstractFollowStrategy implements FollowStrategy { |
228 | 225 | eventPublisher.publishEvent(event); |
229 | 226 | } |
230 | 227 | } |
228 | + cluePool.setClueStatus(ClueStatusEnum.COMPLETE); | |
229 | + cluePoolService.updateById(cluePool); | |
231 | 230 | } |
232 | 231 | } |
233 | 232 | ... | ... |