From 15bfd012429367bf9b8f03bdc8bb101ae0bdfe4d Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 21 三月 2025 15:26:39 +0800
Subject: [PATCH] 修改统计bug

---
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/CouponInfoController.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/CouponInfoController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/CouponInfoController.java
index 4d139a9..d154540 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/CouponInfoController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/CouponInfoController.java
@@ -161,19 +161,21 @@
         Long userid = tokenService.getLoginUserApplet().getUserid();
         AppUser appUserById = appUserClient.getAppUserById(userid);
         LocalDateTime now = LocalDateTime.now();
-
-
         //查出全部可领取的优惠劵
         List<CouponInfo> list = couponInfoService.lambdaQuery()
                 .le(CouponInfo::getSendStartTime, now)
                 .ge(CouponInfo::getSendEndTime, now)
                 .eq(CouponInfo::getPersonType, 1)
+                .eq(CouponInfo::getDelFlag, 0)
+                .eq(CouponInfo::getShelfStatus, 1)
                 .list();
         //查出指定人员可领取优惠券
         List<CouponInfo> list1 = couponInfoService.lambdaQuery()
                 .le(CouponInfo::getSendStartTime, now)
                 .ge(CouponInfo::getSendEndTime, now)
                 .eq(CouponInfo::getPersonType, 2)
+                .eq(CouponInfo::getDelFlag, 0)
+                .eq(CouponInfo::getShelfStatus, 1)
                 .apply("FIND_IN_SET('" + appUserById.getId() + "', person_ids)")
                 .list();
         //查出指定会员可领取优惠劵
@@ -181,6 +183,8 @@
                 .le(CouponInfo::getSendStartTime, now)
                 .ge(CouponInfo::getSendEndTime, now)
                 .eq(CouponInfo::getPersonType, 3)
+                .eq(CouponInfo::getDelFlag, 0)
+                .eq(CouponInfo::getShelfStatus, 1)
                 .apply("FIND_IN_SET('" + appUserById.getVipId() + "', vip_ids)").list();
         List<CouponInfo> returnList = new ArrayList<>();
         returnList.addAll(list);

--
Gitblit v1.7.1