From d0a4f1260ae71837c125a9f2c4609e6fbf0c5ee1 Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期一, 16 十二月 2024 14:36:44 +0800
Subject: [PATCH] 1
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserCouponController.java | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserCouponController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserCouponController.java
index 671074d..60e083f 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserCouponController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserCouponController.java
@@ -58,15 +58,15 @@
- @PostMapping("/mine/list")
- @ApiOperation(value = "已领取列表", tags = {"小程序-个人中心-优惠劵"})
+ @GetMapping("/mine/list")
+ @ApiOperation(value = "已领取列表", tags = {"小程序-个人中心-优惠劵","后台管理-活动管理-优惠券管理"})
public R<Page<UserCoupon>> minelist(@RequestParam Integer pageNum, @RequestParam Integer pageSize, @ApiParam("1未使用2已使用3已过期") Integer status) {
Long userid = tokenService.getLoginUserApplet().getUserid();
Page<UserCoupon> page = userCouponService.lambdaQuery()
.isNull(status!=null&&(status==1||status==3),UserCoupon::getUseTime)
.isNotNull(status!=null&&status==2,UserCoupon::getUseTime)
.lt(status!=null&&status==3,UserCoupon::getEndTime, LocalDateTime.now())
- .eq(UserCoupon::getAppUserId, userid).page(Page.of(pageNum, pageSize));
+ .eq(UserCoupon::getAppUserId, userid).page(Page.of(pageNum-1, pageSize));
for (UserCoupon record : page.getRecords()) {
CouponInfo data = couponClient.detail(record.getCouponId()).getData();
CouponInfoVo vo = new CouponInfoVo();
@@ -99,12 +99,17 @@
}else {
record.setStatus(2);
}
+
+
+ AppUser appUser = appUserService.getById(record.getAppUserId());
+ record.setUserName(appUser.getName());
+ record.setPhone(appUser.getPhone());
}
return R.ok(page);
}
- @PostMapping("/get")
+ @GetMapping("/get")
@ApiOperation(value = "领取或者兑换优惠券", tags = {"小程序-个人中心-优惠劵"})
public R<Page<UserCoupon>> get(@RequestParam Integer couponId) {
@@ -183,5 +188,13 @@
BeanUtils.copyProperties(data, couponInfoVo);
return R.ok(couponInfoVo);
}
+
+ /**
+ * 获取优惠券发放数量
+ */
+ @GetMapping("/getCouponCount")
+ public R<Long> getCouponCount(@RequestParam Integer couponId){
+ return R.ok(userCouponService.lambdaQuery().eq(UserCoupon::getCouponId, couponId).count());
+ }
}
--
Gitblit v1.7.1