出账检核-增加币种46

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

@@ -269,6 +269,7 @@ public class FortuneServiceImpl extends ServiceImpl<FortuneMapper, Fortune>
 
 
     /**
     /**
      * 保单币种对预计来佣的结算币种的默认汇率
      * 保单币种对预计来佣的结算币种的默认汇率
+     *
      * @param policyCurrency 保单币种
      * @param policyCurrency 保单币种
      * @param currency       预计来佣的结算币种
      * @param currency       预计来佣的结算币种
      * @return 汇率
      * @return 汇率
@@ -838,7 +839,7 @@ public class FortuneServiceImpl extends ServiceImpl<FortuneMapper, Fortune>
     private ExpectedFortune createExpectedFortune(FortuneAddRequest fortuneAddRequest, Policy policy, String fortuneName) {
     private ExpectedFortune createExpectedFortune(FortuneAddRequest fortuneAddRequest, Policy policy, String fortuneName) {
         // 创建 expectedFortune
         // 创建 expectedFortune
         ExpectedFortune expectedFortune = new ExpectedFortune();
         ExpectedFortune expectedFortune = new ExpectedFortune();
-        BeanUtil.copyProperties(fortuneAddRequest, expectedFortune);
+        BeanUtil.copyProperties(fortuneAddRequest, expectedFortune, "payoutDate", "actualPayoutDate");
 
 
         // 设置 policy 关联字段
         // 设置 policy 关联字段
         expectedFortune.setInsuranceCompanyBizId(policy.getInsuranceCompanyBizId());
         expectedFortune.setInsuranceCompanyBizId(policy.getInsuranceCompanyBizId());
@@ -856,6 +857,10 @@ public class FortuneServiceImpl extends ServiceImpl<FortuneMapper, Fortune>
         expectedFortune.setIsPart(0);
         expectedFortune.setIsPart(0);
         // 默认保单币种汇率
         // 默认保单币种汇率
         expectedFortune.setDefaultExchangeRate(fortuneAddRequest.getExchangeRate());
         expectedFortune.setDefaultExchangeRate(fortuneAddRequest.getExchangeRate());
+        // 预计出账年月
+        expectedFortune.setPayoutDate(LocalDate.parse(fortuneAddRequest.getPayoutDate() + "-01"));
+        // 实际出账年月
+        expectedFortune.setActualPayoutDate(LocalDate.parse(fortuneAddRequest.getActualPayoutDate() + "-01"));
 
 
         // 已出帐金额、待出帐金额、已出帐比例、待出帐比例
         // 已出帐金额、待出帐金额、已出帐比例、待出帐比例
         expectedFortune.setPaidAmount(BigDecimal.ZERO);
         expectedFortune.setPaidAmount(BigDecimal.ZERO);