feat: 返利模板调整

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;

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;

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("拒绝访问");

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);
+        TbsActivityTemplate template = tbsActivityTemplateService.getById(templateId);
-//        if (template==null){
+        if (template==null){
-//            Assert.throwEx("模板不存在");
+            Assert.throwEx("模板不存在");
-//        }
+        }
-//        if (template.getTemplateState().equals(0)){
+        if (template.getTemplateState().equals(0)){
-//            Assert.throwEx("模板未启用");
+            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.setTemplateId(templateId);
-//        rebate.setTemplateName(template.getTemplateName());
+        rebate.setTemplateName(template.getTemplateName());
+        rebate.setTemplateData(param.getTemplateData());
         rebate.setRebateName(param.getRebateName());
         rebate.setRebateStatus(TzcRebateStatus.DRAFT.getStatus());
         rebate.setActivityStartTime(param.getActivityStartTime());

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;
 

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<VtbVerification
     public void submit(VtbVerificationBatchBo submitBo) {
         String templateCode =  TbsSeeYonConst.BatchCostCheckConf.Code();
         TbsCostApply costApply = tbsCostApplyService.getById(submitBo.getCostApplyId());
+        if(costApply.getContractFlag().equals(3)){
+            Assert.throwEx("返利政策的费用不支持批量核销");
+        }
         BmsSupplier supplier = bmsSupplierService.getById(costApply.getSupplierId());
         List<TbsActivity> activityList = tbsActivityService.listByCostApplyId(costApply.getId());
         SysUser sysUser = sysUserService.getById(AuthContextUtils.getSysUserId());