From 171229c7dd08653764aa88c96a9cfc84565d3d0b Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Tue, 18 Jun 2024 14:08:22 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E6=88=90=E8=BD=A6=E8=BE=86=E6=8E=A5?=
 =?UTF-8?q?=E6=94=B6=E7=A1=AE=E8=AE=A4=E4=B9=A6=E4=BA=A4=E4=BB=98=E5=9C=B0?=
 =?UTF-8?q?=E7=82=B9=E4=BF=AE=E6=94=B9=20=E6=B6=88=E8=B4=B7=E5=90=88?=
 =?UTF-8?q?=E5=90=8C=E7=94=9F=E6=88=90=E6=8A=A5null=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/bushandover/BusHandoverService.java          |  8 ++++++++
 .../FinUncollectedReceivablesDetailedMapper.xml      |  2 +-
 .../loanhomevisitprep/LoanHomevisitPrepService.java  | 12 ++++++------
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverService.java
index b9ef656b93..7b7f86e6bf 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverService.java
@@ -84,6 +84,8 @@ import com.yxt.anrui.riskcenter.api.loanmortgageinformationtransact.LoanMortgage
 import com.yxt.anrui.riskcenter.api.loanmortgageinformationtransact.LoanMortgageInformationTransactFeign;
 import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions;
 import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsFeign;
+import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseFeign;
+import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseVo;
 import com.yxt.common.base.config.component.DocPdfComponent;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
@@ -192,6 +194,8 @@ public class BusHandoverService extends MybatisBaseService<BusHandoverMapper, Bu
     private LoanMortgageInformationTransactFeign loanMortgageInformationTransactFeign;
     @Autowired
     private BusSalesOrderVehicleService busSalesOrderVehicleService;
+    @Autowired
+    private ScmWarehouseFeign scmWarehouseFeign;
 
     //    @Transactional(rollbackFor = Exception.class)
     public ResultBean<List<BusHandoverListVo>> saveDeliverybill(BusHandoverDto dto) {
@@ -1150,6 +1154,10 @@ public class BusHandoverService extends MybatisBaseService<BusHandoverMapper, Bu
             }
             //====================================================
             BeanUtil.copyProperties(busHandover, pdfVo);
+            ScmWarehouseVo scmWarehouseVo = scmWarehouseFeign.fetchBySid(busHandover.getDeliverAddressKey()).getData();
+            if (StringUtils.isNotBlank(scmWarehouseVo.getCity()) && StringUtils.isNotBlank(scmWarehouseVo.getCounty())){
+                pdfVo.setDeliverAddress(pdfVo.getDeliverAddress() + "(" + scmWarehouseVo.getCity() + scmWarehouseVo.getCounty() + scmWarehouseVo.getWarehouseAttribute() + ")");
+            }
             pdfVo.setModel(busHandover.getModelName());
             String customerSid = busHandover.getCustomerSid();
             if (StringUtils.isNotBlank(customerSid)) {
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml
index 4b67e7da94..019e1d2643 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml
@@ -620,7 +620,7 @@
 
     <select id="selectDjByBusVinSid" resultType="java.lang.String">
         SELECT
-                SUM(sd.subscriptionMoney)
+                IFNULL(SUM(sd.subscriptionMoney),0)
         FROM fin_uncollected_receivables_detailed ud
                      LEFT JOIN fin_selected_receivables_detailed sd
                 ON ud.sid = sd.`receivablesSid`
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java
index b0ecaa0786..feb8844cbe 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java
@@ -471,17 +471,17 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
         //贷款车辆买卖合同
         List<String> dkclmmhts = clmmContract(printConfirmDto, conSetUpKey);
         //生成车辆融资协议
-       /* List<String> clrzxyUrls = generateCLRZXY(printConfirmDto, conSetUpKey);
+        List<String> clrzxyUrls = generateCLRZXY(printConfirmDto, conSetUpKey);
         //生成还款协议
         List<String> hkxyUrls = hkxy(printConfirmDto, conSetUpKey);
         //代管车辆委托书
-        List<String> dgclwtsUrls = dgclwts(printConfirmDto, conSetUpKey);*/
+        List<String> dgclwtsUrls = dgclwts(printConfirmDto, conSetUpKey);
         //判断是否为高低开
         BusSalesOrderPrice data = busSalesOrderFeign.selectByContractNoOne(printConfirmDto.getContractNo()).getData();
         //查询金融方案
         SolutionsDetailsVo solutionsDetailsVo = loanSolutionsService.selectDetails(busSalesOrder.getSid()).getData();
         //判断是否为高低开，若是则生成开票申请书
-        /*List<String> kpsqsUrls = new ArrayList<>();
+        List<String> kpsqsUrls = new ArrayList<>();
         if (!data.getSingleFinalPrice().equals(solutionsDetailsVo.getMainVehicleAmount())) {
             //开票申请书
             kpsqsUrls = kpsqs(printConfirmDto, conSetUpKey);
@@ -508,14 +508,14 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
         if ("0".equals(homeKcCust.getIsSecurity())) {
             //生成公司股东会对外担保决议
             gsgddwdbjyUrls = gsgddwdbjy(printConfirmDto, conSetUpKey);
-        }*/
+        }
         if (dkclmmhts != null && dkclmmhts.size() > 0) {
             for (String dkclmmht : dkclmmhts) {
                 File file = new File(docPdfComponent.getUploadTemplateUrl() + dkclmmht);
                 filesList.add(file);
             }
         }
-        /*if (clrzxyUrls != null && clrzxyUrls.size() > 0) {
+        if (clrzxyUrls != null && clrzxyUrls.size() > 0) {
             for (String clrzxyUrl : clrzxyUrls) {
                 File file = new File(docPdfComponent.getUploadTemplateUrl() + clrzxyUrl);
                 filesList.add(file);
@@ -568,7 +568,7 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
                 File file = new File(docPdfComponent.getUploadTemplateUrl() + gsgddwdbjyUrl);
                 filesList.add(file);
             }
-        }*/
+        }
         //合并pdf文件
         if (filesList.size() > 0) {
             String dateStr = DateUtil.format(new Date(), "yyyyMMdd");