From 4db8023227b3900740b8be361c436ddadb1d0585 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 14 一月 2025 08:42:06 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserCouponController.java | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 insertions(+), 2 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 c177572..4bcd4c1 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
@@ -105,8 +105,8 @@
goodNames.add(datum.getName());
}
}
- vo.setGoodNames(goodNames);
}
+ vo.setGoodNames(goodNames);
}
record.setCouponInfoVo(vo);
@@ -129,11 +129,26 @@
@GetMapping("/mine/list1")
@ApiOperation(value = "已领取列表", tags = {"管理后台-优惠劵"})
- public R<Page<UserCoupon>> list1(@RequestParam Integer pageNum, @RequestParam Integer pageSize, @ApiParam("1未使用2已使用3已过期") Integer status, Integer id) {
+ public R<Page<UserCoupon>> list1(@RequestParam Integer pageNum,
+ @RequestParam Integer pageSize,
+ @ApiParam("1未使用2已使用3已过期") Integer status,
+ String phone,
+ Integer id) {
+
+ Long appUserId = null;
+ if (!StringUtils.isEmpty(phone)){
+ AppUser appUser1 = appUserService.getOne(new LambdaQueryWrapper<AppUser>()
+ .like(AppUser::getPhone, phone));
+ if (appUser1 != null){
+ appUserId = appUser1.getId();
+ }
+ }
+
Page<UserCoupon> page = userCouponService.lambdaQuery()
.isNull(status!=null&&(status==1||status==3),UserCoupon::getUseTime)
.isNotNull(status!=null&&status==2,UserCoupon::getUseTime)
.eq(UserCoupon::getCouponId, id)
+ .eq(appUserId != null,UserCoupon::getAppUserId, appUserId)
.lt(status!=null&&status==3,UserCoupon::getEndTime, LocalDateTime.now()).page(Page.of(pageNum-1, pageSize));
for (UserCoupon record : page.getRecords()) {
record.setIdStr(record.getId().toString());
@@ -359,5 +374,18 @@
userCouponService.updateById(userCoupon);
return R.ok();
}
+
+
+ /**
+ * 编辑用户优惠券使用时间
+ * @param userCoupon
+ * @return
+ */
+ @PostMapping("/editReturnUse")
+ public R editReturnUse(@RequestBody UserCoupon userCoupon){
+ userCouponService.update(new LambdaUpdateWrapper<UserCoupon>().eq(UserCoupon::getId, userCoupon.getId())
+ .set(UserCoupon::getUseTime, userCoupon.getUseTime()));
+ return R.ok();
+ }
}
--
Gitblit v1.7.1