From 143ba6ed6231db632d08edfb109819e1d1e3d956 Mon Sep 17 00:00:00 2001 From: phpcjl <phpcjl@gmail.com> Date: 星期五, 06 十二月 2024 16:31:38 +0800 Subject: [PATCH] 1. --- ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserCouponController.java | 6 +++--- 1 files changed, 3 insertions(+), 3 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 b7d431b..8f6e789 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 @@ -57,9 +57,9 @@ 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()) + .isNull(status==1||status==3,UserCoupon::getUseTime) + .isNotNull(status == 2,UserCoupon::getUseTime) + .lt(status == 3,UserCoupon::getEndTime, LocalDateTime.now()) .eq(UserCoupon::getAppUserId, userid).page(Page.of(pageNum, pageSize)); for (UserCoupon record : page.getRecords()) { CouponInfo data = couponClient.detail(record.getCouponId()).getData(); -- Gitblit v1.7.1