Merge remote-tracking branch 'origin/master'

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);
+                                        });
+                                    }
                                 }
+
                             }
                         }
                     }