From bde10c0af7769acd50b6c65b86337f4b438dbafa Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Tue, 27 May 2025 09:02:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E8=B4=AD=E6=94=B6=E8=BD=A6=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E4=BA=8C=E6=AC=A1=E9=94=80=E5=94=AE=E5=87=AD=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FinCollectionConfirmationService.java     | 10 +++-
 .../LoanOutboundApplyService.java             | 56 +++++++++++++++++++
 .../LoanRepurchaseApplyMapper.java            |  2 +
 .../LoanRepurchaseApplyMapper.xml             |  4 ++
 .../LoanRepurchaseApplyService.java           |  4 ++
 .../LoanReturnInboundApplyService.java        | 30 +++++++++-
 .../LoanSecondarySalesNotApplyService.java    | 32 +++++++++++
 7 files changed, 134 insertions(+), 4 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 fb06b30d79..96e4d1f724 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
@@ -5363,9 +5363,13 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                         Voucher.VoucherResultDetailDto voucherResultDetailDtoDf3 = new Voucher.VoucherResultDetailDto();
                         all2 = all2.add(new BigDecimal(v.getSubscriptionMoney()));
                         voucherResultDetailDtoDf3.setSummary(customerNumber+"扣回车辆再次销售-资方结清费用");
-                        DictCommonVo dictCommonVo2 = dictCommonFeign.selectBykey(planDetails.getBankName(), "investorsCode").getData();
-                        if (null != dictCommonVo2) {
-                            voucherResultDetailDtoDf3.setSubjectNo(dictCommonVo.getDictValue());
+                        if("1".equals(busSalesOrderVehicle.getRepoState())){//已回购
+                            voucherResultDetailDtoDf3.setSubjectNo("1201.03.01");
+                        }else{
+                            DictCommonVo dictCommonVo2 = dictCommonFeign.selectBykey(planDetails.getBankName(), "investorsCode").getData();
+                            if (null != dictCommonVo2) {
+                                voucherResultDetailDtoDf3.setSubjectNo(dictCommonVo.getDictValue());
+                            }
                         }
                         //核算部门
                         voucherResultDetailDtoDf3.setDimensionDept(deptVo.getOrgCode());
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoutboundapply/LoanOutboundApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoutboundapply/LoanOutboundApplyService.java
index eef9477383..915284b413 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoutboundapply/LoanOutboundApplyService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoutboundapply/LoanOutboundApplyService.java
@@ -46,6 +46,8 @@ import com.yxt.anrui.riskcenter.api.loanoutboundapply.app.AppOutboundDetailsVo;
 import com.yxt.anrui.riskcenter.api.loanoutboundapply.app.AppOutboundVinListVo;
 import com.yxt.anrui.riskcenter.api.loanoutboundapply.flow.*;
 import com.yxt.anrui.riskcenter.api.loanoutboundveh.LoanOutboundVeh;
+import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.LoanRepurchaseApply;
+import com.yxt.anrui.riskcenter.api.loanrepurchasecost.LoanRepurchaseCost;
 import com.yxt.anrui.riskcenter.api.loanrestorereportapply.AlrepaidAndArrVo;
 import com.yxt.anrui.riskcenter.api.loanreturninboundapply.LoanReturnInboundApply;
 import com.yxt.anrui.riskcenter.api.loansecondarysalesapply.LoanSecondarySalesApply;
@@ -61,6 +63,8 @@ import com.yxt.anrui.riskcenter.biz.loanoutboundveh.LoanOutboundVehService;
 import com.yxt.anrui.riskcenter.biz.loanredemptionapply.LoanRedemptionApplyService;
 import com.yxt.anrui.riskcenter.biz.loanrepaymenthistory.LoanRepaymentHistoryService;
 import com.yxt.anrui.riskcenter.biz.loanrepaymentplandetails.LoanRepaymentPlanDetailsService;
+import com.yxt.anrui.riskcenter.biz.loanrepurchaseapply.LoanRepurchaseApplyService;
+import com.yxt.anrui.riskcenter.biz.loanrepurchasecost.LoanRepurchaseCostService;
 import com.yxt.anrui.riskcenter.biz.loanrestorereportapply.LoanRestoreReportApplyService;
 import com.yxt.anrui.riskcenter.biz.loansecondarysalesapply.LoanSecondarySalesApplyService;
 import com.yxt.anrui.riskcenter.biz.loansecondarysalescost.LoanSecondarySalesCostService;
@@ -142,6 +146,10 @@ public class LoanOutboundApplyService extends MybatisBaseService<LoanOutboundApp
     private LoanSecondarySalesApplyService loanSecondarySalesApplyService;
     @Autowired
     private LoanSecondarySalesCostService loanSecondarySalesCostService;
+    @Autowired
+    private LoanRepurchaseApplyService loanRepurchaseApplyService;
+    @Autowired
+    private LoanRepurchaseCostService loanRepurchaseCostService;
 
     public PagerVo<LoanOutboundApplyVo> listPage(PagerQuery<LoanOutboundApplyQuery> pq) {
         IPage<LoanOutboundApply> page = PagerUtil.queryToPage(pq);
@@ -945,6 +953,30 @@ public class LoanOutboundApplyService extends MybatisBaseService<LoanOutboundApp
             BigDecimal zjzyfMoney = BigDecimal.ZERO;
             String lq = loanRepaymentPlanDetailsService.getYqLq(busVinSid);
             lqMoney = lqMoney.add(new BigDecimal(StringUtils.isBlank(lq) ? "0" : lq));
+            if("1".equals(busSalesOrderVehicle.getRepoState().toString())){//已回购
+                //查询回购的资方费用
+                LoanRepurchaseApply loanRepurchaseApply = loanRepurchaseApplyService.selectByBusVinSid(busSalesOrderVehicle.getSid());
+                if(loanRepurchaseApply != null){
+                    LoanRepurchaseCost loanRepurchaseCost = loanRepurchaseCostService.selectByMainSid(loanRepurchaseApply.getSid());
+                    if(loanRepurchaseCost != null){
+                        //合同违约金
+                        BigDecimal bankContractLiquidated = loanRepurchaseCost.getBankContractLiquidated();
+                        if(bankContractLiquidated != null){
+                            lqMoney = lqMoney.add(bankContractLiquidated);
+                        }
+                        //资方名义价
+                        BigDecimal bankNominalPrice = loanRepurchaseCost.getBankNominalPrice();
+                        if(bankNominalPrice != null){
+                            lqMoney = lqMoney.add(bankNominalPrice);
+                        }
+                        //资方其他费用
+                        BigDecimal bankOtherReceivable = loanRepurchaseCost.getBankOtherReceivable();
+                        if(bankOtherReceivable != null){
+                            lqMoney = lqMoney.add(bankOtherReceivable);
+                        }
+                    }
+                }
+            }
             //未到期欠款
             String wdq = loanRepaymentPlanDetailsService.getWdq(busVinSid);
             wdqMoney = wdqMoney.add(new BigDecimal(StringUtils.isBlank(wdq) ? "0" : wdq));
@@ -1130,6 +1162,30 @@ public class LoanOutboundApplyService extends MybatisBaseService<LoanOutboundApp
 
             String lq = loanRepaymentPlanDetailsService.getYqLq(busVinSid);
             lqMoney = lqMoney.add(new BigDecimal(StringUtils.isBlank(lq) ? "0" : lq));
+            if("1".equals(busSalesOrderVehicle.getRepoState().toString())){//已回购
+                //查询回购的资方费用
+                LoanRepurchaseApply loanRepurchaseApply = loanRepurchaseApplyService.selectByBusVinSid(busSalesOrderVehicle.getSid());
+                if(loanRepurchaseApply != null){
+                    LoanRepurchaseCost loanRepurchaseCost = loanRepurchaseCostService.selectByMainSid(loanRepurchaseApply.getSid());
+                    if(loanRepurchaseCost != null){
+                        //合同违约金
+                        BigDecimal bankContractLiquidated = loanRepurchaseCost.getBankContractLiquidated();
+                        if(bankContractLiquidated != null){
+                            lqMoney = lqMoney.add(bankContractLiquidated);
+                        }
+                        //资方名义价
+                        BigDecimal bankNominalPrice = loanRepurchaseCost.getBankNominalPrice();
+                        if(bankNominalPrice != null){
+                            lqMoney = lqMoney.add(bankNominalPrice);
+                        }
+                        //资方其他费用
+                        BigDecimal bankOtherReceivable = loanRepurchaseCost.getBankOtherReceivable();
+                        if(bankOtherReceivable != null){
+                            lqMoney = lqMoney.add(bankOtherReceivable);
+                        }
+                    }
+                }
+            }
             //未到期欠款
             String wdq = alrepaidAndArrVo.getUnexpiredMoney();
             wdqMoney = wdqMoney.add(new BigDecimal(StringUtils.isBlank(wdq) ? "0" : wdq));
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyMapper.java
index 7671a22be7..c9421536e6 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyMapper.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyMapper.java
@@ -49,4 +49,6 @@ public interface LoanRepurchaseApplyMapper extends BaseMapper<LoanRepurchaseAppl
     BigDecimal selByBusVinSid(String busVinSid);
 
     FinManufacturerBank selectByAccountNumAndUseSid(@Param("accountNumber") String accountNumber, @Param("useOrgSid") String useOrgSid);
+
+    LoanRepurchaseApply selectByVinSid(String sid);
 }
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyMapper.xml
index 9d7953422d..9d41aeac66 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyMapper.xml
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyMapper.xml
@@ -229,4 +229,8 @@
         where bankAccount = #{bankAccount}
           and useOrgSid = #{useOrgSid}
     </select>
+
+    <select id="selectByVinSid" resultType="com.yxt.anrui.riskcenter.api.loanrepurchaseapply.LoanRepurchaseApply">
+        select * from loan_repurchase_apply where busVinSid = #{sid}
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyService.java
index 37c8c6bf11..f935cdb44a 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyService.java
@@ -1473,4 +1473,8 @@ public class LoanRepurchaseApplyService extends MybatisBaseService<LoanRepurchas
     public BigDecimal selByBusVinSid(String busVinSid) {
         return baseMapper.selByBusVinSid(busVinSid);
     }
+
+    public LoanRepurchaseApply selectByBusVinSid(String sid) {
+        return baseMapper.selectByVinSid(sid);
+    }
 }
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturninboundapply/LoanReturnInboundApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturninboundapply/LoanReturnInboundApplyService.java
index 85ab66e300..e389f0f40e 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturninboundapply/LoanReturnInboundApplyService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanreturninboundapply/LoanReturnInboundApplyService.java
@@ -41,6 +41,8 @@ import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.riskcenter.api.loanoverduefin.UrlQuery;
 import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails;
+import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.LoanRepurchaseApply;
+import com.yxt.anrui.riskcenter.api.loanrepurchasecost.LoanRepurchaseCost;
 import com.yxt.anrui.riskcenter.api.loanrestorereportapply.AlrepaidAndArrVo;
 import com.yxt.anrui.riskcenter.api.loanreturninboundapply.*;
 import com.yxt.anrui.riskcenter.api.loanreturninboundapply.flowable.*;
@@ -51,6 +53,8 @@ import com.yxt.anrui.riskcenter.api.loansecondarysalesnotapply.LoanSecondarySale
 import com.yxt.anrui.riskcenter.api.loansecondarysalesnotapply.LoanSecondarySalesNotApplyPdfVo;
 import com.yxt.anrui.riskcenter.api.loansecondarysalesnotveh.LoanSecondarySalesNotVehDetailsVo;
 import com.yxt.anrui.riskcenter.biz.loanrepaymentplandetails.LoanRepaymentPlanDetailsService;
+import com.yxt.anrui.riskcenter.biz.loanrepurchaseapply.LoanRepurchaseApplyService;
+import com.yxt.anrui.riskcenter.biz.loanrepurchasecost.LoanRepurchaseCostService;
 import com.yxt.anrui.riskcenter.biz.loanrestorereportapply.LoanRestoreReportApplyService;
 import com.yxt.anrui.riskcenter.biz.loanreturninboundtrailer.LoanReturnInboundTrailerService;
 import com.yxt.anrui.riskcenter.biz.loanreturnvehledger.LoanReturnVehLedgerService;
@@ -128,6 +132,10 @@ public class LoanReturnInboundApplyService extends MybatisBaseService<LoanReturn
     private com.yxt.anrui.portal.api.flow.FlowableFeign flowableFeignSp;
     @Autowired
     private LoanRepaymentPlanDetailsService loanRepaymentPlanDetailsService;
+    @Autowired
+    private LoanRepurchaseApplyService loanRepurchaseApplyService;
+    @Autowired
+    private LoanRepurchaseCostService loanRepurchaseCostService;
 
     public PagerVo<LoanReturnInboundApplyVo> listPageVo(PagerQuery<LoanReturnInboundApplyQuery> pq) {
         LoanReturnInboundApplyQuery query = pq.getParams();
@@ -725,7 +733,27 @@ public class LoanReturnInboundApplyService extends MybatisBaseService<LoanReturn
         lqMoney = lqMoney.add(new BigDecimal(StringUtils.isBlank(lq) ? "0" : lq));
         if("1".equals(busSalesOrderVehicle.getRepoState().toString())){//已回购
             //查询回购的资方费用
-
+            LoanRepurchaseApply loanRepurchaseApply = loanRepurchaseApplyService.selectByBusVinSid(busSalesOrderVehicle.getSid());
+            if(loanRepurchaseApply != null){
+                LoanRepurchaseCost loanRepurchaseCost = loanRepurchaseCostService.selectByMainSid(loanRepurchaseApply.getSid());
+                if(loanRepurchaseCost != null){
+                    //合同违约金
+                    BigDecimal bankContractLiquidated = loanRepurchaseCost.getBankContractLiquidated();
+                    if(bankContractLiquidated != null){
+                        lqMoney = lqMoney.add(bankContractLiquidated);
+                    }
+                    //资方名义价
+                    BigDecimal bankNominalPrice = loanRepurchaseCost.getBankNominalPrice();
+                    if(bankNominalPrice != null){
+                        lqMoney = lqMoney.add(bankNominalPrice);
+                    }
+                    //资方其他费用
+                    BigDecimal bankOtherReceivable = loanRepurchaseCost.getBankOtherReceivable();
+                    if(bankOtherReceivable != null){
+                        lqMoney = lqMoney.add(bankOtherReceivable);
+                    }
+                }
+            }
         }
         //未到期欠款
         String wdq = loanRepaymentPlanDetailsService.getWdq(loanReturnInboundApply.getBusVinSid());
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesnotapply/LoanSecondarySalesNotApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesnotapply/LoanSecondarySalesNotApplyService.java
index cf90987005..2c05fdd1d3 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesnotapply/LoanSecondarySalesNotApplyService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesnotapply/LoanSecondarySalesNotApplyService.java
@@ -67,6 +67,8 @@ import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.riskcenter.api.loanfile.LoanFile;
 import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum;
 import com.yxt.anrui.riskcenter.api.loanoutboundapply.LoanOutboundApply;
+import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.LoanRepurchaseApply;
+import com.yxt.anrui.riskcenter.api.loanrepurchasecost.LoanRepurchaseCost;
 import com.yxt.anrui.riskcenter.api.loanrestorereportapply.AlrepaidAndArrVo;
 import com.yxt.anrui.riskcenter.api.loansecondarysalesapply.*;
 import com.yxt.anrui.riskcenter.api.loansecondarysalescost.LoanSecondarySalesCost;
@@ -78,6 +80,8 @@ import com.yxt.anrui.riskcenter.api.loansecondarysalesnotveh.LoanSecondarySalesN
 import com.yxt.anrui.riskcenter.api.loansecondarysalesveh.LoanSecondarySalesVehVo;
 import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService;
 import com.yxt.anrui.riskcenter.biz.loanrepaymentplandetails.LoanRepaymentPlanDetailsService;
+import com.yxt.anrui.riskcenter.biz.loanrepurchaseapply.LoanRepurchaseApplyService;
+import com.yxt.anrui.riskcenter.biz.loanrepurchasecost.LoanRepurchaseCostService;
 import com.yxt.anrui.riskcenter.biz.loanrestorereportapply.LoanRestoreReportApplyService;
 import com.yxt.anrui.riskcenter.biz.loansecondarysalesapply.LoanSecondarySalesApplyService;
 import com.yxt.anrui.riskcenter.biz.loansecondarysalescost.LoanSecondarySalesCostService;
@@ -158,6 +162,10 @@ public class LoanSecondarySalesNotApplyService extends MybatisBaseService<LoanSe
     private BusSalesOrderBorrowerFeign busSalesOrderBorrowerFeign;
     @Autowired
     private BasePurchaseSystemFeign basePurchaseSystemFeign;
+    @Autowired
+    private LoanRepurchaseApplyService loanRepurchaseApplyService;
+    @Autowired
+    private LoanRepurchaseCostService loanRepurchaseCostService;
 
     public PagerVo<LoanSecondarySalesNotApplyVo> listPageVo(PagerQuery<LoanSecondarySalesNotApplyQuery> pq) {
         LoanSecondarySalesNotApplyQuery query = pq.getParams();
@@ -682,6 +690,30 @@ public class LoanSecondarySalesNotApplyService extends MybatisBaseService<LoanSe
             BigDecimal zjzyfMoney = BigDecimal.ZERO;
             String lq = loanRepaymentPlanDetailsService.getYqLq(busVinSid);
             lqMoney = lqMoney.add(new BigDecimal(StringUtils.isBlank(lq) ? "0" : lq));
+            if("1".equals(busSalesOrderVehicle.getRepoState().toString())){//已回购
+                //查询回购的资方费用
+                LoanRepurchaseApply loanRepurchaseApply = loanRepurchaseApplyService.selectByBusVinSid(busSalesOrderVehicle.getSid());
+                if(loanRepurchaseApply != null){
+                    LoanRepurchaseCost loanRepurchaseCost = loanRepurchaseCostService.selectByMainSid(loanRepurchaseApply.getSid());
+                    if(loanRepurchaseCost != null){
+                        //合同违约金
+                        BigDecimal bankContractLiquidated = loanRepurchaseCost.getBankContractLiquidated();
+                        if(bankContractLiquidated != null){
+                            lqMoney = lqMoney.add(bankContractLiquidated);
+                        }
+                        //资方名义价
+                        BigDecimal bankNominalPrice = loanRepurchaseCost.getBankNominalPrice();
+                        if(bankNominalPrice != null){
+                            lqMoney = lqMoney.add(bankNominalPrice);
+                        }
+                        //资方其他费用
+                        BigDecimal bankOtherReceivable = loanRepurchaseCost.getBankOtherReceivable();
+                        if(bankOtherReceivable != null){
+                            lqMoney = lqMoney.add(bankOtherReceivable);
+                        }
+                    }
+                }
+            }
             //未到期欠款
             String wdq = loanRepaymentPlanDetailsService.getWdq(busVinSid);
             wdqMoney = wdqMoney.add(new BigDecimal(StringUtils.isBlank(wdq) ? "0" : wdq));