From 8aa855caa0005c7c775517b538829341256d7167 Mon Sep 17 00:00:00 2001
From: fanzongzhe0036 <fan6088588>
Date: Thu, 16 Jan 2025 17:00:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=93=E9=A1=B9=E6=A0=B8?=
 =?UTF-8?q?=E5=AF=B9=E5=87=AD=E8=AF=81=E4=B8=BA=E8=A1=8C=E9=94=80=E6=94=BF?=
 =?UTF-8?q?=E7=AD=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fin/biz/kingdee/FinKingDeeFeignRest.java  |  2 +-
 .../ScmSpecialrebateCheckapplyService.java    | 26 +++++++++----------
 .../ScmSpecialRebateWithApplyService.java     |  2 +-
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java
index b43adce839..5d136aa126 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java
@@ -659,7 +659,7 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
                 if (StringUtils.isNotBlank(voucherDetail.getManufacturer())) {
                     manufacturer = voucherDetail.getManufacturer();
                 }
-                if (!voucherDetail.getType().equals("行销活动")) {
+                if (!voucherDetail.getType().equals("行销政策")) {
                     if (voucherDetail.getRemarks().equals("返利上传")) {
                         if (voucherDetail.getSceneCode().equals("1161.01.16")) {
                             cjfl = cjfl.add(voucherDetail.getAmount());
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 da6b342bf7..110e6041e2 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
@@ -511,7 +511,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
                                 }
                             }
                         }
-                        if (!rebate.getRebateTypeValue().equals("行销活动")) {
+                        if (!rebate.getRebateTypeValue().equals("行销政策")) {
                             if (onceState.intValue() == 2 || tag.equals("1")) {
                                 //没有进行过核对申请
                                 BigDecimal oneMoney = BigDecimal.ZERO;//一次上传金额
@@ -710,7 +710,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
                                 feiyong = oneMoney.subtract(yicidaizhifu).subtract(yizhichufeiyong).subtract(yicididing);
                                 if (oneMoney.compareTo(BigDecimal.ZERO) != 0) {
                                     GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
-                                    voucherDetail.setType("行销活动");
+                                    voucherDetail.setType("行销政策");
                                     voucherDetail.setTimeFlag(finalSummaryTag);
                                     voucherDetail.setSceneCode("1161.01.16");
                                     voucherDetail.setDeptCode(deptCode); //部门编码赋值
@@ -721,7 +721,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
                                 }
                                 if (yicidaizhifu.compareTo(BigDecimal.ZERO) != 0) {
                                     GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
-                                    voucherDetail.setType("行销活动");
+                                    voucherDetail.setType("行销政策");
                                     voucherDetail.setTimeFlag(finalSummaryTag);
                                     voucherDetail.setCustomerCode("DZFCJFL");
                                     voucherDetail.setSceneCode("2181.07.00");
@@ -733,7 +733,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
                                 if (yizhichufeiyong.compareTo(BigDecimal.ZERO) != 0) {
                                     GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
                                     voucherDetail.setTimeFlag(finalSummaryTag);
-                                    voucherDetail.setType("行销活动");
+                                    voucherDetail.setType("行销政策");
                                     voucherDetail.setDeptCode(deptCode); //部门编码赋值
                                     voucherDetail.setManufacturer(gysCode);
                                     voucherDetail.setAmount(yizhichufeiyong);
@@ -744,7 +744,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
                                 if (yicididing.compareTo(BigDecimal.ZERO) != 0) {
                                     GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
                                     voucherDetail.setTimeFlag(finalSummaryTag);
-                                    voucherDetail.setType("行销活动");
+                                    voucherDetail.setType("行销政策");
                                     voucherDetail.setDeptCode(deptCode); //部门编码赋值
                                     voucherDetail.setManufacturer(gysCode);
                                     voucherDetail.setAmount(yicididing);
@@ -755,7 +755,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
                                 if (feiyong.compareTo(BigDecimal.ZERO) != 0) {
                                     GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
                                     voucherDetail.setTimeFlag(finalSummaryTag);
-                                    voucherDetail.setType("行销活动");
+                                    voucherDetail.setType("行销政策");
                                     voucherDetail.setDeptCode(deptCode); //部门编码赋值
                                     voucherDetail.setAmount(feiyong);
                                     voucherDetail.setSceneCode("6401.14");
@@ -783,7 +783,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
                             erfeiyong = twoMoney.subtract(ercidaizhifu).subtract(erzhichufeiyong).subtract(ercididing);
                             if (twoMoney.compareTo(BigDecimal.ZERO) != 0) {
                                 GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
-                                voucherDetail.setType("行销活动");
+                                voucherDetail.setType("行销政策");
                                 voucherDetail.setTimeFlag(finalSummaryTag);
                                 voucherDetail.setSceneCode("1161.01.16");
                                 voucherDetail.setDeptCode(deptCode); //部门编码赋值
@@ -794,7 +794,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
                             }
                             if (ercidaizhifu.compareTo(BigDecimal.ZERO) != 0) {
                                 GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
-                                voucherDetail.setType("行销活动");
+                                voucherDetail.setType("行销政策");
                                 voucherDetail.setTimeFlag(finalSummaryTag);
                                 voucherDetail.setCustomerCode("DZFCJFL");
                                 voucherDetail.setSceneCode("2181.07.00");
@@ -806,7 +806,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
                             if (erzhichufeiyong.compareTo(BigDecimal.ZERO) != 0) {
                                 GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
                                 voucherDetail.setTimeFlag(finalSummaryTag);
-                                voucherDetail.setType("行销活动");
+                                voucherDetail.setType("行销政策");
                                 voucherDetail.setDeptCode(deptCode); //部门编码赋值
                                 voucherDetail.setManufacturer(gysCode);
                                 voucherDetail.setAmount(erzhichufeiyong);
@@ -817,7 +817,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
                             if (ercididing.compareTo(BigDecimal.ZERO) != 0) {
                                 GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
                                 voucherDetail.setTimeFlag(finalSummaryTag);
-                                voucherDetail.setType("行销活动");
+                                voucherDetail.setType("行销政策");
                                 voucherDetail.setDeptCode(deptCode); //部门编码赋值
                                 voucherDetail.setManufacturer(gysCode);
                                 voucherDetail.setAmount(ercididing);
@@ -828,7 +828,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
                             if (erfeiyong.compareTo(BigDecimal.ZERO) != 0) {
                                 GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
                                 voucherDetail.setTimeFlag(finalSummaryTag);
-                                voucherDetail.setType("行销活动");
+                                voucherDetail.setType("行销政策");
                                 voucherDetail.setDeptCode(deptCode); //部门编码赋值
                                 voucherDetail.setAmount(erfeiyong);
                                 voucherDetail.setSceneCode("6401.14");
@@ -851,7 +851,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
                                     if (daizhifuchaMoney.compareTo(BigDecimal.ZERO) != 0) {
                                         GeneralVoucher.GeneralVoucherDetail voucherDetail1 = new GeneralVoucher.GeneralVoucherDetail();
                                         voucherDetail1.setTimeFlag(finalSummaryTag);
-                                        voucherDetail1.setType("行销活动");
+                                        voucherDetail1.setType("行销政策");
                                         voucherDetail1.setDeptCode(deptCode);
                                         voucherDetail1.setManufacturer(gysCode);
                                         voucherDetail1.setAmount(daizhifuchaMoney);
@@ -860,7 +860,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
                                         voucherDetails.add(voucherDetail1);
                                         GeneralVoucher.GeneralVoucherDetail voucherDetail2 = new GeneralVoucher.GeneralVoucherDetail();
                                         voucherDetail2.setTimeFlag(finalSummaryTag);
-                                        voucherDetail2.setType("行销活动");
+                                        voucherDetail2.setType("行销政策");
                                         voucherDetail2.setDeptCode(deptCode);
                                         voucherDetail2.setAmount(daizhifuchaMoney);
                                         voucherDetail2.setSceneCode("6401.14");
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 fa4771966d..9c78424f4b 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
@@ -475,7 +475,7 @@ public class ScmSpecialRebateWithApplyService extends MybatisBaseService<ScmSpec
                 List<GeneralVoucher.GeneralVoucherDetail> voucherDetails = new ArrayList<>();
                 if (!v.isEmpty()) {
                     for (ScmSpecialRebate rebate : v) {
-                        if (!rebate.getRebateTypeValue().equals("行销活动")) {
+                        if (!rebate.getRebateTypeValue().equals("行销政策")) {
                             if (StringUtils.isNotBlank(rebate.getUseOrgSid())) {
                                 String useOrgSid = rebate.getUseOrgSid();
                                 SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData();