From 67f9d36d5d824433df4afbb8216a61a1719ab14d Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Tue, 12 Mar 2024 11:24:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=BC=80=E7=A5=A8=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E5=90=88=E5=90=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/busbillapplication/BusBillApplicationService.java | 6 +++---
 .../biz/finbillapplication/FinBillApplicationService.java | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationService.java
index 4446ee8f23..af5aa89122 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationService.java
@@ -525,9 +525,9 @@ public class BusBillApplicationService extends MybatisBaseService<BusBillApplica
         if(StringUtils.isNotBlank(busSalesOrder.getAffiliatedCompanySid())){
             vo.setOrderInvoiceSid(busSalesOrder.getAffiliatedCompanySid());
         }
-        if(loanSolutions != null){
-            if(StringUtils.isNotBlank(loanSolutions.getMainVehicleAmount())){
-                vo.setOrderInvoicePrice(loanSolutions.getMainVehicleAmount());
+        if(busSalesOrderPrice != null){
+            if(busSalesOrderPrice.getSingleFinalPrice() != null){
+                vo.setOrderInvoicePrice(busSalesOrderPrice.getSingleFinalPrice().toString());
             }
         }
         return vo;
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
index 0f07c625e1..cd3e942b92 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
@@ -1162,7 +1162,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
 
                 if("1".equals(busSalesOrder.getPayTypeKey())){
                     if (loanSolutions != null) {
-                        if (!dto.getOneBillMoney().equals(loanSolutions.getMainVehicleAmount())) {
+                        if (busSalesOrderPrice.getSingleFinalPrice().compareTo(new BigDecimal(dto.getOneBillMoney())) != 0) {
                             String remarks = "";
                             String date = DateUtil.today();
                             List<String> dateString = Arrays.asList(date.split("-"));
@@ -1701,9 +1701,9 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         if(StringUtils.isNotBlank(busSalesOrder.getAffiliatedCompanySid())){
             vo.setOrderInvoiceSid(busSalesOrder.getAffiliatedCompanySid());
         }
-        if(loanSolutions != null){
-            if(StringUtils.isNotBlank(loanSolutions.getMainVehicleAmount())){
-                vo.setOrderInvoicePrice(loanSolutions.getMainVehicleAmount());
+        if(busSalesOrderPrice != null){
+            if(busSalesOrderPrice.getSingleFinalPrice() != null){
+                vo.setOrderInvoicePrice(busSalesOrderPrice.getSingleFinalPrice().toString());
             }
         }
         return vo;