From f842a875c66377a457b89b7cdaeb1342b28df41f Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Thu, 30 Mar 2023 16:30:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../buscenter/biz/bussalesorder/BusSalesOrderService.java     | 2 +-
 .../api/loansolutionsdetail/LoanSolutionsDetail.java          | 2 +-
 .../riskcenter/biz/loansolutions/LoanSolutionsService.java    | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

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 127644f4af..ec915028fc 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
@@ -4169,7 +4169,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         CommonContract commonContract = commonContractResultBean.getData();
         //单台成交价与单台订金相等
         if (new BigDecimal(singleFinalPrice).compareTo(new BigDecimal(deposit)) != 0) {//推送车款
-            String money = new BigDecimal(singleFinalPrice).subtract(new BigDecimal(deposit)).subtract(new BigDecimal(solutionsDetailsVo.getFactoryDiscount())).toString();
+            String money = new BigDecimal(singleFinalPrice).subtract(new BigDecimal(deposit)).subtract(new BigDecimal(solutionsDetailsVo.getFactoryDiscount())).add(new BigDecimal(solutionsDetailsVo.getServiceAmount())).toString();
             List<VinListsVo> vinList = appOrderModelInfoVo.getVinListsVos();
             for (int i = 0; i < vinList.size(); i++) {
                 UnCollectionDto unCollectionDto = new UnCollectionDto();
diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsdetail/LoanSolutionsDetail.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsdetail/LoanSolutionsDetail.java
index 9154cc11cd..92e67ed9df 100644
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsdetail/LoanSolutionsDetail.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutionsdetail/LoanSolutionsDetail.java
@@ -30,7 +30,7 @@ public class LoanSolutionsDetail extends BaseEntity {
     @ApiModelProperty("主产品方案sid")
     private String solutionsSid;
     @ApiModelProperty("融资首付")
-    private BigDecimal downPayAmount;
+    private BigDecimal downPayAmounts;
     @ApiModelProperty("贷款保证金")
     private BigDecimal bondAmounts;
     @ApiModelProperty("保险保证金")
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java
index 619066c1c5..1e35f5fcfe 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java
@@ -342,6 +342,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                 loanSolutions.setOtherPolicyState(0);
             }
             baseMapper.insert(loanSolutions);
+            loanSolutionsOtherpolicy.setSolutionsSid(loanSolutions.getSid());
             loanSolutionsOtherpolicyService.insert(loanSolutionsOtherpolicy);
             //=========================应收明细
             LoanSolutionsDetail loanSolutionsDetail = new LoanSolutionsDetail();
@@ -350,7 +351,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             //融资首付 = 首付金额-其它融贷款金额
             BigDecimal downPayAmounts = new BigDecimal(BigInteger.ZERO);
             downPayAmounts = downPayAmounts.add(downPayAmount).subtract(otherPolicyAmount1);
-            loanSolutionsDetail.setDownPayAmount(downPayAmounts);
+            loanSolutionsDetail.setDownPayAmounts(downPayAmounts);
             //贷款保证金
             String bondAmounts = dto.getBondAmounts();
             if (StringUtils.isNotBlank(bondAmounts)) {
@@ -485,6 +486,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             } else {
                 loanSolutionsDetail.setNominalPrice(BigDecimal.ZERO);
             }
+            loanSolutionsDetail.setSolutionsSid(loanSolutions.getSid());
             loanSolutionsDetailService.insert(loanSolutionsDetail);
 
         } else {//外部金融的只需要录入厂家贴息