valhalla / fw-valhalla

Commit 95f1b4706997e9ae24b6d388e3a4602502590a1c

Authored by 张志伟
1 parent 33a55d43

feature(*): bug修复 

- bug修复
Inline Side-by-side
Showing 1 changed file with 15 additions and 3 deletions
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/impl/PubFollowStrategy.java
  View file @95f1b47
... ... @@ -2,6 +2,7 @@ package cn.fw.valhalla.service.bus.follow.strategy.impl;
2 2  
3 3 import cn.fw.shirasawa.sdk.enums.BusinessTypeEnum;
4 4 import cn.fw.shirasawa.sdk.enums.DataTypeEnum;
  5 +import cn.fw.shirasawa.sdk.enums.TerminationReason;
5 6 import cn.fw.valhalla.common.utils.DateUtil;
6 7 import cn.fw.valhalla.domain.db.OriginalData;
7 8 import cn.fw.valhalla.domain.db.follow.ClueTask;
... ... @@ -273,9 +274,6 @@ public class PubFollowStrategy implements FollowStrategy {
273 274 ClueStopDTO clueStopDTO = new ClueStopDTO();
274 275 clueStopDTO.setType(DataTypeEnum.ofValue(clueTask.getType().getValue()));
275 276 clueStopDTO.setBusinessType(BusinessTypeEnum.AS);
276   - if (TaskStateEnum.DEFEAT.equals(clueTask.getState())) {
277   - clueStopDTO.setTermination(Boolean.TRUE);
278   - }
279 277 clueStopDTO.setDetailId(String.valueOf(clueTask.getClueId()));
280 278 clueStopDTO.setShopId(clueTask.getFinishShop());
281 279 ShopDTO shop = oopService.shop(clueTask.getFinishShop());
... ... @@ -286,6 +284,20 @@ public class PubFollowStrategy implements FollowStrategy {
286 284 clueStopDTO.setGroupId(clueTask.getGroupId());
287 285 clueStopDTO.setUserId(clueTask.getFollowUser());
288 286 clueStopDTO.setUserName(clueTask.getFollowUserName());
  287 + clueStopDTO.setReason(TerminationReason.ABANDON);
  288 +
  289 + if (TaskStateEnum.DEFEAT.equals(clueTask.getState())) {
  290 + clueStopDTO.setTermination(Boolean.TRUE);
  291 + if (TaskDefeatTypeEnum.A.equals(clueTask.getReason())) {
  292 + clueStopDTO.setReason(TerminationReason.ABANDON);
  293 + }
  294 + if (TaskDefeatTypeEnum.F.equals(clueTask.getReason())) {
  295 + clueStopDTO.setReason(TerminationReason.ANOTHER);
  296 + }
  297 + if (TaskDefeatTypeEnum.D.equals(clueTask.getReason())) {
  298 + clueStopDTO.setReason(TerminationReason.ROLE_CHANGE);
  299 + }
  300 + }
289 301 return shirasawaRpcService.stopTask(clueStopDTO);
290 302 }
291 303  
... ...