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

yd-csf-api/src/main/java/com/yd/csf/api/controller/ApiPolicyFollowController.java

@@ -529,6 +529,9 @@ public class ApiPolicyFollowController {
         if (policyFollow == null) {
             return Result.fail(ResultCode.NULL_ERROR.getCode(), ResultCode.NULL_ERROR.getMessage());
         }
+        if (ObjectUtils.isEmpty(policyFollow.getPolicyNo())) {
+            return Result.fail(ResultCode.NULL_ERROR.getCode(), "新单跟进记录中，保单号不能为空");
+        }
         if (ObjectUtils.isEmpty(policyFollow.getReconciliationCompanyCode())) {
             return Result.fail(ResultCode.NULL_ERROR.getCode(), "新单跟进记录中，reconciliationCompanyCode不能为空");
         }

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

@@ -156,11 +156,18 @@ public class ExpectedFortuneServiceImpl extends ServiceImpl<ExpectedFortuneMappe
             // 查找对应的实际发佣
             List<ApiExpectedFortunePageResponse> matchedList = actualMap.get(expected.getExpectedFortuneBizId());
             if (CollUtil.isNotEmpty(matchedList)) {
-                // 设置实际出账记录的字段：持有比例、保费、关联人员
+                // 设置实际出账记录的字段：持有比例、保费、关联人员、累积已发放保单记账金额、累积已发放港币金额、累积已发放比例%、剩余发放比例%、剩余保单记账金额、剩余发放折合港币金额
                 matchedList.forEach(actual -> {
                     actual.setBrokerRatio(expected.getBrokerRatio());
                     actual.setPremium(expected.getPremium());
                     actual.setAmountSourceName(expected.getAmountSourceName());
+
+                    actual.setPaidRuleAmount(expected.getPaidRuleAmount());
+                    actual.setPaidAmount(expected.getPaidAmount());
+                    actual.setPaidRatio(expected.getPaidRatio());
+                    actual.setUnpaidRatio(expected.getUnpaidRatio());
+                    actual.setUnpaidRuleAmount(expected.getUnpaidRuleAmount());
+                    actual.setUnpaidRuleAmounthHkd(expected.getUnpaidRuleAmounthHkd());
                 });
                 sortedList.addAll(matchedList);
 

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

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

@@ -1129,6 +1129,8 @@ public class FortuneServiceImpl extends ServiceImpl<FortuneMapper, Fortune>
                 .set(Fortune::getPayoutAmount, payoutAmount)
                 .set(Fortune::getHkdToPayoutRate, hkdToPayoutRate)
                 .set(Fortune::getHkdAmount, hkdAmount)
+                .set(Fortune::getCurrentPaymentAmount, originalAmount)
+                .set(Fortune::getCurrentPaymentHkdAmount, hkdAmount)
                 .eq(Fortune::getId, fortune.getId())
                 .update();