From 5e0136c13a6f72e0d0de09b0dd86af645d27a7b1 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Mon, 9 Oct 2023 15:17:24 +0800
Subject: [PATCH 1/2] =?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/bussalesorder/BusSalesOrderService.java      | 12 ++++++++++++
 .../BusSalesOrderBorrowerService.java                |  4 ++++
 2 files changed, 16 insertions(+)

diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
index 41125462f2..53a270c3fe 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
@@ -162,6 +162,7 @@ import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo;
 import com.yxt.anrui.portal.config.DictCommonType;
 import com.yxt.anrui.riskcenter.api.loancreditappealapply.LoanCreditAppealApply;
+import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicy;
 import com.yxt.anrui.riskcenter.api.loanhomevisitprep.HomeVisitDto;
 import com.yxt.anrui.riskcenter.api.loanhomevisitprep.LoanHomevisitPrepDto;
 import com.yxt.anrui.riskcenter.api.loanhomevisitprep.LoanHomevisitPrepFeign;
@@ -5617,6 +5618,11 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 unCollectionDto.setUseOrgName(busSalesOrder.getUseOrgName());
                 unCollectionDto.setKxState("01");
                 finUncollectedDetailedFeign.saveUnCollection(unCollectionDto);
+                //==========================================================
+                if(new BigDecimal(money).compareTo(BigDecimal.ZERO) == 0){//首付款及费用若为0
+                    //判断认款是否已认完，若已认完，则更新车辆状态为交清。
+
+                }
             }
         }
     }
@@ -7524,6 +7530,12 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         busSalesOrderBorrower.setCustomSid(busSalesOrder.getCustomerSid());
         busSalesOrderBorrower.setBorrowerName(busSalesOrder.getCustomerName());
         busSalesOrderBorrower.setMobile(busSalesOrder.getMobile());
+        LoanFinPolicy loanFinPolicy = busSalesOrderBorrowerService.selectBySid(saleOrderSid);
+        if (loanFinPolicy != null) {
+            busSalesOrderBorrower.setBankSid(loanFinPolicy.getBankSid());
+            busSalesOrderBorrower.setBankName(loanFinPolicy.getBankShortName());
+            busSalesOrderBorrower.setPolicyName(loanFinPolicy.getPolicyName());
+        }
         busSalesOrderBorrowerService.insert(busSalesOrderBorrower);
         return rb.success();
     }
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerService.java
index 12eaec7aaa..68a03962d1 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerService.java
@@ -174,6 +174,10 @@ public class BusSalesOrderBorrowerService extends MybatisBaseService<BusSalesOrd
         return rb.success();
     }
 
+    public LoanFinPolicy selectBySid(String saleOrderSid){
+        return baseMapper.selectBySid(saleOrderSid);
+    }
+
     /**
      * 公司非担保业务进度维护
      *

From 4a39f72c8b4add58cae233a1ae27e1743e084bb0 Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Mon, 9 Oct 2023 15:29:45 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=BC=80=E7=A5=A8?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=B8=AD=E6=9F=A5=E7=9C=8B=E6=AC=BE=E7=A5=A8?=
 =?UTF-8?q?=E6=83=85=E5=86=B5=EF=BC=8C=E4=BB=98=E6=AC=BE=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=E7=9A=84=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.xml
index 0b089ca70f..91a4c35bce 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.xml
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.xml
@@ -267,7 +267,7 @@
                co.collectionTypeValue,
                fs.subscriptionMoney as subscriptionMoneyAll,
                co.remarks,
-               fs.subscriptionDate,
+               co.collectionDate    as subscriptionDate,
                co.collectionBankNum,
                co.receivingName,
                co.payerName,