From 538a06f74288ca9f8ee31d50a9b929099fdaef6a Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Thu, 20 Feb 2025 14:23:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=BA=93=E3=80=81=E6=AC=A0=E6=AC=BE?=
 =?UTF-8?q?=E5=87=BA=E5=BA=93=E6=8E=A8=E9=80=81=E9=87=91=E8=9E=8D=E8=B4=B4?=
 =?UTF-8?q?=E6=81=AF=E5=8D=95=E8=BD=A6=E8=BF=94=E5=88=A9=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E5=A6=82=E6=9E=9C=E9=87=91=E9=A2=9D=E4=B8=BA0=EF=BC=8C?=
 =?UTF-8?q?=E5=88=99=E4=B8=8D=E6=8E=A8=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BusDeliveredApplyService.java             | 34 +++++++++++--------
 1 file changed, 20 insertions(+), 14 deletions(-)

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 85184ee4a3..8db454751f 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
@@ -1191,14 +1191,17 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                             SolutionsDetailsVo solutionsDetailsVo = loanSolutionsFeign.selectDetailsss(saleOrderSid).getData();
                             if (solutionsDetailsVo != null) {
                                 //三方金融的，在出库时推送单车返利数据，金额为厂家贴息。
-                                if ("2".equals(busSalesOrder.getFinancePlan())) {
-                                    Future future11 = pool.submit(() -> {
-                                        pushVehRebate(busDeliveredApply, detailsList, solutionsDetailsVo.getFactoryDiscount());
-                                    });
-                                    Future future12 = pool.submit(() -> {
-                                        pushVehRebateAdjustBill(busDeliveredApply, detailsList, solutionsDetailsVo);
-                                    });
+                                if(!"0".equals(solutionsDetailsVo.getFactoryDiscount())){
+                                    if ("2".equals(busSalesOrder.getFinancePlan())) {
+                                        Future future11 = pool.submit(() -> {
+                                            pushVehRebate(busDeliveredApply, detailsList, solutionsDetailsVo.getFactoryDiscount());
+                                        });
+                                        Future future12 = pool.submit(() -> {
+                                            pushVehRebateAdjustBill(busDeliveredApply, detailsList, solutionsDetailsVo);
+                                        });
+                                    }
                                 }
+
                             }
                         }
                     }
@@ -1680,14 +1683,17 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                             SolutionsDetailsVo solutionsDetailsVo = loanSolutionsFeign.selectDetailsss(saleOrderSid).getData();
                             if (solutionsDetailsVo != null) {
                                 //三方金融的，在出库时推送单车返利数据，金额为厂家贴息。
-                                if ("2".equals(busSalesOrder.getFinancePlan())) {
-                                    Future future11 = pool.submit(() -> {
-                                        pushVehRebate(busDeliveredApply, detailsList, solutionsDetailsVo.getFactoryDiscount());
-                                    });
-                                    Future future12 = pool.submit(() -> {
-                                        pushVehRebateAdjustBill(busDeliveredApply, detailsList, solutionsDetailsVo);
-                                    });
+                                if(!"0".equals(solutionsDetailsVo.getFactoryDiscount())){
+                                    if ("2".equals(busSalesOrder.getFinancePlan())) {
+                                        Future future11 = pool.submit(() -> {
+                                            pushVehRebate(busDeliveredApply, detailsList, solutionsDetailsVo.getFactoryDiscount());
+                                        });
+                                        Future future12 = pool.submit(() -> {
+                                            pushVehRebateAdjustBill(busDeliveredApply, detailsList, solutionsDetailsVo);
+                                        });
+                                    }
                                 }
+
                             }
                         }
                     }