From 4fee56eab3fd09e9299513cff9ab4cb0e45b6c24 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Wed, 29 Nov 2023 09:08:19 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FinCollectionConfirmationMapper.java      |  3 ++
 .../FinCollectionConfirmationMapper.xml       |  6 +++
 .../FinCollectionConfirmationService.java     | 47 ++++++++++++++++---
 .../biz/loandiff/LoanDiffMapper.java          |  3 ++
 .../biz/loandiff/LoanDiffMapper.xml           |  6 +++
 .../biz/loandiff/LoanDiffService.java         | 23 ++++++++-
 6 files changed, 80 insertions(+), 8 deletions(-)

diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java
index b2caeaeb6a..893fe1e486 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java
@@ -30,6 +30,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
 import com.yxt.anrui.fin.api.fincollectionconfirmation.*;
@@ -153,4 +154,6 @@ public interface FinCollectionConfirmationMapper extends BaseMapper<FinCollectio
     LoanFinBank selectFinBnk(String contractNo);
 
     LoanFinBank selectByBankSid(String bankSid);
+
+    BaseVehicle selectByVSid(String busVinSid);
 }
\ No newline at end of file
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml
index d271e7a384..96f89cef55 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml
@@ -298,4 +298,10 @@
     <select id="selectByBankSid" resultType="com.yxt.anrui.riskcenter.api.loanfinbank.LoanFinBank">
         select * from anrui_riskcenter.loan_fin_bank where sid = #{bankSid}
     </select>
+
+    <select id="selectByVSid" resultType="com.yxt.anrui.base.api.basevehicle.BaseVehicle">
+        select bbv.* from anrui_base.base_vehicle bbv
+        left join anrui_buscenter.bus_sales_order_vehicle bov on bov.linkSid = bbv.sid
+        where bov.sid = #{busVinSid}
+    </select>
 </mapper>
\ No newline at end of file
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 65c8973b34..2a3892c23e 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
@@ -35,6 +35,7 @@ import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
 import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign;
 import com.yxt.anrui.base.api.basetrailer.BaseTrailerDetailsVo;
 import com.yxt.anrui.base.api.basetrailer.BaseTrailerFeign;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
 import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateDto;
 import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateEnum;
@@ -1718,6 +1719,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
             for (int i = 0; i < finLi.size(); i++) {
                 FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = finLi.get(i);
                 FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(finSelectedReceivablesDetailed.getReceivablesSid());
+                BaseVehicle baseVehicle = baseMapper.selectByVSid(finUncollectedReceivablesDetailed.getBusVinSid());
                 BigDecimal bigAdd = BigDecimal.ZERO;
                 BusSalesOrderVehicle busSalesOrderVehicle = baseMapper.selectByVinSid(finUncollectedReceivablesDetailed.getBusVinSid());
                 LoanSolutions loanSolutions = baseMapper.selectLoanBySid(finUncollectedReceivablesDetailed.getBusVinSid());
@@ -1836,6 +1838,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                                         creditResultDetailDto.setExTaxMoney("-" + loanSolutions.getBondAmount().toString());
                                         creditResultDetailDto.setUseTo(CwSystemYT.BOND_AMOUNTS.getType());
                                         creditResultDetailDto.setRemarks(CwSystemYT.BOND_AMOUNTS.getMark());
+                                        if(baseVehicle != null){
+                                           String vinNo = baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8);
+                                            creditResultDetailDto.setMaterialNo(vinNo);
+                                        }
                                         collectionDetailDtoListOne.add(creditResultDetailDto);
                                     }
 
@@ -1847,6 +1853,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                                         creditResultDetailDto.setExTaxMoney("-" + loanSolutions.getActualDiscount().toString());
                                         creditResultDetailDto.setUseTo(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getType());
                                         creditResultDetailDto.setRemarks(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getMark());
+                                        if(baseVehicle != null){
+                                            String vinNo = baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8);
+                                            creditResultDetailDto.setMaterialNo(vinNo);
+                                        }
                                         collectionDetailDtoListOne.add(creditResultDetailDto);
                                     }
 
@@ -1858,6 +1868,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                                         creditResultDetailDto.setExTaxMoney("-" + loanSolutionsOtherpolicy.getOtherActualDiscount().toString());
                                         creditResultDetailDto.setUseTo(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getType());
                                         creditResultDetailDto.setRemarks(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getMark());
+                                        if(baseVehicle != null){
+                                            String vinNo = baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8);
+                                            creditResultDetailDto.setMaterialNo(vinNo);
+                                        }
                                         collectionDetailDtoListOne.add(creditResultDetailDto);
                                     }
 
@@ -1869,6 +1883,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                                         creditResultDetailDto.setExTaxMoney("-" + loanSolutionsDetail.getProxyAccidentPremium().toString());
                                         creditResultDetailDto.setUseTo(CwSystemYT.PROXY_ACCIDENT_PREMIUM.getType());
                                         creditResultDetailDto.setRemarks(CwSystemYT.PROXY_ACCIDENT_PREMIUM.getMark());
+                                        if(baseVehicle != null){
+                                            String vinNo = baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8);
+                                            creditResultDetailDto.setMaterialNo(vinNo);
+                                        }
                                         collectionDetailDtoListOne.add(creditResultDetailDto);
                                     }
                                 }
@@ -1947,6 +1965,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                                     creditResultDetailDto.setExTaxMoney("-" + loanSolutions.getBondAmount().toString());
                                     creditResultDetailDto.setUseTo(CwSystemYT.BOND_AMOUNTS.getType());
                                     creditResultDetailDto.setRemarks(CwSystemYT.BOND_AMOUNTS.getMark());
+                                    if(baseVehicle != null){
+                                        String vinNo = baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8);
+                                        creditResultDetailDto.setMaterialNo(vinNo);
+                                    }
                                     collectionDetailDtoListOne.add(creditResultDetailDto);
                                 }
 
@@ -1958,6 +1980,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                                     creditResultDetailDto.setExTaxMoney("-" + loanSolutions.getActualDiscount().toString());
                                     creditResultDetailDto.setUseTo(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getType());
                                     creditResultDetailDto.setRemarks(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getMark());
+                                    if(baseVehicle != null){
+                                        String vinNo = baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8);
+                                        creditResultDetailDto.setMaterialNo(vinNo);
+                                    }
                                     collectionDetailDtoListOne.add(creditResultDetailDto);
                                 }
 
@@ -1969,20 +1995,27 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                                     creditResultDetailDto.setExTaxMoney("-" + loanSolutionsOtherpolicy.getOtherActualDiscount().toString());
                                     creditResultDetailDto.setUseTo(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getType());
                                     creditResultDetailDto.setRemarks(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getMark());
+                                    if(baseVehicle != null){
+                                        String vinNo = baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8);
+                                        creditResultDetailDto.setMaterialNo(vinNo);
+                                    }
                                     collectionDetailDtoListOne.add(creditResultDetailDto);
                                 }
 
                             }
                             if (loanSolutionsDetail.getProxyAccidentPremium() != null) {//意外险
                                 if(loanSolutionsDetail.getProxyAccidentPremium().compareTo(BigDecimal.ZERO) != 0){
-
+                                    CapitalCreditResult.CapitalCreditResultDetailDto creditResultDetailDto = new CapitalCreditResult.CapitalCreditResultDetailDto();
+                                    creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
+                                    creditResultDetailDto.setExTaxMoney("-" + loanSolutionsDetail.getProxyAccidentPremium().toString());
+                                    creditResultDetailDto.setUseTo(CwSystemYT.PROXY_ACCIDENT_PREMIUM.getType());
+                                    creditResultDetailDto.setRemarks(CwSystemYT.PROXY_ACCIDENT_PREMIUM.getMark());
+                                    if(baseVehicle != null){
+                                        String vinNo = baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8);
+                                        creditResultDetailDto.setMaterialNo(vinNo);
+                                    }
+                                    collectionDetailDtoListOne.add(creditResultDetailDto);
                                 }
-                                CapitalCreditResult.CapitalCreditResultDetailDto creditResultDetailDto = new CapitalCreditResult.CapitalCreditResultDetailDto();
-                                creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
-                                creditResultDetailDto.setExTaxMoney("-" + loanSolutionsDetail.getProxyAccidentPremium().toString());
-                                creditResultDetailDto.setUseTo(CwSystemYT.PROXY_ACCIDENT_PREMIUM.getType());
-                                creditResultDetailDto.setRemarks(CwSystemYT.PROXY_ACCIDENT_PREMIUM.getMark());
-                                collectionDetailDtoListOne.add(creditResultDetailDto);
                             }
                             creditResult.setResultDetails(collectionDetailDtoListOne);
                             creditResult.setRemarks("放款差额");
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffMapper.java
index ae25b1c0e3..aed268992e 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffMapper.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffMapper.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailed;
@@ -33,4 +34,6 @@ public interface LoanDiffMapper extends BaseMapper<LoanDiff> {
     String selectNum(String bill);
 
     int selectByBusVnS(@Param("busVinSid") String busVinSid, @Param("realityLoan") String realityLoan);
+
+    BaseVehicle selectByVSid(String busVinSid);
 }
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffMapper.xml
index ff4ab1808d..475f2e2b69 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffMapper.xml
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffMapper.xml
@@ -56,4 +56,10 @@
     <update id="selectByBusVnS">
         update anrui_fin.fin_uncollected_receivables_detailed set reveivableMoney = #{realityLoan} where busVinSid = #{busVinSid} and receivablesName = '融资放款'
     </update>
+
+    <select id="selectByVSid" resultType="com.yxt.anrui.base.api.basevehicle.BaseVehicle">
+        select bbv.* from anrui_base.base_vehicle bbv
+        left join anrui_buscenter.bus_sales_order_vehicle bov on bov.linkSid = bbv.sid
+        where bov.sid = #{busVinSid}
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffService.java
index 18579203ad..2a598d7c24 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffService.java
@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
 import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign;
+import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
 import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyVo;
 import com.yxt.anrui.base.common.enums.BillTypeEnum;
 import com.yxt.anrui.base.common.utils.Rule;
@@ -293,8 +294,8 @@ public class LoanDiffService extends MybatisBaseService<LoanDiffMapper, LoanDiff
                 CapitalCreditResult creditResult = new CapitalCreditResult();
                 LoanDiffDetails loanDiffDetails = list.get(i);
                 String busVinSid = loanDiffDetails.getBusVinSid();
-
                 BusSalesOrderVehicle busSalesOrderVehicle = baseMapper.selectByBusVinSid(busVinSid);
+                BaseVehicle baseVehicle = baseMapper.selectByVSid(busVinSid);
                 BusSalesOrder busSalesOrder = baseMapper.selectByOrderSid(busSalesOrderVehicle.getSalesOrderSid());
                 LoanSolutions loanSolutions = loanSolutionsService.selectByApplySid(busSalesOrder.getSid());
                 LoanFinPolicy loanFinPolicy = loanFinPolicyService.fetchBySid(loanSolutions.getPolicySid());
@@ -343,6 +344,10 @@ public class LoanDiffService extends MybatisBaseService<LoanDiffMapper, LoanDiff
                         creditResultDetailDto.setExTaxMoney("-" + loanDiffDetails.getRealityLoanMargin().toString());
                         creditResultDetailDto.setUseTo(CwSystemYT.GDBZJ.getType());
                         creditResultDetailDto.setRemarks(CwSystemYT.GDBZJ.getMark());
+                        if(baseVehicle != null){
+                            String vinNo = baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8);
+                            creditResultDetailDto.setMaterialNo(vinNo);
+                        }
                         collectionDetailDtoListOne.add(creditResultDetailDto);
                     }
 
@@ -354,6 +359,10 @@ public class LoanDiffService extends MybatisBaseService<LoanDiffMapper, LoanDiff
                         creditResultDetailDto.setExTaxMoney("-" + loanDiffDetails.getRealityDiscount().toString());
                         creditResultDetailDto.setUseTo(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getType());
                         creditResultDetailDto.setRemarks(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getMark());
+                        if(baseVehicle != null){
+                            String vinNo = baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8);
+                            creditResultDetailDto.setMaterialNo(vinNo);
+                        }
                         collectionDetailDtoListOne.add(creditResultDetailDto);
                     }
 
@@ -365,6 +374,10 @@ public class LoanDiffService extends MybatisBaseService<LoanDiffMapper, LoanDiff
                         creditResultDetailDto.setExTaxMoney("-" + loanDiffDetails.getRealityOtherDiscount().toString());
                         creditResultDetailDto.setUseTo(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getType());
                         creditResultDetailDto.setRemarks(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getMark());
+                        if(baseVehicle != null){
+                            String vinNo = baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8);
+                            creditResultDetailDto.setMaterialNo(vinNo);
+                        }
                         collectionDetailDtoListOne.add(creditResultDetailDto);
                     }
 
@@ -376,6 +389,10 @@ public class LoanDiffService extends MybatisBaseService<LoanDiffMapper, LoanDiff
                         creditResultDetailDto.setExTaxMoney("-" + loanDiffDetails.getReceivedPremium().toString());
                         creditResultDetailDto.setUseTo(CwSystemYT.PROXY_ACCIDENT_PREMIUM.getType());
                         creditResultDetailDto.setRemarks(CwSystemYT.PROXY_ACCIDENT_PREMIUM.getMark());
+                        if(baseVehicle != null){
+                            String vinNo = baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8);
+                            creditResultDetailDto.setMaterialNo(vinNo);
+                        }
                         collectionDetailDtoListOne.add(creditResultDetailDto);
                     }
 
@@ -387,6 +404,10 @@ public class LoanDiffService extends MybatisBaseService<LoanDiffMapper, LoanDiff
                         creditResultDetailDto.setExTaxMoney(loanDiffDetails.getDiffPremium().toString());
                         creditResultDetailDto.setUseTo(CwSystemYT.YWXSR.getType());
                         creditResultDetailDto.setRemarks(CwSystemYT.YWXSR.getMark());
+                        if(baseVehicle != null){
+                            String vinNo = baseVehicle.getVinNo().substring(baseVehicle.getVinNo().length() - 8);
+                            creditResultDetailDto.setMaterialNo(vinNo);
+                        }
                         collectionDetailDtoListOne.add(creditResultDetailDto);
                     }
 

From f617aedc68ce6b7d19edca044f60fef380e81327 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Wed, 29 Nov 2023 09:22:40 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/busdeliveredapply/BusDeliveredApplyService.java   | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
index b96041d769..20a76d546c 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
@@ -3033,6 +3033,14 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
     @Transactional(rollbackFor = Exception.class)
     public ResultBean submitAppDeliveredApply(AppSubmitDeliveredApplyDto dto) {
         ResultBean rb = ResultBean.fireFail();
+        BusSalesOrder busSalesOrder = busSalesOrderService.selectByContractNos(dto.getContractId());
+        if(busSalesOrder != null){
+            if("2".equals(busSalesOrder.getPayTypeKey())){
+                if(StringUtils.isBlank(dto.getLoanSid())){
+                    return rb.setMsg("贷款的无贷款人不允许提交");
+                }
+            }
+        }
         //判断选择的优惠是否超出
         List<AppCarListVo> carList = dto.getCarList();
         if (!carList.isEmpty()) {

From ed6ac5608468f793efa7182b6f7ceff995fe0870 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Wed, 29 Nov 2023 09:28:36 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/busdeliveredapply/BusDeliveredApplyService.java         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
index 20a76d546c..c32dcb9526 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
@@ -3185,7 +3185,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
         variables.put("app", appMap);
         //根据合同号查询销售订单
         if (!"2".equals(busDeliveredApply.getPaymentMethodKey())) {
-            BusSalesOrder busSalesOrder = busSalesOrderService.selectByContractNos(busDeliveredApply.getContractNo());
+            busSalesOrder = busSalesOrderService.selectByContractNos(busDeliveredApply.getContractNo());
             if ("2".equals(busSalesOrder.getFinancePlan())) {
                 //查询是否是自营非担保
                 ResultBean<SolutionsDetailsVo> detailsVoResultBean = loanSolutionsFeign.selectDetailsss(busSalesOrder.getSid());

From 7bbe5f8e7d8168801a7b797ea50161c87548821e Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Wed, 29 Nov 2023 09:30:21 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=87=BA=E5=BA=93?=
 =?UTF-8?q?=E5=BC=80=E7=A5=A8=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/chukuguanli/chukubanli/chukushenqingAdd.vue       | 2 +-
 .../views/workflow/chukuguanliFlow/chukuguanli/chukuEdit.vue    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/chukushenqingAdd.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/chukushenqingAdd.vue
index d98b4d9b69..ea1853bbcf 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/chukushenqingAdd.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/chukushenqingAdd.vue
@@ -59,7 +59,7 @@
             <el-col :span="12">
               <div class="span-sty"><span class="icon">*</span>贷款人</div>
               <el-form-item prop="loanName">
-                <el-select v-model="formobj.loanName" class="addinputInfo" filterable placeholder="" @change="changeCustomer">
+                <el-select v-model="formobj.loanName" :disabled="formobj.paymentMethodKey == '2'" class="addinputInfo" filterable placeholder="" @change="changeCustomer">
                   <el-option v-for="item in customer_list" :key="item.sid" :label="item.name" :value="item.name"/>
                 </el-select>
               </el-form-item>
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/chukuEdit.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/chukuEdit.vue
index 433e5d35e2..8bd1796f40 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/chukuEdit.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/chukuEdit.vue
@@ -58,7 +58,7 @@
             <el-col :span="12">
               <div class="span-sty"><span class="icon">*</span>贷款人</div>
               <el-form-item prop="loanName">
-                <el-select v-model="formobj.loanName" class="addinputInfo" filterable placeholder="" @change="changeCustomer">
+                <el-select v-model="formobj.loanName" :disabled="formobj.paymentMethodKey == '2'" class="addinputInfo" filterable placeholder="" @change="changeCustomer">
                   <el-option v-for="item in customer_list" :key="item.sid" :label="item.name" :value="item.name"/>
                 </el-select>
               </el-form-item>