完成检核-出账金额错误

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

@@ -164,8 +164,9 @@ public class FortuneAccountServiceImpl extends ServiceImpl<FortuneAccountMapper,
                     updateFortune.setFortuneAccountBizId(fortuneAccountBizId);
                     updateFortune.setStatus(FortuneStatusEnum.CHECKED.getItemValue());
                     // 处理金额字段
-                    updateFortune.setCurrentPaymentHkdAmount(item.getHkdAmount());
-                    updateFortune.setCurrentPaymentRatio(BigDecimal.valueOf(100));
+                    updateFortune.setCurrentPaymentHkdAmount(item.getCurrentPaymentHkdAmount());
+                    updateFortune.setCurrentPaymentRatio(item.getCurrentPaymentHkdAmount()
+                            .divide(item.getHkdAmount(), 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)));
                     updateFortune.setReconciliationOperator(currentLoginUser.getUsername());
                     updateFortuneList.add(updateFortune);
                 }

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

@@ -234,14 +234,14 @@ public class FortuneServiceImpl extends ServiceImpl<FortuneMapper, Fortune>
 
         // 2. 更新expected_fortune记录为已全额发放状态
         // 统一使用港币金额
-        expectedFortune.setPaidAmount(expectedFortune.getHkdAmount());
-        expectedFortune.setUnpaidAmount(BigDecimal.ZERO);
-        expectedFortune.setPaidRatio(BigDecimal.valueOf(100));
-        expectedFortune.setUnpaidRatio(BigDecimal.ZERO);
-        expectedFortune.setStatus("6"); // 全额发放完成状态
-        expectedFortune.setActualPayoutDate(LocalDate.now());
-
-        expectedFortuneService.updateById(expectedFortune);
+//        expectedFortune.setPaidAmount(expectedFortune.getHkdAmount());
+//        expectedFortune.setUnpaidAmount(BigDecimal.ZERO);
+//        expectedFortune.setPaidRatio(BigDecimal.valueOf(100));
+//        expectedFortune.setUnpaidRatio(BigDecimal.ZERO);
+//        expectedFortune.setStatus("6"); // 全额发放完成状态
+//        expectedFortune.setActualPayoutDate(LocalDate.now());
+//
+//        expectedFortuneService.updateById(expectedFortune);
     }
 
     private BigDecimal queryDefaultExchangeRate(String currency) {
@@ -314,20 +314,20 @@ public class FortuneServiceImpl extends ServiceImpl<FortuneMapper, Fortune>
 
         // 3. 同步 expected_fortune
         // 统一使用港币金额
-        BigDecimal newPaid = expectedFortune.getPaidAmount() == null ? BigDecimal.ZERO : expectedFortune.getPaidAmount().add(currentPaymentHkdAmount);
-        BigDecimal newUnpaid = expectedFortune.getHkdAmount().subtract(newPaid);
-        String newStatus = newUnpaid.compareTo(BigDecimal.ZERO) == 0 ? "6" : "3";
-
-        expectedFortuneService.lambdaUpdate()
-                .set(ExpectedFortune::getPaidAmount, newPaid)
-                .set(ExpectedFortune::getUnpaidAmount, newUnpaid)
-                .set(ExpectedFortune::getPaidRatio,
-                        newPaid.divide(expectedFortune.getHkdAmount(), 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)))
-                .set(ExpectedFortune::getUnpaidRatio,
-                        newUnpaid.divide(expectedFortune.getHkdAmount(), 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)))
-                .set(ExpectedFortune::getStatus, newStatus)
-                .eq(ExpectedFortune::getId, expectedFortune.getId())
-                .update();
+//        BigDecimal newPaid = expectedFortune.getPaidAmount() == null ? BigDecimal.ZERO : expectedFortune.getPaidAmount().add(currentPaymentHkdAmount);
+//        BigDecimal newUnpaid = expectedFortune.getHkdAmount().subtract(newPaid);
+//        String newStatus = newUnpaid.compareTo(BigDecimal.ZERO) == 0 ? "6" : "3";
+//
+//        expectedFortuneService.lambdaUpdate()
+//                .set(ExpectedFortune::getPaidAmount, newPaid)
+//                .set(ExpectedFortune::getUnpaidAmount, newUnpaid)
+//                .set(ExpectedFortune::getPaidRatio,
+//                        newPaid.divide(expectedFortune.getHkdAmount(), 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)))
+//                .set(ExpectedFortune::getUnpaidRatio,
+//                        newUnpaid.divide(expectedFortune.getHkdAmount(), 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)))
+//                .set(ExpectedFortune::getStatus, newStatus)
+//                .eq(ExpectedFortune::getId, expectedFortune.getId())
+//                .update();
     }
 
     @Override

yd-csf-service/src/main/resources/mappers/ExpectedFortuneMapper.xml

@@ -29,14 +29,10 @@
             ifnull(sum(ef.hkd_amount),0) as totalExpectedAmount,
             ifnull(sum(ef.paid_amount),0) as totalPaidAmount,
             ifnull(sum(ef.unpaid_amount),0) as totalUnpaidAmount,
-            MAX(e.total_payment_premium) * MAX(ef.default_exchange_rate) as totalPremiumAmount,
+            MAX(p.total_payment_premium) * MAX(ef.default_exchange_rate) as totalPremiumAmount,
             count(distinct ef.policy_no) as totalPolicyCount
         from expected_fortune ef
-        LEFT JOIN (
-            SELECT p.policy_no, p.total_payment_premium
-            FROM policy p
-            GROUP BY policy_no
-        ) e ON ef.policy_no = e.policy_no
+        LEFT JOIN policy p ON ef.policy_no = p.policy_no
         <where>
             <if test="expectedFortuneIds != null and expectedFortuneIds.size > 0">
                 ef.id in