oneos-v5/backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优惠劵模板相关逻辑的迁移

Browse Source
This commit is contained in:
YunaiV
2020-08-22 17:58:52 +08:00
parent 6fd899bca2
commit 60b0043a78
9 changed files with 26 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
promotion-service-project/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/enums/coupon/template/CouponTemplateTypeEnum.java
View File

@@ -2,6 +2,9 @@ package cn.iocoder.mall.promotion.api.enums.coupon.template;
import java.util.Arrays;
/**
* 优惠劵（码）模板的类型的枚举
*/
public enum CouponTemplateTypeEnum {
CARD(1, "优惠劵"),

2
promotion-service-project/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/rpc/coupon/dto/template/CouponCardTemplateCreateReqDTO.java
View File

@@ -100,7 +100,7 @@ public class CouponCardTemplateCreateReqDTO implements Serializable {
* 例如，0-当天；1-次天
*/
@Min(value = 0L, message = "领取日期开始时间最小为 {value}")
private Integer fixedBeginTerm;
private Integer fixedStartTerm;
/**
* 领取日期-结束天数
*/

2
promotion-service-project/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/rpc/coupon/dto/template/CouponCardTemplateUpdateReqDTO.java
View File

@@ -99,7 +99,7 @@ public class CouponCardTemplateUpdateReqDTO implements Serializable {
// * 例如，0-当天；1-次天
// */
// @Min(value = 0L, message = "领取日期开始时间最小为 {value}")
// private Integer fixedBeginTerm;
// private Integer fixedStartTerm;
// /**
// * 领取日期-结束天数
// */

6
promotion-service-project/promotion-service-app/src/main/java/cn/iocoder/mall/promotionservice/service/coupon/CouponTemplateService.java
View File

@@ -73,7 +73,7 @@ public class CouponTemplateService {
couponTemplateMapper.updateById(updateTemplateDO);
}
private Boolean checkCouponTemplateDateType(Integer dateType, Date validStartTime, Date validEndTime, Integer fixedBeginTerm, Integer fixedEndTerm) {
private Boolean checkCouponTemplateDateType(Integer dateType, Date validStartTime, Date validEndTime, Integer fixedStartTerm, Integer fixedEndTerm) {
// TODO 芋艿：后续这种类型的校验，看看怎么优化到对象里
if (CouponTemplateDateTypeEnum.FIXED_DATE.getValue().equals(dateType)) { // 固定日期
if (validStartTime == null) {
@@ -86,7 +86,7 @@ public class CouponTemplateService {
throw ServiceExceptionUtil.exception(BAD_REQUEST, "生效开始时间不能大于生效结束时间");
}
} else if (CouponTemplateDateTypeEnum.FIXED_TERM.getValue().equals(dateType)) { // 领取日期
if (fixedBeginTerm == null) {
if (fixedStartTerm == null) {
throw ServiceExceptionUtil.exception(BAD_REQUEST, "领取日期开始时间不能为空");
}
if (fixedEndTerm == null) {
@@ -129,7 +129,7 @@ public class CouponTemplateService {
// 校验生效日期相关
checkCouponTemplateDateType(createReqDTO.getDateType(),
createReqDTO.getValidStartTime(), createReqDTO.getValidEndTime(),
createReqDTO.getFixedBeginTerm(), createReqDTO.getFixedEndTerm());
createReqDTO.getFixedStartTerm(), createReqDTO.getFixedEndTerm());
// 校验优惠类型
checkCouponTemplatePreferentialType(createReqDTO.getPreferentialType(), createReqDTO.getPercentOff(),
createReqDTO.getPriceOff(), createReqDTO.getPriceAvailable());