From 949084022efbb071a29718add61155c734d06c44 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 10 九月 2025 10:54:08 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppCouponController.java | 27 +++++++++++++++++++++------
1 files changed, 21 insertions(+), 6 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 f876f1e..008e081 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
@@ -103,7 +103,7 @@
@PostMapping("/getCouponInfo/{couponId}")
@ApiOperation(value = "获取优惠券详情【2.0】", tags = "领券中心")
@ApiImplicitParams({
- @ApiImplicitParam(name = "id", value = "优惠券id", required = true, dataType = "String", paramType = "path")
+ @ApiImplicitParam(name = "couponId", value = "优惠券id", required = true, dataType = "String", paramType = "path")
})
public R<CouponInfoVo> getCouponInfo(@PathVariable("couponId") String couponId) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -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,21 +137,21 @@
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 = "领券中心")
@ApiImplicitParams({
- @ApiImplicitParam(name = "id", value = "优惠券id", required = true, dataType = "String", paramType = "path")
+ @ApiImplicitParam(name = "couponId", value = "优惠券id", required = true, dataType = "String", paramType = "path")
})
public R<String> shareCoupon(@PathVariable("couponId") String couponId) {
//检测是否可以抽奖
@@ -163,4 +164,18 @@
}
return R.ok();
}
+
+
+ @ResponseBody
+ @PostMapping("/shareCoupon/determineClaimCoupon/{couponId}")
+ @ApiOperation(value = "判断是否领取了该优惠券【2.0】", tags = "领券中心")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "couponId", value = "优惠券id", required = true, dataType = "String", paramType = "path")
+ })
+ public R<Boolean> determineClaimCoupon(@PathVariable("couponId") String couponId){
+ Long userId = SecurityUtils.getUserId();
+ MemberCoupon one = memberCouponService.getOne(new QueryWrapper<MemberCoupon>().eq("coupon_id", couponId)
+ .eq("user_id", userId).ne("coupon_status", -1));
+ return R.ok(null != one);
+ }
}
--
Gitblit v1.7.1