Merge branch 'refs/heads/test_exp_fortune' into test

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

@@ -507,8 +507,6 @@ public class FortuneAccountServiceImpl extends ServiceImpl<FortuneAccountMapper,
 
 
             // 累计出账港币金额
             // 累计出账港币金额
             BigDecimal paid = paidMap.getOrDefault(ef.getExpectedFortuneBizId(), BigDecimal.ZERO);
             BigDecimal paid = paidMap.getOrDefault(ef.getExpectedFortuneBizId(), BigDecimal.ZERO);
-            BigDecimal totalAmount = ef.getHkdAmount();
-            BigDecimal unpaid = totalAmount.subtract(paid);
 
 
             // 累积已发放比例 = 累积：已发放保单记账金额/应发保单记账金额
             // 累积已发放比例 = 累积：已发放保单记账金额/应发保单记账金额
             BigDecimal totalPaidRatio = paidRatioMap.getOrDefault(ef.getExpectedFortuneBizId(), BigDecimal.ZERO);
             BigDecimal totalPaidRatio = paidRatioMap.getOrDefault(ef.getExpectedFortuneBizId(), BigDecimal.ZERO);
@@ -528,8 +526,9 @@ public class FortuneAccountServiceImpl extends ServiceImpl<FortuneAccountMapper,
                     .set(ExpectedFortune::getUnpaidRuleAmount, unpaidRule)
                     .set(ExpectedFortune::getUnpaidRuleAmount, unpaidRule)
                     .set(ExpectedFortune::getUnpaidRuleAmountHkd, unpaidRuleAmountHkd)
                     .set(ExpectedFortune::getUnpaidRuleAmountHkd, unpaidRuleAmountHkd)
                     .set(ExpectedFortune::getHkdAmount, expectedHKD)
                     .set(ExpectedFortune::getHkdAmount, expectedHKD)
+                    .set(ExpectedFortune::getPayoutAmount, expectedHKD)
                     .set(ExpectedFortune::getPaidAmount, paid)
                     .set(ExpectedFortune::getPaidAmount, paid)
-                    .set(ExpectedFortune::getUnpaidAmount, unpaid)
+                    .set(ExpectedFortune::getUnpaidAmount, unpaidRuleAmountHkd)
                     .set(ExpectedFortune::getPaidRatio, totalPaidRatio)
                     .set(ExpectedFortune::getPaidRatio, totalPaidRatio)
                     .set(ExpectedFortune::getUnpaidRatio, unpaidRatio)
                     .set(ExpectedFortune::getUnpaidRatio, unpaidRatio)
                     .set(ExpectedFortune::getStatus, newStatus)
                     .set(ExpectedFortune::getStatus, newStatus)