From 12e02051e079b457da8d96522828bd052a90730a Mon Sep 17 00:00:00 2001
From: fanzongzhe0036 <fan6088588>
Date: Wed, 8 Jan 2025 16:37:14 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=94=E5=88=A9=E5=87=AD=E8=AF=81=E6=8E=A8?=
 =?UTF-8?q?=E9=80=81=E4=BF=AE=E6=94=B9=E4=B8=9A=E5=8A=A1=E6=97=A5=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ScmCollectionrebateCheckapplyService.java | 16 +++-----
 .../ScmCollectionRebateWithApplyService.java  | 13 ++-----
 .../ScmSpecialrebateCheckapplyService.java    | 16 ++------
 .../ScmSpecialRebateWithApplyService.java     | 17 ++-------
 .../ScmVehrebateCheckapplyService.java        | 16 ++------
 .../ScmVehRebateWithApplyService.java         | 38 +++++++++++++++----
 6 files changed, 52 insertions(+), 64 deletions(-)

diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyService.java
index 5b9585739a..51079194b4 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatecheckapply/ScmCollectionrebateCheckapplyService.java
@@ -50,18 +50,18 @@ import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.scm.api.flow.FlowTaskVo;
-import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.flow.ScmCollectionRebateCheckApplyDelegateQuery;
 import com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebate;
 import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.*;
+import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.flow.ScmCollectionRebateCheckApplyDelegateQuery;
 import com.yxt.anrui.scm.api.scmcollectionrebatecheckapply.flow.SubmitScmCollectionRebateCheckApplyDto;
 import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailDetailsVo;
 import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailDto;
 import com.yxt.anrui.scm.api.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailVo;
-import com.yxt.anrui.scm.api.scmcollectionrebatewith.ScmCollectionRebateWithDto;
 import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.GetNodeQuery;
 import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.flow.GetNodeVo;
 import com.yxt.anrui.scm.biz.scmcollectionrebate.ScmCollectionRebateService;
 import com.yxt.anrui.scm.biz.scmcollectionrebatecheckapplydetail.ScmCollectionrebateCheckapplydetailService;
+import com.yxt.anrui.scm.biz.scmvehrebatewithapply.ScmVehRebateWithApplyService;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
@@ -72,7 +72,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -91,7 +90,8 @@ import java.util.stream.Collectors;
  */
 @Service
 public class ScmCollectionrebateCheckapplyService extends MybatisBaseService<ScmCollectionrebateCheckapplyMapper, ScmCollectionrebateCheckapply> {
-
+    @Autowired
+    private ScmVehRebateWithApplyService scmVehRebateWithApplyService;
     @Autowired
     private FinKingDeeFeign finKingDeeFeign;
     @Autowired
@@ -374,13 +374,7 @@ public class ScmCollectionrebateCheckapplyService extends MybatisBaseService<Scm
      * @param sid
      */
     public void pusCollectionRebateWithVoucher(String sid) {
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-        Calendar calendar = Calendar.getInstance();
-        int month = calendar.get(Calendar.MONTH);
-        calendar.set(Calendar.MONTH, month - 1);
-        calendar.set(Calendar.DAY_OF_MONTH, calendar.getActualMaximum(Calendar.DAY_OF_MONTH));
-        Date endTime = calendar.getTime();//上个月最后一天
-        String format = sdf.format(endTime);
+        String format = scmVehRebateWithApplyService.returnBusDate(new Date());
         String summaryTag = "";//摘要前缀
         ScmCollectionrebateCheckapply entity = fetchBySid(sid);
         if (null != entity) {
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyService.java
index d745b903a6..6f85ebd210 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatewithapply/ScmCollectionRebateWithApplyService.java
@@ -66,6 +66,7 @@ import com.yxt.anrui.scm.biz.scmcollectionrebate.ScmCollectionRebateService;
 import com.yxt.anrui.scm.biz.scmcollectionrebatedistribution.ScmCollectionRebateDistributionService;
 import com.yxt.anrui.scm.biz.scmcollectionrebateveh.ScmCollectionRebateVehService;
 import com.yxt.anrui.scm.biz.scmcollectionrebatewith.ScmCollectionRebateWithService;
+import com.yxt.anrui.scm.biz.scmvehrebatewithapply.ScmVehRebateWithApplyService;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
@@ -76,13 +77,13 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
 @Service
 public class ScmCollectionRebateWithApplyService extends MybatisBaseService<ScmCollectionRebateWithApplyMapper, ScmCollectionRebateWithApply> {
-
+    @Autowired
+    private ScmVehRebateWithApplyService scmVehRebateWithApplyService;
     @Autowired
     private FinKingDeeFeign finKingDeeFeign;
     @Autowired
@@ -391,13 +392,7 @@ public class ScmCollectionRebateWithApplyService extends MybatisBaseService<ScmC
      * @param sid
      */
     public void pushCollectionRebateWithVoucher(String sid) {
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-        Calendar calendar=Calendar.getInstance();
-        int month=calendar.get(Calendar.MONTH);
-        calendar.set(Calendar.MONTH, month-1);
-        calendar.set(Calendar.DAY_OF_MONTH, calendar.getActualMaximum(Calendar.DAY_OF_MONTH));
-        Date endTime = calendar.getTime();//上个月最后一天
-        String format = sdf.format(endTime);
+        String format = scmVehRebateWithApplyService.returnBusDate(new Date());
         String  summaryTag = "";//摘要前缀
         ScmCollectionRebateWithApply entity = fetchBySid(sid);
         if (null != entity) {
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java
index 9254e3f1d8..861eca8bbd 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java
@@ -63,12 +63,9 @@ import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow.SubmitScmSpecialReb
 import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailDetailsVo;
 import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailDto;
 import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailVo;
-import com.yxt.anrui.scm.api.scmvehrebatecheckapply.ScmVehRebateCheckPdfVo;
-import com.yxt.anrui.scm.api.scmvehrebatecheckapply.ScmVehrebateCheckapplyDetailsVo;
-import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailDetailsVo;
-import com.yxt.anrui.scm.api.scmvehrebatewithapply.PdfPath;
 import com.yxt.anrui.scm.biz.scmspecialrebate.ScmSpecialRebateService;
 import com.yxt.anrui.scm.biz.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailService;
+import com.yxt.anrui.scm.biz.scmvehrebatewithapply.ScmVehRebateWithApplyService;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.ConstantUtils;
 import com.yxt.common.base.utils.PagerUtil;
@@ -85,7 +82,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -94,6 +90,8 @@ import static java.util.Comparator.comparing;
 @Service
 public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpecialrebateCheckapplyMapper, ScmSpecialrebateCheckapply> {
 
+    @Autowired
+    private ScmVehRebateWithApplyService scmVehRebateWithApplyService;
     @Autowired
     private FinKingDeeFeign finKingDeeFeign;
     @Autowired
@@ -443,13 +441,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
      * @param sid,tag (0代表核对申请通过推送，1代表重推功能)
      */
     public void pushSpecialRebateWithVoucher(String sid, String tag) {
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-        Calendar calendar = Calendar.getInstance();
-        int month = calendar.get(Calendar.MONTH);
-        calendar.set(Calendar.MONTH, month - 1);
-        calendar.set(Calendar.DAY_OF_MONTH, calendar.getActualMaximum(Calendar.DAY_OF_MONTH));
-        Date endTime = calendar.getTime();//上个月最后一天
-        String format = sdf.format(endTime);
+        String format = scmVehRebateWithApplyService.returnBusDate(new Date());
         String summaryTag = "";//摘要前缀
         ScmSpecialrebateCheckapply entity = fetchBySid(sid);
         if (null != entity) {
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyService.java
index bc7d282dcc..3b04e81446 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyService.java
@@ -63,12 +63,9 @@ import com.yxt.anrui.scm.api.scmspecialrebatewithapply.flow.GetNodeQuery;
 import com.yxt.anrui.scm.api.scmspecialrebatewithapply.flow.GetNodeVo;
 import com.yxt.anrui.scm.api.scmspecialrebatewithapply.flow.ScmSpecialRebateWithApplyDelegateQuery;
 import com.yxt.anrui.scm.api.scmspecialrebatewithapply.flow.SubmitScmSpecialRebateWithApplyDto;
-import com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWithDetailsVo;
-import com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWithPdfVo;
-import com.yxt.anrui.scm.api.scmvehrebatewithapply.PdfPath;
-import com.yxt.anrui.scm.api.scmvehrebatewithapply.ScmVehRebateWithApplyDetailsVo;
 import com.yxt.anrui.scm.biz.scmspecialrebate.ScmSpecialRebateService;
 import com.yxt.anrui.scm.biz.scmspecialrebatewith.ScmSpecialRebateWithService;
+import com.yxt.anrui.scm.biz.scmvehrebatewithapply.ScmVehRebateWithApplyService;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.ConstantUtils;
 import com.yxt.common.base.utils.PagerUtil;
@@ -85,7 +82,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -106,7 +102,8 @@ import static java.util.Comparator.comparing;
  */
 @Service
 public class ScmSpecialRebateWithApplyService extends MybatisBaseService<ScmSpecialRebateWithApplyMapper, ScmSpecialRebateWithApply> {
-
+    @Autowired
+    private ScmVehRebateWithApplyService scmVehRebateWithApplyService;
     @Autowired
     private FinKingDeeFeign finKingDeeFeign;
     @Autowired
@@ -436,13 +433,7 @@ public class ScmSpecialRebateWithApplyService extends MybatisBaseService<ScmSpec
      * @param sid
      */
     public void pushSpecialRebateWithVoucher(String sid) {
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-        Calendar calendar=Calendar.getInstance();
-        int month=calendar.get(Calendar.MONTH);
-        calendar.set(Calendar.MONTH, month-1);
-        calendar.set(Calendar.DAY_OF_MONTH, calendar.getActualMaximum(Calendar.DAY_OF_MONTH));
-        Date endTime = calendar.getTime();//上个月最后一天
-        String format = sdf.format(endTime);
+        String format = scmVehRebateWithApplyService.returnBusDate(new Date());
         String  summaryTag = "";//摘要前缀
         ScmSpecialRebateWithApply entity = fetchBySid(sid);
         if (null != entity) {
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java
index 04c80c7b17..7f46040a65 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java
@@ -67,12 +67,9 @@ import com.yxt.anrui.scm.api.scmvehrebatecheckapply.flow.SubmitScmVehRebateCheck
 import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailDetailsVo;
 import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailDto;
 import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailVo;
-import com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWithDetailsVo;
-import com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWithPdfVo;
-import com.yxt.anrui.scm.api.scmvehrebatewithapply.PdfPath;
-import com.yxt.anrui.scm.api.scmvehrebatewithapply.ScmVehRebateWithApplyDetailsVo;
 import com.yxt.anrui.scm.biz.scmvehrebate.ScmVehRebateService;
 import com.yxt.anrui.scm.biz.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailService;
+import com.yxt.anrui.scm.biz.scmvehrebatewithapply.ScmVehRebateWithApplyService;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.ConstantUtils;
 import com.yxt.common.base.utils.PagerUtil;
@@ -89,7 +86,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -111,6 +107,8 @@ import static java.util.Comparator.comparing;
 @Service
 public class ScmVehrebateCheckapplyService extends MybatisBaseService<ScmVehrebateCheckapplyMapper, ScmVehrebateCheckapply> {
 
+    @Autowired
+    private ScmVehRebateWithApplyService scmVehRebateWithApplyService;
     @Autowired
     private CrmCustomerTempFeign crmCustomerTempFeign;
     @Autowired
@@ -494,13 +492,7 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService<ScmVehreba
      * @param sid,tag (0代表核对申请通过推送，1代表重推功能)
      */
     public void pushVehRebateWithVoucher(String sid, String tag) {
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-        Calendar calendar = Calendar.getInstance();
-        int month = calendar.get(Calendar.MONTH);
-        calendar.set(Calendar.MONTH, month - 1);
-        calendar.set(Calendar.DAY_OF_MONTH, calendar.getActualMaximum(Calendar.DAY_OF_MONTH));
-        Date endTime = calendar.getTime();//上个月最后一天
-        String format = sdf.format(endTime);
+        String format = scmVehRebateWithApplyService.returnBusDate(new Date());
         String summaryTag = "";//摘要前缀
         ScmVehrebateCheckapply entity = fetchBySid(sid);
         if (null != entity) {
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java
index 2fac7d62c8..a706aebc92 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java
@@ -86,6 +86,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -432,19 +433,42 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService<ScmVehRebat
         return r;
     }
 
+    /**
+     * 返利推送凭证、成本调整单返回业务日期
+     * @param date
+     * @return
+     */
+    public String returnBusDate(Date date) {
+        Date parse = null;
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
+        SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd");
+        String format1 = sdf.format(date);
+        String rDate = format1 + "-06";
+        try {
+            parse = sdf2.parse(rDate);
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        if (!(date.before(parse))) {
+            return sdf2.format(date);
+        } else {
+            Calendar calendar=Calendar.getInstance();
+            int month=calendar.get(Calendar.MONTH);
+            calendar.set(Calendar.MONTH, month-1);
+            calendar.set(Calendar.DAY_OF_MONTH, calendar.getActualMaximum(Calendar.DAY_OF_MONTH));
+            Date endTime = calendar.getTime();//上个月最后一天
+            String format = sdf2.format(endTime);
+            return format;
+        }
+    }
+
     /**
      * 推送单车返利预提凭证
      *
      * @param sid
      */
     public void pushVehRebateWithVoucher(String sid) {
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-        Calendar calendar = Calendar.getInstance();
-        int month = calendar.get(Calendar.MONTH);
-        calendar.set(Calendar.MONTH, month - 1);
-        calendar.set(Calendar.DAY_OF_MONTH, calendar.getActualMaximum(Calendar.DAY_OF_MONTH));
-        Date endTime = calendar.getTime();//上个月最后一天
-        String format = sdf.format(endTime);
+        String format = returnBusDate(new Date());
         String summaryTag = "";//摘要前缀
         ScmVehRebateWithApply entity = fetchBySid(sid);
         if (null != entity) {