Commit 387e5b99033c8eaca38265dc9bb5ee027f505799

Authored by 张志伟
2 parents 744167fa eae2ecd8

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

fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/vo/pool/StammkundePoolVO.java
@@ -50,7 +50,7 @@ public class StammkundePoolVO { @@ -50,7 +50,7 @@ public class StammkundePoolVO {
50 /** 50 /**
51 * 战败原因 51 * 战败原因
52 */ 52 */
53 - private Integer reason; 53 + private String reason;
54 /** 54 /**
55 * 状态 55 * 状态
56 */ 56 */
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/PoolBizService.java
@@ -227,6 +227,10 @@ public class PoolBizService { @@ -227,6 +227,10 @@ public class PoolBizService {
227 vo.setMaintainCard(tags.contains(CusTagEnum.MAINTAIN_CARD.getValue())); 227 vo.setMaintainCard(tags.contains(CusTagEnum.MAINTAIN_CARD.getValue()));
228 vo.setWarrantyCard(tags.contains(CusTagEnum.QUA_ASS_CARD.getValue())); 228 vo.setWarrantyCard(tags.contains(CusTagEnum.QUA_ASS_CARD.getValue()));
229 } 229 }
  230 + if (Objects.nonNull(dto.getReason())) {
  231 + DefeatReasonEnum reasonEnum = DefeatReasonEnum.ofValue(dto.getReason());
  232 + vo.setReason(Objects.nonNull(reasonEnum) ? reasonEnum.getName() : null);
  233 + }
230 return vo; 234 return vo;
231 } 235 }
232 236