新单跟进v2

yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiExpectedFortuneServiceImpl.java

@@ -21,6 +21,7 @@ import com.yd.csf.api.dto.*;
 import com.yd.csf.api.service.ApiBasicLawCalculateService;
 import com.yd.csf.api.service.ApiExpectedFortuneLogService;
 import com.yd.csf.api.service.ApiExpectedFortuneService;
+import com.yd.csf.feign.dto.appointmentfile.ItineraryDto;
 import com.yd.csf.feign.request.expectedfortune.*;
 import com.yd.csf.feign.response.expectedfortune.ApiExpectedFortunePageResponse;
 import com.yd.csf.feign.response.expectedfortune.ApiGenerateExpectedFortuneResponse;
@@ -305,7 +306,7 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
                         }
                     }
                 }
-                //批量设置应付款编号
+                //批量设置应付款编号、发佣类型
                 updatePayableNoBatch(policyNo);
 
                 //执行成功完毕，也要销毁redis缓存
@@ -412,6 +413,9 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
         //查询当前保单号的所有预计发佣记录
         List<ExpectedFortune> expectedFortuneList = iExpectedFortuneService.queryList(policyNo);
 
+        //查询redis缓存的字典列表信息
+        List<GetDictItemListByDictTypeResponse> dictTypeResponses = redisUtil.getCacheObject(RedisConstants.DICT_LIST);
+
         //获取当前序号作为起点
         int currentSeq = 0;
         if (!Objects.isNull(latest)) {
@@ -419,8 +423,12 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
         }
 
         //批量更新应付款编号，每个item递增
+        ExpectedFortune expectedFortune;
         for (int i = 0; i < expectedFortuneList.size(); i++) {
-            expectedFortuneList.get(i).setPayableNo(this.createPayableNo("R", currentSeq + i + 1));
+            expectedFortune = expectedFortuneList.get(i);
+            expectedFortune.setPayableNo(this.createPayableNo("R", currentSeq + i + 1));
+            expectedFortune.setFortuneType(GetDictItemListByDictTypeResponse.getItemValue(dictTypeResponses,
+                    "csf_fortune_type", expectedFortune.getFortuneName()));
         }
         iExpectedFortuneService.updateBatchById(expectedFortuneList);
     }