From 4bb2511df63c3d6516f3222458bc413909d89281 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期五, 25 七月 2025 20:12:42 +0800
Subject: [PATCH] bug修改
---
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/lottery/LotteryEventServiceImpl.java | 2 +-
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppCouponController.java | 10 ++++------
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/lottery/LotteryEventServiceImpl.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/lottery/LotteryEventServiceImpl.java
index d8c41c3..65e76ea 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/lottery/LotteryEventServiceImpl.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/lottery/LotteryEventServiceImpl.java
@@ -83,7 +83,7 @@
vo.setId(lotteryEvent.getId());
vo.setName(lotteryEvent.getName());
vo.setActivityProfile(lotteryEvent.getActivityProfile());
- List<TUserLotteryEvent> userLotteryEvents = userLotteryEventService.list(new QueryWrapper<TUserLotteryEvent>().eq("lottery_event_id", id));
+ List<TUserLotteryEvent> userLotteryEvents = userLotteryEventService.list(new QueryWrapper<TUserLotteryEvent>().eq("lottery_event_id", id).eq("user_id", userId));
vo.setLaveTimes(lotteryEvent.getTimes() - userLotteryEvents.size());
//查询抽检活动奖品
List<TLotteryEventPrize> lotteryEventPrizeList = lotteryEventPrizeService.list(new QueryWrapper<TLotteryEventPrize>().eq("lottery_event_id", id));
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppCouponController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppCouponController.java
index 178fd1c..e6cc3d0 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppCouponController.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppCouponController.java
@@ -104,8 +104,9 @@
@ApiImplicitParam(name = "id", value = "优惠券id", required = true, dataType = "String", paramType = "path")
})
public R<CouponInfoVo> getCouponInfo(@PathVariable("couponId") String couponId) {
+ MemberCoupon memberCoupon = memberCouponService.getById(couponId);
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
- Coupon coupon = couponService.getById(couponId);
+ Coupon coupon = couponService.getById(memberCoupon.getCouponId());
CouponInfoVo vo = new CouponInfoVo();
vo.setId(coupon.getCouponId());
vo.setName(coupon.getCouponName());
@@ -133,12 +134,9 @@
}
vo.setLaveNum(coupon.getSendLimitFlag());
vo.setReceiveNum(coupon.getSendLimitNumber());
- int count = memberCouponService.count(new QueryWrapper<MemberCoupon>().eq("coupon_id", couponId).eq("del_flag", 0));
+ int count = memberCouponService.count(new QueryWrapper<MemberCoupon>().eq("coupon_id", memberCoupon.getCouponId()).eq("del_flag", 0));
vo.setLaveNum(coupon.getSendLimitNumber() - count);
- MemberCoupon one = memberCouponService.getOne(new QueryWrapper<MemberCoupon>().eq("coupon_id", couponId).eq("user_id", SecurityUtils.getUserId()));
- if (one != null) {
- vo.setStatus(one.getCouponStatus());
- }
+ vo.setStatus(memberCoupon.getCouponStatus());
return R.ok(vo);
}
--
Gitblit v1.7.1