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 e93f535..be02a81 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 @@ -60,9 +60,6 @@ public class TzcRebate implements Serializable { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") private LocalDateTime activityEndTime; - /** 自动获取发货数据:0-否;1-是 */ - private Integer autoDispatchFlag; - /** 核销模式:0-人工复核;1-自动核销 */ private Integer checkModel; @@ -96,10 +93,6 @@ public class TzcRebate implements Serializable { /** 返利总金额 */ private BigDecimal rebateAmount; - /** 坎级叠加标识 */ - @NotNull(message = "坎级叠加标识不能为空") - private Integer overlayFlag; - /** 备注 */ @Length(max = 255,message = "备注长度不能超过255字") private String remark; 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 c6c3cd0..437c0dd 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 @@ -38,9 +38,6 @@ public class TzcRebateParam{ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime activityEndTime; - /** 自动获取发货数据:0-否;1-是 */ - private Integer autoDispatchFlag; - /** 核销模式:0-人工复核;1-自动核销 */ private Integer checkModel; @@ -64,10 +61,6 @@ public class TzcRebateParam{ /** 返利总金额 */ private BigDecimal rebateAmount; - /** 坎级叠加标识 */ - @NotNull(message = "坎级叠加标识不能为空") - private Integer overlayFlag; - /** 备注 */ private String remark; 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 115b4a3..31c9106 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 @@ -342,7 +342,6 @@ public class TzcRebateApplicationServiceImpl implements TzcRebateApplicationServ rebate.setRebateStatus(TzcRebateStatus.DRAFT.getStatus()); rebate.setActivityStartTime(param.getActivityStartTime()); rebate.setActivityEndTime(param.getActivityEndTime()); - rebate.setAutoDispatchFlag(param.getAutoDispatchFlag()); rebate.setCheckModel(param.getCheckModel()); rebate.setCheckMaxAmount(param.getCheckMaxAmount()); rebate.setCheckAutoDateType(param.getCheckAutoDateType()); @@ -352,7 +351,6 @@ public class TzcRebateApplicationServiceImpl implements TzcRebateApplicationServ rebate.setSupplierCode(supplier.getCode()); rebate.setSupplierName(supplier.getName()); rebate.setRebateAmount(param.getRebateAmount()); - rebate.setOverlayFlag(param.getOverlayFlag()); rebate.setRemark(param.getRemark()); return rebate; } diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcRebateCheckApplicationServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcRebateCheckApplicationServiceImpl.java index eeaf9ca..a46c8be 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcRebateCheckApplicationServiceImpl.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcRebateCheckApplicationServiceImpl.java @@ -1,7 +1,10 @@ package com.qs.serve.modules.tzc.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.qs.serve.framework.base.model.ResultFlag; +import com.qs.serve.modules.tbs.common.TbsActivityState; import com.qs.serve.modules.tbs.common.TbsCostApplyState; +import com.qs.serve.modules.tbs.entity.TbsActivity; import com.qs.serve.modules.tbs.entity.TbsCostApply; import com.qs.serve.modules.tbs.service.*; import com.qs.serve.modules.tzc.consts.TzcArgTypes; @@ -79,6 +82,26 @@ public class TzcRebateCheckApplicationServiceImpl implements TzcRebateCheckAppli costApply.setSubmitTime(LocalDateTime.now()); costApply.setRemark(rebate.getRemark()); + for (int i = 0; i < periodList.size(); i++) { + TzcRebatePeriod period = periodList.get(i); + //构建活动 + TbsActivity activity = new TbsActivity(); + activity.setActivityCode(rebate.getRebateCode()+"_"+(i+1)); + activity.setActivityState(TbsActivityState.STATE_1_Finished); + activity.setCostPassFlag(0); + activity.setActTitle(rebate.getRebateName()); + activity.setSupplierId(rebate.getSupplierId()); + activity.setSupplierName(rebate.getSupplierName()); + activity.setSupplierCode(rebate.getSupplierCode()); + activity.setActStartDate(period.getPeriodStartDate()); + activity.setActEndDate(period.getPeriodEndDate()); + activity.setPreStartDate(startDate); + activity.setPreEndDate(endDate); + activity.setPreCheckDate(nowDate); + activity.setTotalAmount(maxLevelsAmount); + + } + } /**