前端对接问题修复68

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

@@ -291,24 +291,32 @@ public class FortuneAccountServiceImpl extends ServiceImpl<FortuneAccountMapper,
             for (Fortune item : updateFortuneList) {
             for (Fortune item : updateFortuneList) {
                 ExpectedFortune expectedFortune = expectedFortuneMap.get(item.getExpectedFortuneBizId());
                 ExpectedFortune expectedFortune = expectedFortuneMap.get(item.getExpectedFortuneBizId());
                 if (Objects.nonNull(expectedFortune)) {
                 if (Objects.nonNull(expectedFortune)) {
-                    BigDecimal amount = item.getAmount();// 本次出账金额
+                    BigDecimal currentPaymentAmount = item.getCurrentPaymentAmount();// 本次出账金额
                     BigDecimal paidAmount = expectedFortune.getPaidAmount();// 已出账金额
                     BigDecimal paidAmount = expectedFortune.getPaidAmount();// 已出账金额
-                    if (expectedFortune.getAmount().compareTo(paidAmount.add(amount)) == 0) {
+                    if (expectedFortune.getAmount().compareTo(paidAmount.add(currentPaymentAmount)) == 0) {
                         // 已出账金额等于预计出账金额，更新状态为完成出账
                         // 已出账金额等于预计出账金额，更新状态为完成出账
-                        expectedFortune.setPaidAmount(paidAmount.add(amount));
+                        expectedFortune.setPaidAmount(paidAmount.add(currentPaymentAmount));
                         expectedFortune.setUnpaidAmount(BigDecimal.ZERO);
                         expectedFortune.setUnpaidAmount(BigDecimal.ZERO);
                         expectedFortune.setStatus(FortuneStatusEnum.SENT.getItemValue());
                         expectedFortune.setStatus(FortuneStatusEnum.SENT.getItemValue());
                     } else {
                     } else {
                         // 已出账金额小于预计出账金额，更新已出账金额
                         // 已出账金额小于预计出账金额，更新已出账金额
-                        expectedFortune.setPaidAmount(paidAmount.add(amount));
-                        expectedFortune.setUnpaidAmount(expectedFortune.getAmount().subtract(paidAmount.add(amount)));
+                        expectedFortune.setPaidAmount(paidAmount.add(currentPaymentAmount));
+                        expectedFortune.setUnpaidAmount(expectedFortune.getAmount().subtract(paidAmount.add(currentPaymentAmount)));
+                        expectedFortune.setStatus(FortuneStatusEnum.PARTIAL_SENT.getItemValue());
                         expectedFortune.setUpdaterId(loginUserId.toString());
                         expectedFortune.setUpdaterId(loginUserId.toString());
                         expectedFortune.setUpdateTime(LocalDateTime.now());
                         expectedFortune.setUpdateTime(LocalDateTime.now());
                     }
                     }
+                    // 更新预计出账记录
+                    expectedFortuneService.lambdaUpdate()
+                            .set(ExpectedFortune::getPaidAmount, expectedFortune.getPaidAmount())
+                            .set(ExpectedFortune::getUnpaidAmount, expectedFortune.getUnpaidAmount())
+                            .set(ExpectedFortune::getStatus, expectedFortune.getStatus())
+                            .set(ExpectedFortune::getUpdaterId, expectedFortune.getUpdaterId())
+                            .set(ExpectedFortune::getUpdateTime, expectedFortune.getUpdateTime())
+                            .eq(ExpectedFortune::getId, expectedFortune.getId())
+                            .update();
                 }
                 }
             }
             }
-            // 更新预计出账记录
-            expectedFortuneService.updateBatchById(expectedFortuneList);
         }
         }
 
 
         return true;
         return true;