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-member/src/main/java/com/ruoyi/member/controller/miniapp/AppCouponController.java | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
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 270e667..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
@@ -5,7 +5,7 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.goods.api.domain.LotteryEvent;
+import com.ruoyi.goods.api.domain.TLotteryEvent;
import com.ruoyi.goods.api.service.LotteryEventClient;
import com.ruoyi.member.domain.dto.AppMemberCouponPageDto;
import com.ruoyi.member.domain.pojo.coupon.Coupon;
@@ -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());
@@ -115,8 +116,10 @@
vo.setDiscountMoney(coupon.getDiscountMoney());
vo.setValidType(coupon.getValidTimeType());
vo.setValidDays(coupon.getValidDay());
- vo.setValidStartTime(sdf.format(coupon.getValidStartTime()));
- vo.setValidEndTime(sdf.format(coupon.getValidEndTime()));
+ if (2 != coupon.getValidTimeType()) {
+ vo.setValidStartTime(sdf.format(coupon.getValidStartTime()));
+ vo.setValidEndTime(sdf.format(coupon.getValidEndTime()));
+ }
vo.setPropagandaPoster(coupon.getPropagandaPoster());
vo.setUseGoods("");
//构建特定商品数据
@@ -131,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);
}
@@ -147,12 +147,12 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "优惠券id", required = true, dataType = "String", paramType = "path")
})
- public R<Boolean> shareCoupon(@PathVariable("couponId") String couponId) {
+ public R<String> shareCoupon(@PathVariable("couponId") String couponId) {
//检测是否可以抽奖
- List<LotteryEvent> data = lotteryEventClient.getLotteryEventList(3).getData();
+ List<TLotteryEvent> data = lotteryEventClient.getLotteryEventList(3).getData();
if (data.size() > 0) {
- return R.ok(true);
+ return R.ok(data.get(0).getId());
}
- return R.ok(false);
+ return R.ok();
}
}
--
Gitblit v1.7.1