From 72c58059bd4a70603ba441a7b916940743becfe9 Mon Sep 17 00:00:00 2001 From: Chopper Date: Tue, 9 Aug 2022 16:08:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/lili/common/enums/ResultCode.java | 14 ++++++++------ .../modules/store/entity/dto/StoreEditDTO.java | 1 - .../promotion/CouponActivityManagerController.java | 7 ++++++- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/framework/src/main/java/cn/lili/common/enums/ResultCode.java b/framework/src/main/java/cn/lili/common/enums/ResultCode.java index 068d7ad5a..8ce9a8863 100644 --- a/framework/src/main/java/cn/lili/common/enums/ResultCode.java +++ b/framework/src/main/java/cn/lili/common/enums/ResultCode.java @@ -278,11 +278,6 @@ public enum ResultCode { COUPON_RECEIVE_ERROR(41005, "当前优惠券已经被领取完了，下次要早点来哦"), COUPON_NUM_INSUFFICIENT_ERROR(41006, "优惠券剩余领取数量不足"), COUPON_NOT_EXIST(41007, "当前优惠券不存在"), - COUPON_DO_NOT_RECEIVER(41030, "当前优惠券不允许主动领取"), - COUPON_ACTIVITY_NOT_EXIST(410022, "当前优惠券活动不存在"), - COUPON_SAVE_ERROR(41020, "保存优惠券失败"), - COUPON_ACTIVITY_SAVE_ERROR(41023, "保存优惠券活动失败"), - COUPON_DELETE_ERROR(41021, "删除优惠券失败"), COUPON_LIMIT_NUM_LESS_THAN_0(41008, "领取限制数量不能为负数"), COUPON_LIMIT_GREATER_THAN_PUBLISH(41009, "领取限制数量超出发行数量"), COUPON_DISCOUNT_ERROR(41010, "优惠券折扣必须小于10且大于0"), @@ -293,8 +288,15 @@ public enum ResultCode { COUPON_MEMBER_NOT_EXIST(41015, "没有当前会员优惠券"), COUPON_MEMBER_STATUS_ERROR(41016, "当前会员优惠券已过期/作废无法变更状态！"), - SPECIAL_CANT_USE(41020, "特殊商品不能使用优惠券，不能使用"), + SPECIAL_CANT_USE(41019, "特殊商品不能使用优惠券，不能使用"), + COUPON_SAVE_ERROR(41020, "保存优惠券失败"), + COUPON_DELETE_ERROR(41021, "删除优惠券失败"), + COUPON_ACTIVITY_NOT_EXIST(41022, "当前优惠券活动不存在"), + COUPON_ACTIVITY_SAVE_ERROR(41023, "保存优惠券活动失败"), + COUPON_ACTIVITY_MAX_NUM(41024, "优惠券活动赠券数量最多为3"), + + COUPON_DO_NOT_RECEIVER(41030, "当前优惠券不允许主动领取"), /** * 拼团 diff --git a/framework/src/main/java/cn/lili/modules/store/entity/dto/StoreEditDTO.java b/framework/src/main/java/cn/lili/modules/store/entity/dto/StoreEditDTO.java index 567594bf1..4c460945d 100644 --- a/framework/src/main/java/cn/lili/modules/store/entity/dto/StoreEditDTO.java +++ b/framework/src/main/java/cn/lili/modules/store/entity/dto/StoreEditDTO.java @@ -1,6 +1,5 @@ package cn.lili.modules.store.entity.dto; -import cn.lili.common.validation.Mobile; import cn.lili.common.validation.Phone; import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.annotations.ApiModelProperty; diff --git a/manager-api/src/main/java/cn/lili/controller/promotion/CouponActivityManagerController.java b/manager-api/src/main/java/cn/lili/controller/promotion/CouponActivityManagerController.java index 635d9ff1d..e2c4cbf64 100644 --- a/manager-api/src/main/java/cn/lili/controller/promotion/CouponActivityManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/promotion/CouponActivityManagerController.java @@ -6,6 +6,7 @@ import cn.lili.common.exception.ServiceException; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.promotion.entity.dos.CouponActivity; +import cn.lili.modules.promotion.entity.dos.CouponActivityItem; import cn.lili.modules.promotion.entity.dto.CouponActivityDTO; import cn.lili.modules.promotion.entity.vos.CouponActivityVO; import cn.lili.modules.promotion.service.CouponActivityService; @@ -49,8 +50,12 @@ public class CouponActivityManagerController { @ApiOperation(value = "添加优惠券活动") @PostMapping - @PutMapping(consumes = "application/json", produces = "application/json") public ResultMessage addCouponActivity(@RequestBody(required = false) CouponActivityDTO couponActivityDTO) { + for (CouponActivityItem couponActivityItem : couponActivityDTO.getCouponActivityItems()) { + if (couponActivityItem.getNum() > 3) { + throw new ServiceException(ResultCode.COUPON_ACTIVITY_MAX_NUM); + } + } if (couponActivityService.savePromotions(couponActivityDTO)) { return ResultUtil.data(couponActivityDTO); }