From 10ec1fe9c1f146a306a6e50dec3ed1996db4df88 Mon Sep 17 00:00:00 2001 From: Yen Date: Wed, 30 Apr 2025 16:00:28 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=BF=94=E5=88=A9=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serve/modules/tzc/entity/TzcRebate.java | 3 +++ .../modules/tzc/entity/bo/TzcRebateParam.java | 3 +++ .../impl/TbsCostApplyPart1ServiceImpl.java | 3 +++ .../impl/TzcRebateApplicationServiceImpl.java | 19 ++++++++++--------- .../modules/vtb/entity/VtbVerification.java | 16 ++++++++++++++-- .../impl/VtbVerificationBatchServiceImpl.java | 3 +++ 6 files changed, 36 insertions(+), 11 deletions(-) diff --git a/cms-modules/cms-policy/cms-policy-api/src/main/java/com/qs/serve/modules/tzc/entity/TzcRebate.java b/cms-modules/cms-policy/cms-policy-api/src/main/java/com/qs/serve/modules/tzc/entity/TzcRebate.java index dc52907..06ddc07 100644 --- a/cms-modules/cms-policy/cms-policy-api/src/main/java/com/qs/serve/modules/tzc/entity/TzcRebate.java +++ b/cms-modules/cms-policy/cms-policy-api/src/main/java/com/qs/serve/modules/tzc/entity/TzcRebate.java @@ -40,6 +40,9 @@ public class TzcRebate implements Serializable { @Length(max = 64,message = "模板名称长度不能超过64字") private String templateName; + /** 模板数据 */ + private String templateData; + /** 返利编码 */ @Length(max = 64,message = "返利编码长度不能超过64字") private String rebateCode; diff --git a/cms-modules/cms-policy/cms-policy-api/src/main/java/com/qs/serve/modules/tzc/entity/bo/TzcRebateParam.java b/cms-modules/cms-policy/cms-policy-api/src/main/java/com/qs/serve/modules/tzc/entity/bo/TzcRebateParam.java index 087bf9e..bb91596 100644 --- a/cms-modules/cms-policy/cms-policy-api/src/main/java/com/qs/serve/modules/tzc/entity/bo/TzcRebateParam.java +++ b/cms-modules/cms-policy/cms-policy-api/src/main/java/com/qs/serve/modules/tzc/entity/bo/TzcRebateParam.java @@ -26,6 +26,9 @@ public class TzcRebateParam{ /** 模板id */ private Long templateId; + /** 模板数据 */ + private String templateData; + /** 返利抬头 */ @Length(max = 64,message = "返利抬头长度不能超过64字") private String rebateName; diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyPart1ServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyPart1ServiceImpl.java index ec1c2df..ef2a05c 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyPart1ServiceImpl.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyPart1ServiceImpl.java @@ -163,6 +163,9 @@ public class TbsCostApplyPart1ServiceImpl implements TbsCostApplyPart1Service { if(orgCost.getContractFlag().equals(1)){ Assert.throwEx("协议类不支持异动"); } + if(orgCost.getContractFlag().equals(3)){ + Assert.throwEx("返利政策现版本不支持异动"); + } boolean isExtUser = orgCost.getExtUserId()!=null&&userId.equals(orgCost.getExtUserId()); if(!userId.equals(orgCost.getUserId())&&!isExtUser){ Assert.throwEx("拒绝访问"); diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcRebateApplicationServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcRebateApplicationServiceImpl.java index 141b99d..d43780f 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcRebateApplicationServiceImpl.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcRebateApplicationServiceImpl.java @@ -386,13 +386,13 @@ public class TzcRebateApplicationServiceImpl implements TzcRebateApplicationServ rebate.setId(rebateId); rebate.setRebateCode(rebateCode); Long templateId = param.getTemplateId(); -// TbsActivityTemplate template = tbsActivityTemplateService.getById(templateId); -// if (template==null){ -// Assert.throwEx("模板不存在"); -// } -// if (template.getTemplateState().equals(0)){ -// Assert.throwEx("模板未启用"); -// } + TbsActivityTemplate template = tbsActivityTemplateService.getById(templateId); + if (template==null){ + Assert.throwEx("模板不存在"); + } + if (template.getTemplateState().equals(0)){ + Assert.throwEx("模板未启用"); + } // boolean allVisible = template.getCustomFlag().equals(0) // &&template.getSaleRegionFlag().equals(0) // &&template.getBizRegionFlag().equals(0); @@ -402,8 +402,9 @@ public class TzcRebateApplicationServiceImpl implements TzcRebateApplicationServ // Assert.throwEx("当前客户未授权"); // } // } -// rebate.setTemplateId(templateId); -// rebate.setTemplateName(template.getTemplateName()); + rebate.setTemplateId(templateId); + rebate.setTemplateName(template.getTemplateName()); + rebate.setTemplateData(param.getTemplateData()); rebate.setRebateName(param.getRebateName()); rebate.setRebateStatus(TzcRebateStatus.DRAFT.getStatus()); rebate.setActivityStartTime(param.getActivityStartTime()); diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/entity/VtbVerification.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/entity/VtbVerification.java index 0d558bb..4ece78f 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/entity/VtbVerification.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/entity/VtbVerification.java @@ -88,10 +88,10 @@ public class VtbVerification implements Serializable { /** 输入的释放标识 */ private Integer inputReleaseFlag; - /** 金额 */ + /** 金额(可为返利金额) */ private BigDecimal amount; - /** 申请时金额记录 */ + /** 申请时金额记录(可为返利金额) */ private BigDecimal amountRecord; private String syFormId; @@ -197,6 +197,18 @@ public class VtbVerification implements Serializable { private String extUserCode; private String extUserName; + /** 返利id */ + private Long rebateId; + + /** 返利期间id */ + private Long rebatePeriodId; + + /** 实际发货金额(针对返利业务) */ + private BigDecimal autoDispatchAmt; + + /** 系统获取的发货金额 */ + private BigDecimal finalDispatchAmt; + @TableField(exist = false) private List attachList; diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationBatchServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationBatchServiceImpl.java index 1da7a78..bf551f1 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationBatchServiceImpl.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationBatchServiceImpl.java @@ -100,6 +100,9 @@ public class VtbVerificationBatchServiceImpl extends ServiceImpl activityList = tbsActivityService.listByCostApplyId(costApply.getId()); SysUser sysUser = sysUserService.getById(AuthContextUtils.getSysUserId());