From e88b02c55145624e6b8ef8f4cbd56d22b9bdfff9 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 13 一月 2025 20:00:36 +0800
Subject: [PATCH] 12.18
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserCouponController.java | 48 +++++++++++++++++++++++++++++++++++-------------
1 files changed, 35 insertions(+), 13 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 82a2c24..123e8b0 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
@@ -4,6 +4,7 @@
import com.alibaba.fastjson2.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.account.api.model.AppUser;
import com.ruoyi.account.api.model.UserCoupon;
@@ -72,11 +73,18 @@
@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-1, pageSize));
+ LambdaQueryChainWrapper<UserCoupon> chainWrapper = userCouponService.lambdaQuery()
+ .eq(UserCoupon::getAppUserId, userid);
+ if(null != status && 1 == status){
+ chainWrapper.isNull(UserCoupon::getUseTime).gt(UserCoupon::getEndTime, LocalDateTime.now());
+ }
+ if(null != status && 2 == status){
+ chainWrapper.isNotNull(UserCoupon::getUseTime);
+ }
+ if(null != status && 3 == status){
+ chainWrapper.isNull(UserCoupon::getUseTime).lt(UserCoupon::getEndTime, LocalDateTime.now());
+ }
+ Page<UserCoupon> page = chainWrapper.page(Page.of(pageNum-1, pageSize));
for (UserCoupon record : page.getRecords()) {
record.setIdStr(record.getId().toString());
CouponInfo data = couponClient.detail(record.getCouponId()).getData();
@@ -102,15 +110,15 @@
}
record.setCouponInfoVo(vo);
- if (record.getUseTime()==null){
- record.setStatus(1);
- if (record.getEndTime().isBefore(LocalDateTime.now())){
- record.setStatus(3);
- }
- }else {
+ if(null != record.getUseTime()){
record.setStatus(2);
+ }else{
+ if(record.getEndTime().isBefore(LocalDateTime.now())){
+ record.setStatus(3);
+ }else{
+ record.setStatus(1);
+ }
}
-
AppUser appUser = appUserService.getById(record.getAppUserId());
record.setUserName(appUser.getName());
record.setPhone(appUser.getPhone());
@@ -121,11 +129,25 @@
@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>()
+ .eq(AppUser::getPhone, phone));
+ 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());
--
Gitblit v1.7.1