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 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();