diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/TtPoiPlanController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/TtPoiPlanController.java index 48b0ab30f..3d7165a17 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/TtPoiPlanController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/TtPoiPlanController.java @@ -152,7 +152,7 @@ public class TtPoiPlanController extends BaseController { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"定向达人抖音号为空"); } //达人去重 - List collect = record.getDouyinIdList().stream().collect(Collectors.toList()); + List collect = record.getDouyinIdList().stream().distinct().collect(Collectors.toList()); record.setDouyinIdList(collect); if(record.getCouponId() == null){ diff --git a/mallinkService/src/main/java/com/iformall/service/impl/TtCouponGoodsServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/TtCouponGoodsServiceImpl.java index db76a33d0..1d3dcf6b0 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/TtCouponGoodsServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/TtCouponGoodsServiceImpl.java @@ -663,6 +663,9 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService { if(oldTakeRate == null || StringUtils.isBlank(oldTakeRate.getDouyinId())){ throw new MallinkException(ErrorCode.SYS_PARAMETER_ERROR); } + if(!EnumCpsPlanStatus.ING.getCode().equals(oldTakeRate.getStatus())){ + throw new MallinkException(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"该计划已取消或已完成"); + } List addDouyinIdList = new ArrayList<>(); addDouyinIdList.addAll(record.getDouyinIdList()); @@ -682,6 +685,13 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService { } if(EnumCpsPlanContentType.VIDEO.getCode().equals(record.getContentType())){ + //当时间改变时, + if(record.getStartTime() != null && record.getStartTime().after(oldTakeRate.getStartTime())){ + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"开始时间只能向前修改"); + } + if(record.getEndTime() != null && record.getEndTime().before(oldTakeRate.getEndTime())){ + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"结束时间只能向后延长"); + } //当时间未改变时, if(record.getStartTime() == null || record.getStartTime().equals(oldTakeRate.getStartTime())){ record.setStartTime(null);