新单跟进v2

yd-csf-service/src/main/java/com/yd/csf/service/service/impl/FortuneServiceImpl.java

@@ -669,7 +669,7 @@ public class FortuneServiceImpl extends ServiceImpl<FortuneMapper, Fortune>
                     .list()
                     .list()
                     .stream()
                     .stream()
                     .collect(Collectors.toMap(
                     .collect(Collectors.toMap(
-                            i -> i.getPolicyNo() + "_" + i.getFortuneType() + "_" + i.getFortuneType(),
+                            i -> i.getPolicyNo() + "_" + i.getFortunePeriod() + "_" + i.getFortuneType(),
                             Function.identity(),
                             Function.identity(),
                             (oldValue, newValue) -> newValue)
                             (oldValue, newValue) -> newValue)
                     );
                     );
@@ -684,7 +684,7 @@ public class FortuneServiceImpl extends ServiceImpl<FortuneMapper, Fortune>
             BeanUtil.copyProperties(fortuneAddRequest, fortune);
             BeanUtil.copyProperties(fortuneAddRequest, fortune);
 
 
             if ("R".equals(fortuneAddRequest.getFortuneBizType())) {
             if ("R".equals(fortuneAddRequest.getFortuneBizType())) {
-                ExpectedFortune expectedFortune = expectedFortuneMap.get(fortuneAddRequest.getPolicyNo() + "_" + fortuneAddRequest.getFortuneType() + "_" + fortuneAddRequest.getFortuneType());
+                ExpectedFortune expectedFortune = expectedFortuneMap.get(fortuneAddRequest.getPolicyNo() + "_" + fortuneAddRequest.getFortunePeriod() + "_" + fortuneAddRequest.getFortuneType());
                 if (expectedFortune == null) {
                 if (expectedFortune == null) {
                     throw new BusinessException(ResultCode.NULL_ERROR.getCode(), fortuneAddRequest.getFortuneName() + " 预计出账不存在");
                     throw new BusinessException(ResultCode.NULL_ERROR.getCode(), fortuneAddRequest.getFortuneName() + " 预计出账不存在");
                 }
                 }