ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/lottery/LotteryEventServiceImpl.java
@@ -157,9 +157,11 @@ boolean tryLock = lock.tryLock(30, TimeUnit.SECONDS); if (tryLock) { //判断抽奖次数是否用完 int count = userLotteryEventService.count(new QueryWrapper<TUserLotteryEvent>().eq("lottery_event_id", id).eq("user_id", userId)); if (lotteryEvent.getTimes() <= count) { return R.fail("抽奖次数已用完"); if(2 != lotteryEvent.getActivityType()){ int count = userLotteryEventService.count(new QueryWrapper<TUserLotteryEvent>().eq("lottery_event_id", id).eq("user_id", userId)); if (lotteryEvent.getTimes() <= count) { return R.fail("抽奖次数已用完"); } } List<TLotteryEventPrize> lotteryEventPrizeList = lotteryEventPrizeService.list(new QueryWrapper<TLotteryEventPrize>().eq("lottery_event_id", id)); //开始抽奖，根据中奖概率来抽奖 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppCouponController.java
@@ -112,6 +112,7 @@ vo.setId(coupon.getCouponId()); vo.setName(coupon.getCouponName()); vo.setType(coupon.getCouponType()); vo.setSendType(coupon.getSendType()); vo.setMoneyThreshold(coupon.getMoneyThreshold()); vo.setDiscountPercent(coupon.getDiscountPercent()); vo.setDiscountMoney(coupon.getDiscountMoney()); @@ -136,16 +137,16 @@ vo.setUseGoods(sb.substring(0, sb.length() - 1)); } vo.setLimitFlag(coupon.getSendLimitFlag()); vo.setReceiveNum(coupon.getSendLimitNumber()); vo.setReceiveNum(coupon.getLimitNumber()); int count = memberCouponService.count(new QueryWrapper<MemberCoupon>().eq("coupon_id", couponId).eq("del_flag", 0)); vo.setLaveNum(coupon.getSendLimitNumber() - count); vo.setLaveNum(coupon.getLimitNumber() - count); Long userId = SecurityUtils.getUserId(); List<MemberCoupon> list = memberCouponService.list(new QueryWrapper<MemberCoupon>().eq("coupon_id", couponId).eq("user_id", userId).eq("del_flag", 0)); vo.setStatus(list.isEmpty() ? null : list.get(0).getCouponStatus()); return R.ok(vo); } @ResponseBody @PostMapping("/shareCoupon/{couponId}") @ApiOperation(value = "分享优惠券【2.0】", tags = "领券中心") ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/CouponInfoVo.java
@@ -19,6 +19,8 @@ private String name; @ApiModelProperty(value = "优惠券类型1.满减2.折扣3.代金4.商品") private Integer type; @ApiModelProperty("发送类型1.手动领取2.指定发放3.抽奖领取") private Integer sendType; @ApiModelProperty(value = "门槛金额") private BigDecimal moneyThreshold; @ApiModelProperty(value = "折扣")
