From 20dfa94d26b2c6520ed26b3427fe07fd37971893 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Wed, 14 May 2025 09:03:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FinCollectionConfirmationService.java     | 48 +++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
index 2dc1990d55..16c20ea057 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
@@ -4846,6 +4846,30 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                     voucherResultDetailDtoDf.setDimensionCustom(customerNumber);
                     voucherResultDetailDtoDf.setCredit(v.getSubscriptionMoney());
                     list.add(voucherResultDetailDtoDf);
+                    if("月还".equals(v.getReceivablesName())){
+                        if(planDetails.getPaymentMoney() != null){
+                            if (planDetails.getPaymentMoney().compareTo(BigDecimal.ZERO) >0) {
+                                BigDecimal paymentMoney = planDetails.getPaymentMoney();
+                                String subscriptionMoney = v.getSubscriptionMoney();
+                                BigDecimal subtract = paymentMoney.subtract(new BigDecimal(subscriptionMoney));
+                                planDetails.setPaymentMoney(subtract);
+                                loanRepaymentPlanDetailsFeign.updateByEntity(planDetails);
+                            }
+                        }
+                    }else{
+                        if(planDetails.getPaymentInterest() != null){
+                            if(planDetails.getPaymentInterest().compareTo(BigDecimal.ZERO)>0){
+                                BigDecimal paymentInterest = planDetails.getPaymentInterest();
+                                String subscriptionMoney = v.getSubscriptionMoney();
+                                BigDecimal subtract = paymentInterest.subtract(new BigDecimal(subscriptionMoney));
+                                planDetails.setPaymentInterest(subtract);
+                                BigDecimal paymentMoney = planDetails.getPaymentMoney();
+                                BigDecimal subtract2 = paymentMoney.subtract(new BigDecimal(subscriptionMoney));
+                                planDetails.setPaymentMoney(subtract2);
+                                loanRepaymentPlanDetailsFeign.updateByEntity(planDetails);
+                            }
+                        }
+                    }
                 }
 
                 //应收贷款车欠款_到期欠款_逾期利息--资金占用费
@@ -4879,6 +4903,30 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                     voucherResultDetailDtoDf.setDimensionCustom(customerNumber);
                     voucherResultDetailDtoDf.setCredit(v.getSubscriptionMoney());
                     list2.add(voucherResultDetailDtoDf);
+                    if("月还".equals(v.getReceivablesName())){
+                        if(planDetails.getPaymentMoney() != null){
+                            if (planDetails.getPaymentMoney().compareTo(BigDecimal.ZERO) >0) {
+                                BigDecimal paymentMoney = planDetails.getPaymentMoney();
+                                String subscriptionMoney = v.getSubscriptionMoney();
+                                BigDecimal subtract = paymentMoney.subtract(new BigDecimal(subscriptionMoney));
+                                planDetails.setPaymentMoney(subtract);
+                                loanRepaymentPlanDetailsFeign.updateByEntity(planDetails);
+                            }
+                        }
+                    }else{
+                        if(planDetails.getPaymentInterest() != null){
+                            if(planDetails.getPaymentInterest().compareTo(BigDecimal.ZERO)>0){
+                                BigDecimal paymentInterest = planDetails.getPaymentInterest();
+                                String subscriptionMoney = v.getSubscriptionMoney();
+                                BigDecimal subtract = paymentInterest.subtract(new BigDecimal(subscriptionMoney));
+                                planDetails.setPaymentInterest(subtract);
+                                BigDecimal paymentMoney = planDetails.getPaymentMoney();
+                                BigDecimal subtract2 = paymentMoney.subtract(new BigDecimal(subscriptionMoney));
+                                planDetails.setPaymentMoney(subtract2);
+                                loanRepaymentPlanDetailsFeign.updateByEntity(planDetails);
+                            }
+                        }
+                    }
                 }
 
                 if ("资金占用费".equals(v.getReceivablesName())) {