From 04c4486c3f9e3ac9a75659e6d82628e2bd94c529 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Tue, 27 May 2025 10:04:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E8=B4=AD=E7=BB=93=E6=B8=85=E5=87=AD?=
 =?UTF-8?q?=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FinCollectionConfirmationService.java     |  1 +
 .../fin/biz/kingdee/FinKingDeeFeignRest.java  | 18 ++++-
 .../LoanSettleApplyService.java               | 78 ++++++++++++-------
 3 files changed, 64 insertions(+), 33 deletions(-)

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 96e4d1f724..70f498add1 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
@@ -6673,6 +6673,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                     }
                     voucherDetail.setCustomerCode(customerNumber);
                     voucherDetail.setCustomerName(customerName);
+                    voucherDetail.setRepoState(busSalesOrderVehicle.getRepoState());
                 }
                 try {
                     voucherDetail.setDataTime(sdf.parse(collectionDate));
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java
index 89445d2c3e..24f41b424f 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java
@@ -1436,7 +1436,11 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
                         if (voucherDetail.getSubtrahend().compareTo(BigDecimal.ZERO) != 0) {
                             Voucher.VoucherResultDetailDto dto2 = new Voucher.VoucherResultDetailDto(); //贷方
                             dto2.setSummary("结清名义价款");
-                            dto2.setSubjectNo(bankCode);
+                            if(voucherDetail.getRepoState() != null && "1".equals(voucherDetail.getRepoState())){
+                                dto2.setSubjectNo("1201.02.03");
+                            }else{
+                                dto2.setSubjectNo(bankCode);
+                            }
                             dto2.setDimensionDept(voucherDetail.getDeptCode());
                             dto2.setDimensionCustom(voucherDetail.getCustomerCode());
                             dto2.setCredit(String.valueOf(voucherDetail.getSubtrahend()));
@@ -1456,7 +1460,11 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
                         if (voucherDetail.getSubtrahend().compareTo(BigDecimal.ZERO) != 0) {
                             Voucher.VoucherResultDetailDto dto2 = new Voucher.VoucherResultDetailDto(); //贷方
                             dto2.setSummary("还其他费用-合同违约金");
-                            dto2.setSubjectNo(bankCode);
+                            if(voucherDetail.getRepoState() != null && "1".equals(voucherDetail.getRepoState())){
+                                dto2.setSubjectNo("1201.02.03");
+                            }else{
+                                dto2.setSubjectNo(bankCode);
+                            }
                             dto2.setDimensionDept(voucherDetail.getDeptCode());
                             dto2.setDimensionCustom(voucherDetail.getCustomerCode());
                             dto2.setCredit(String.valueOf(voucherDetail.getSubtrahend()));
@@ -1476,7 +1484,11 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
                         if (voucherDetail.getSubtrahend().compareTo(BigDecimal.ZERO) != 0) {
                             Voucher.VoucherResultDetailDto dto2 = new Voucher.VoucherResultDetailDto(); //贷方
                             dto2.setSummary("还其他费用-资方其他费用");
-                            dto2.setSubjectNo(bankCode);
+                            if(voucherDetail.getRepoState() != null && "1".equals(voucherDetail.getRepoState())){
+                                dto2.setSubjectNo("1201.02.03");
+                            }else{
+                                dto2.setSubjectNo(bankCode);
+                            }
                             dto2.setDimensionDept(voucherDetail.getDeptCode());
                             dto2.setDimensionCustom(voucherDetail.getCustomerCode());
                             dto2.setCredit(String.valueOf(voucherDetail.getSubtrahend()));
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java
index f1d45a0c95..db1d2aeace 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java
@@ -2393,7 +2393,11 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
                                     if (finVo.getSubtrahend().compareTo(BigDecimal.ZERO) > 0) {
                                         Voucher.VoucherResultDetailDto voucherDetail = new Voucher.VoucherResultDetailDto();
                                         voucherDetail.setSummary("贷款保证金抵结清款");
-                                        voucherDetail.setSubjectNo(bankCode);
+                                        if("1".equals(busSalesOrderVehicle.getRepoState().toString())){
+                                            voucherDetail.setSubjectNo("1201.02.03");
+                                        }else{
+                                            voucherDetail.setSubjectNo(bankCode);
+                                        }
                                         voucherDetail.setDimensionDept(deptCode);
                                         voucherDetail.setDimensionCustom(customerNumber);
                                         voucherDetail.setCredit(finVo.getSubtrahend().toString());
@@ -2506,32 +2510,36 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
                 resultDetails.add(voucherDetail);
                 amountAll = amountAll.add(bzjKFCw);
             }
-            //资方结清款付款
-            if (zfJQK.compareTo(BigDecimal.ZERO) <= 0) {
-                if (topping == 1) {
-                    if (bbjDDMoney.compareTo(BigDecimal.ZERO) > 0) {
-                        Voucher.VoucherResultDetailDto voucherDetail1 = new Voucher.VoucherResultDetailDto();
-                        voucherDetail1.setSummary(planDetails.getBankName() + "结清");
-                        voucherDetail1.setSubjectNo(bankCode);
-                        voucherDetail1.setDimensionDept(deptCode);
-                        voucherDetail1.setDimensionCustom(customerNumber);
-                        voucherDetail1.setDebit(bbjDDMoney.toString());
-                        resultDetails.add(voucherDetail1);
-                        Voucher.VoucherResultDetailDto voucherDetail2 = new Voucher.VoucherResultDetailDto();
-                        String bankSid = loanSettleApply.getBankSid();
-                        LoanFinBank loanFinBank = loanFinBankService.fetchBySid(bankSid);
-                        if(loanFinBank != null){
-                            voucherDetail2.setBank(loanFinBank.getBankNo());
+            if("0".equals(busSalesOrderVehicle.getRepoState().toString())){//未回购
+                //资方结清款付款
+                if (zfJQK.compareTo(BigDecimal.ZERO) <= 0) {
+                    if (topping == 1) {
+                        if (bbjDDMoney.compareTo(BigDecimal.ZERO) > 0) {
+                            Voucher.VoucherResultDetailDto voucherDetail1 = new Voucher.VoucherResultDetailDto();
+                            voucherDetail1.setSummary(planDetails.getBankName() + "结清");
+                            voucherDetail1.setSubjectNo(bankCode);
+                            voucherDetail1.setDimensionDept(deptCode);
+                            voucherDetail1.setDimensionCustom(customerNumber);
+                            voucherDetail1.setDebit(bbjDDMoney.toString());
+                            resultDetails.add(voucherDetail1);
+                            Voucher.VoucherResultDetailDto voucherDetail2 = new Voucher.VoucherResultDetailDto();
+                            String bankSid = loanSettleApply.getBankSid();
+                            LoanFinBank loanFinBank = loanFinBankService.fetchBySid(bankSid);
+                            if(loanFinBank != null){
+                                voucherDetail2.setBank(loanFinBank.getBankNo());
+                            }
+                            voucherDetail2.setSummary(planDetails.getBankName() + "个贷保证金抵结清款");
+                            voucherDetail2.setSubjectNo("1009.01.00");
+                            voucherDetail2.setDimensionDept(deptCode);
+                            voucherDetail2.setDimensionCustom(customerNumber);
+                            voucherDetail2.setCredit(bbjDDMoney.toString());
+                            resultDetails.add(voucherDetail2);
                         }
-                        voucherDetail2.setSummary(planDetails.getBankName() + "个贷保证金抵结清款");
-                        voucherDetail2.setSubjectNo("1009.01.00");
-                        voucherDetail2.setDimensionDept(deptCode);
-                        voucherDetail2.setDimensionCustom(customerNumber);
-                        voucherDetail2.setCredit(bbjDDMoney.toString());
-                        resultDetails.add(voucherDetail2);
                     }
                 }
+
             }
+
             //贷款保证金扣罚
             if (amountAll.compareTo(BigDecimal.ZERO) > 0) {
                 Voucher.VoucherResultDetailDto voucherDetail = new Voucher.VoucherResultDetailDto();
@@ -4271,10 +4279,16 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
 //                    voucherDetail.setRelief(companyRelief);
 //                    voucherDetail.setNoRelief(noRelief);
                     voucherDetail.setPaymentCharges(shouxufeiCW);
-                    voucherDetails.add(voucherDetail);
+                    if("0".equals(busSalesOrderVehicle.getRepoState().toString())){
+                        voucherDetails.add(voucherDetail);
+                    }
+
                 }
-                paymentVoucher.setVoucherDetails(voucherDetails);
-                finKingDeeFeign.saveSettleBankVoucher(paymentVoucher);
+                if(!voucherDetails.isEmpty()){
+                    paymentVoucher.setVoucherDetails(voucherDetails);
+                    finKingDeeFeign.saveSettleBankVoucher(paymentVoucher);
+                }
+
             }
         }
 
@@ -4383,11 +4397,15 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
                     voucherDetail.setSubtrahend(bbjDDMoney);
                     voucherDetail.setBalance(sub.add(shouxufeiCW));
                     voucherDetail.setPaymentCharges(shouxufeiCW);
-                    voucherDetails.add(voucherDetail);
+                    if("0".equals(busSalesOrderVehicle.getRepoState().toString())){//未回购
+                        voucherDetails.add(voucherDetail);
+                    }
+                }
+                if(!voucherDetails.isEmpty()){
+                    paymentVoucher.setVoucherDetails(voucherDetails);
+                    RskVoucher rskVoucher = returnSettleBankVoucher(paymentVoucher);
+                    return rb.success().setData(rskVoucher);
                 }
-                paymentVoucher.setVoucherDetails(voucherDetails);
-                RskVoucher rskVoucher = returnSettleBankVoucher(paymentVoucher);
-                return rb.success().setData(rskVoucher);
             }
         }
         return rb.success();