From 906af2e1a579927b76a5e8f20c16a6e01313db82 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Mon, 10 Mar 2025 11:07:15 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=91=E8=9E=8D=E8=B4=B4=E6=81=AF=E6=8E=A8?=
 =?UTF-8?q?=E9=80=81=E5=8D=95=E8=BD=A6=E8=BF=94=E5=88=A9=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E9=A2=84=E6=8F=90=E6=97=A5=E6=9C=9F=E8=B5=8B=E6=8E=A8=E9=80=81?=
 =?UTF-8?q?=E6=97=A5=E6=9C=9F=E5=A6=822025=E5=B9=B41=E6=9C=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../busdeliveredapply/BusDeliveredApplyService.java    | 10 +++++++---
 .../FinCollectionConfirmationService.java              |  7 +++++++
 .../anrui/riskcenter/biz/loandiff/LoanDiffService.java |  5 +++++
 3 files changed, 19 insertions(+), 3 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 9e43af112f..bbc4c75ca2 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
@@ -176,6 +176,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
+import java.time.YearMonth;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.concurrent.*;
 import java.util.stream.Collectors;
@@ -1191,7 +1193,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                             SolutionsDetailsVo solutionsDetailsVo = loanSolutionsFeign.selectDetailsss(saleOrderSid).getData();
                             if (solutionsDetailsVo != null) {
                                 //三方金融的，在出库时推送单车返利数据，金额为厂家贴息。
-                                if(!"0".equals(solutionsDetailsVo.getFactoryDiscount())){
+                                if (!"0".equals(solutionsDetailsVo.getFactoryDiscount())) {
                                     if ("2".equals(busSalesOrder.getFinancePlan())) {
                                         Future future11 = pool.submit(() -> {
                                             pushVehRebate(busDeliveredApply, detailsList, solutionsDetailsVo.getFactoryDiscount());
@@ -1445,7 +1447,9 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
             scmVehRebateVehDto.setEstimateRebate(factoryDiscount);
             scmVehRebateVehDto.setPurchaseSystemSid(baseVehicle.getPurchaseSystemSid());
             scmVehRebateVehDto.setPurchaseSystemName(baseVehicle.getPurchaseSystemName());
-            scmVehRebateVehDto.setWithholdingDate(DateUtil.format(new Date(), "yyyy-MM"));
+            //预提日期
+            String dateStr = YearMonth.now().format(DateTimeFormatter.ofPattern("yyyy年M月"));
+            scmVehRebateVehDto.setWithholdingDate(dateStr);
             scmVehRebateVehDtos.add(scmVehRebateVehDto);
             scmVehRebateDto.setScmVehRebateVehs(scmVehRebateVehDtos);
             scmVehRebateFeign.save(scmVehRebateDto);
@@ -1684,7 +1688,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                             SolutionsDetailsVo solutionsDetailsVo = loanSolutionsFeign.selectDetailsss(saleOrderSid).getData();
                             if (solutionsDetailsVo != null) {
                                 //三方金融的，在出库时推送单车返利数据，金额为厂家贴息。
-                                if(!"0".equals(solutionsDetailsVo.getFactoryDiscount())){
+                                if (!"0".equals(solutionsDetailsVo.getFactoryDiscount())) {
                                     if ("2".equals(busSalesOrder.getFinancePlan())) {
                                         Future future11 = pool.submit(() -> {
                                             pushVehRebate(busDeliveredApply, detailsList, solutionsDetailsVo.getFactoryDiscount());
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
index 78a21c2f86..6bcc0226d6 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
@@ -142,6 +142,7 @@ import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
+import java.time.YearMonth;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
@@ -2246,6 +2247,9 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                                     scmVehRebateVehDto.setEstimateRebate(ll.toString());
                                     scmVehRebateVehDto.setPurchaseSystemSid(baseVehicle.getPurchaseSystemSid());
                                     scmVehRebateVehDto.setPurchaseSystemName(baseVehicle.getPurchaseSystemName());
+                                    //预提日期
+                                    String dateStr = YearMonth.now().format(DateTimeFormatter.ofPattern("yyyy年M月"));
+                                    scmVehRebateVehDto.setWithholdingDate(dateStr);
                                     scmVehRebateVehDtos.add(scmVehRebateVehDto);
                                     scmVehRebateDto.setScmVehRebateVehs(scmVehRebateVehDtos);
                                     scmVehRebateFeign.save(scmVehRebateDto);
@@ -2419,6 +2423,9 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                                 scmVehRebateVehDto.setEstimateRebate(ll.toString());
                                 scmVehRebateVehDto.setPurchaseSystemSid(baseVehicle.getPurchaseSystemSid());
                                 scmVehRebateVehDto.setPurchaseSystemName(baseVehicle.getPurchaseSystemName());
+                                //预提日期
+                                String dateStr = YearMonth.now().format(DateTimeFormatter.ofPattern("yyyy年M月"));
+                                scmVehRebateVehDto.setWithholdingDate(dateStr);
                                 scmVehRebateVehDtos.add(scmVehRebateVehDto);
                                 scmVehRebateDto.setScmVehRebateVehs(scmVehRebateVehDtos);
                                 scmVehRebateFeign.save(scmVehRebateDto);
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffService.java
index 93542496ae..f9461b9062 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffService.java
@@ -70,6 +70,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.time.YearMonth;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.concurrent.*;
 import java.util.stream.Collectors;
@@ -461,6 +463,9 @@ public class LoanDiffService extends MybatisBaseService<LoanDiffMapper, LoanDiff
                     scmVehRebateVehDto.setEstimateRebate(ll.toString());
                     scmVehRebateVehDto.setPurchaseSystemSid(baseVehicle.getPurchaseSystemSid());
                     scmVehRebateVehDto.setPurchaseSystemName(baseVehicle.getPurchaseSystemName());
+                    //预提日期
+                    String dateStr = YearMonth.now().format(DateTimeFormatter.ofPattern("yyyy年M月"));
+                    scmVehRebateVehDto.setWithholdingDate(dateStr);
                     scmVehRebateVehDtos.add(scmVehRebateVehDto);
                     scmVehRebateDto.setScmVehRebateVehs(scmVehRebateVehDtos);
                     scmVehRebateFeign.save(scmVehRebateDto);