Browse Source

分账bug修复

liuj 7 months ago
parent
commit
a260cea703

+ 2 - 2
src/main/java/com/sunxung/factoring/service/ledger/impl/LedgerManagementServiceImpl.java

@@ -1384,7 +1384,7 @@ public class LedgerManagementServiceImpl implements LedgerManagementService {
                                                         && planFactoringAssign.getPlanFactoringId() != null && lastInterestFactoring.getId().equals(planFactoringAssign.getPlanFactoringId()));
                                                         && planFactoringAssign.getPlanFactoringId() != null && lastInterestFactoring.getId().equals(planFactoringAssign.getPlanFactoringId()));
                                         if (exist) {
                                         if (exist) {
                                             //说明最后一期计划被删了
                                             //说明最后一期计划被删了
-                                            ledgerPlanFactoringAssignList.add(addPlanFactoringInsertAssign(ledgerDate, surplusInterest, BigDecimal.ZERO,
+                                            ledgerPlanFactoringAssignList.add(addPlanFactoringInsertAssign(lastInterestFactoring.getPlanDate(), surplusInterest, BigDecimal.ZERO,
                                                     IncomeExpenditureTypeDict.ChildEnum.INTEREST.getCode(), goodsAssignVo, 0));
                                                     IncomeExpenditureTypeDict.ChildEnum.INTEREST.getCode(), goodsAssignVo, 0));
                                         } else {
                                         } else {
                                             lastInterestFactoring.setAmount(surplusInterest);
                                             lastInterestFactoring.setAmount(surplusInterest);
@@ -1423,7 +1423,7 @@ public class LedgerManagementServiceImpl implements LedgerManagementService {
                                                         && planFactoringAssign.getPlanFactoringId() != null && lastManagementFactoring.getId().equals(planFactoringAssign.getPlanFactoringId()));
                                                         && planFactoringAssign.getPlanFactoringId() != null && lastManagementFactoring.getId().equals(planFactoringAssign.getPlanFactoringId()));
                                         if (exist) {
                                         if (exist) {
                                             //说明最后一期计划被删了
                                             //说明最后一期计划被删了
-                                            ledgerPlanFactoringAssignList.add(addPlanFactoringInsertAssign(ledgerDate, surplusManagement, BigDecimal.ZERO,
+                                            ledgerPlanFactoringAssignList.add(addPlanFactoringInsertAssign(lastManagementFactoring.getPlanDate(), surplusManagement, BigDecimal.ZERO,
                                                     IncomeExpenditureTypeDict.ChildEnum.MANAGEMENT_FEE.getCode(), goodsAssignVo, 0));
                                                     IncomeExpenditureTypeDict.ChildEnum.MANAGEMENT_FEE.getCode(), goodsAssignVo, 0));
                                         } else {
                                         } else {
                                             lastManagementFactoring.setAmount(surplusManagement);
                                             lastManagementFactoring.setAmount(surplusManagement);