caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优惠券获取，超出当前时间被渲染问题处理，增加状态和时间判定

Browse Source
This commit is contained in:
Chopper 2021-09-01 14:49:59 +08:00
parent 88109995bb
commit 42e9ee06f4
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
framework/src/main/java/cn/lili/common/enums/PromotionTypeEnum.java
View File

@ -18,13 +18,12 @@ public enum PromotionTypeEnum {
FULL_DISCOUNT("满减"), FULL_DISCOUNT("满减"),
POINTS_GOODS("积分商品"), POINTS_GOODS("积分商品"),
KANJIA("砍价"), 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; private final String description;

3
framework/src/main/java/cn/lili/modules/promotion/serviceimpl/MemberCouponServiceImpl.java
View File

@ -90,6 +90,9 @@ public class MemberCouponServiceImpl extends ServiceImpl<MemberCouponMapper, Mem
public List<MemberCoupon> getMemberCoupons() { public List<MemberCoupon> getMemberCoupons() {
QueryWrapper<MemberCoupon> queryWrapper = new QueryWrapper<>(); QueryWrapper<MemberCoupon> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("member_id", UserContext.getCurrentUser().getId()); 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); return this.list(queryWrapper);
} }