diff --git a/framework/src/main/java/cn/lili/common/enums/PromotionTypeEnum.java b/framework/src/main/java/cn/lili/common/enums/PromotionTypeEnum.java index 3a121d81..0066632d 100644 --- a/framework/src/main/java/cn/lili/common/enums/PromotionTypeEnum.java +++ b/framework/src/main/java/cn/lili/common/enums/PromotionTypeEnum.java @@ -18,13 +18,12 @@ public enum PromotionTypeEnum { FULL_DISCOUNT("满减"), POINTS_GOODS("积分商品"), KANJIA("砍价"), - COUPON_ACTIVITY("优惠券活动") - ; + COUPON_ACTIVITY("优惠券活动"); /** - * 拼团秒杀拥有独立库存,如果其他促销也有独立库存涉及库存扣减的,请添加在下方 + * 有促销库存的活动类型 */ - static PromotionTypeEnum[] haveStockPromotion = new PromotionTypeEnum[]{PINTUAN, SECKILL, KANJIA}; + static PromotionTypeEnum[] haveStockPromotion = new PromotionTypeEnum[]{SECKILL, KANJIA, POINTS_GOODS}; private final String description; diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/MemberCouponServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/MemberCouponServiceImpl.java index 90ed9ce0..6a620c1c 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/MemberCouponServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/MemberCouponServiceImpl.java @@ -90,6 +90,9 @@ public class MemberCouponServiceImpl extends ServiceImpl getMemberCoupons() { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("member_id", UserContext.getCurrentUser().getId()); + queryWrapper.ge("member_coupon_status", MemberCouponStatusEnum.NEW.name()); + queryWrapper.ge("start_time", System.currentTimeMillis()); + queryWrapper.le("end_time", System.currentTimeMillis()); return this.list(queryWrapper); }