From 2da16a6ae667953882c1477b7b743ed19204c47d Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Fri, 16 May 2025 16:11:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BD=A6=E8=BE=86=E5=88=A9?=
 =?UTF-8?q?=E6=B6=A6=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/biz/baseaccadjapply/BaseAccadjApplyRest.java      | 6 ++++++
 .../base/biz/baseaccadjapply/BaseAccadjApplyService.java   | 7 +++++++
 .../biz/carsSoldProfit/CarsSoldProfitService.java          | 6 ++++++
 3 files changed, 19 insertions(+)

diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyRest.java
index 8d27c6bf8e..53427a1b88 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyRest.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyRest.java
@@ -149,4 +149,10 @@ public class BaseAccadjApplyRest implements BaseAccadjApplyFeign {
     public ResultBean<AppCompanyAdjustVo> getCompanyAdjust(String sid) {
         return baseAccadjApplyService.getCompanyAdjust(sid);
     }
+
+    @PostMapping("pushReport")
+    @ApiOperation("测试推送车辆利润报表")
+    ResultBean pushReport(@RequestParam("sid")String sid){
+        return baseAccadjApplyService.pushReport(sid);
+    }
 }
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java
index 5e5417515a..cc200916ad 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java
@@ -1400,4 +1400,11 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
         WordUtils.doc2pdf(wordPath, targetPath, pdfName, userName);
         return "/template/" + dateStr + "/" + pdfName;
     }
+
+    public ResultBean pushReport(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        BaseAccadjApply baseAccadjApply = fetchBySid(sid);
+        pushCarSoldProfit(baseAccadjApply);
+        return rb.success();
+    }
 }
\ No newline at end of file
diff --git a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/carsSoldProfit/CarsSoldProfitService.java b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/carsSoldProfit/CarsSoldProfitService.java
index bedec229e0..66ace01df7 100644
--- a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/carsSoldProfit/CarsSoldProfitService.java
+++ b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/carsSoldProfit/CarsSoldProfitService.java
@@ -184,6 +184,12 @@ public class CarsSoldProfitService extends MybatisBaseService<CarsSoldProfitMapp
                 if(StringUtils.isBlank(carsSoldProfitVo.getMakersSettlementPrice())){
                     carsSoldProfitVo.setMakersSettlementPrice("-");
                 }
+                if(StringUtils.isBlank(carsSoldProfitVo.getFinanceServiceCharge())){
+                    carsSoldProfitVo.setFinanceServiceCharge("-");
+                }
+                if(StringUtils.isBlank(carsSoldProfitVo.getMediatorRebatePrice())){
+                    carsSoldProfitVo.setMediatorRebatePrice("-");
+                }