diff --git a/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/setting/SettingBizService.java b/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/setting/SettingBizService.java index be35e66..081e78a 100644 --- a/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/setting/SettingBizService.java +++ b/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/setting/SettingBizService.java @@ -15,6 +15,8 @@ import org.springframework.util.CollectionUtils; import java.util.*; import java.util.stream.Collectors; +import static cn.fw.common.businessvalidator.Validator.BV; + /** * @author : kurisu * @className : SettingBizService @@ -63,6 +65,14 @@ public class SettingBizService { FollowTypeEnum followTypeEnum = FollowTypeEnum.ofValue(category); boolean allMatch = list.stream().allMatch(r -> Objects.equals(category, r.getCategory())); boolean expression = Objects.nonNull(followTypeEnum) && Boolean.TRUE.equals(allMatch); + for (SettingDTO dto : list) { + if (SettingTypeEnum.NOTICE_CYCLE.getValue().equals(dto.getType())) { + BV.isTrue(dto.getDetailValue() > 5, () -> "消息推送间隔必须大于5天"); + } + if (SettingTypeEnum.NOTICE_TIMES.getValue().equals(dto.getType())) { + BV.isTrue(dto.getDetailValue() <= 2, () -> "消息提醒次数不能大于两次"); + } + } Assert.isTrue(expression, "跟进类型不正确"); SettingStrategy strategy = processorMap.get(followTypeEnum);