出账检核-设置出账金额问题

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

@@ -248,24 +248,20 @@ public class FortuneServiceImpl extends ServiceImpl<FortuneMapper, Fortune>
      * 拆分发放（按本次发放金额拆）
      */
     @Transactional(rollbackFor = Exception.class)
-    public void splitFortune(Fortune main, BigDecimal currentPaymentAmount, ExpectedFortune expectedFortune, String loginUserId, FortuneUpdateRequest fortuneUpdateRequest) {
-        if (currentPaymentAmount == null || currentPaymentAmount.compareTo(BigDecimal.ZERO) <= 0)
-            throw new BusinessException("本次发放金额必须大于0");
+    public void splitFortune(Fortune main, BigDecimal currentPaymentHkdAmount, ExpectedFortune expectedFortune, String loginUserId, FortuneUpdateRequest fortuneUpdateRequest) {
 
         if (!main.getStatus().equals(FortuneStatusEnum.CAN_SEND.getItemValue()))
             throw new BusinessException("只有可出账记录才能修改金额");
 
-        BigDecimal fullAmount = main.getAmount();
-        if (currentPaymentAmount.compareTo(main.getCurrentPaymentAmount()) > 0)
+        BigDecimal fullAmount = main.getHkdAmount();
+        if (currentPaymentHkdAmount.compareTo(main.getCurrentPaymentHkdAmount()) > 0)
             throw new BusinessException("本次发放金额不能大于可出账金额");
 
-        // 本次发放港币金额
-        BigDecimal currentHkdAmount = currentPaymentAmount.multiply(main.getExchangeRate());
         // 1. 更新主行 = 本次发放金额
-        main.setCurrentPaymentAmount(currentPaymentAmount);
-        main.setCurrentPaymentHkdAmount(currentHkdAmount);
-        main.setCurrentPaymentRatio(currentPaymentAmount
-                .divide(expectedFortune.getAmount(), 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)));
+        main.setCurrentPaymentAmount(null);
+        main.setCurrentPaymentHkdAmount(currentPaymentHkdAmount);
+        main.setCurrentPaymentRatio(currentPaymentHkdAmount
+                .divide(expectedFortune.getHkdAmount(), 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)));
         main.setStatus(FortuneStatusEnum.CHECKED.getItemValue());
         main.setUpdaterId(loginUserId);
         main.setUpdateTime(new Date());
@@ -276,15 +272,15 @@ public class FortuneServiceImpl extends ServiceImpl<FortuneMapper, Fortune>
         this.updateById(main);
 
         // 2. 剩余金额生成新行
-        BigDecimal leftAmount = fullAmount.subtract(currentPaymentAmount);
+        BigDecimal leftAmount = fullAmount.subtract(currentPaymentHkdAmount);
         if (leftAmount.compareTo(BigDecimal.ZERO) > 0) {
             Fortune part = new Fortune();
             BeanUtils.copyProperties(main, part, "id", "fortuneBizId", "currentPaymentAmount", "status", "isPart", "payoutDate");
             part.setFortuneBizId(RandomStringGenerator.generateBizId16(CommonEnum.UID_TYPE_FORTUNE.getCode()));
-            part.setCurrentPaymentAmount(leftAmount);
-            part.setCurrentPaymentHkdAmount(leftAmount.multiply(main.getExchangeRate()));
+            part.setCurrentPaymentAmount(null);
+            part.setCurrentPaymentHkdAmount(leftAmount);
             part.setCurrentPaymentRatio(leftAmount
-                    .divide(expectedFortune.getAmount(), 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)));
+                    .divide(expectedFortune.getHkdAmount(), 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100)));
             part.setStatus(FortuneStatusEnum.WAIT.getItemValue());
             part.setIsPart(1);
             part.setPayoutDate(LocalDate.now().plusMonths(1)); // 次月
@@ -300,7 +296,7 @@ public class FortuneServiceImpl extends ServiceImpl<FortuneMapper, Fortune>
         if (ef == null) return;
 
         // 统一使用港币金额
-        BigDecimal newPaid = ef.getPaidAmount() == null ? BigDecimal.ZERO : ef.getPaidAmount().add(currentHkdAmount);
+        BigDecimal newPaid = ef.getPaidAmount() == null ? BigDecimal.ZERO : ef.getPaidAmount().add(currentPaymentHkdAmount);
         BigDecimal newUnpaid = ef.getHkdAmount().subtract(newPaid);
         String newStatus = newUnpaid.compareTo(BigDecimal.ZERO) == 0 ? "6" : "3";