From afa61267844723f906a632e4ac8b30f91cf4a3c0 Mon Sep 17 00:00:00 2001
From: 刘帅 <rr.iii@qq.com>
Date: 星期一, 21 九月 2026 11:56:04 +0800
Subject: [PATCH] bug:获取优惠券接口问题

---
 cloud-server-activity/src/main/java/com/dsh/activity/controller/THuiminCardController.java |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/THuiminCardController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/THuiminCardController.java
index e41cc81..6ebd9d1 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/THuiminCardController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/THuiminCardController.java
@@ -52,7 +52,7 @@
             queryWrapper.le("endTime",tHuiminCard.getEndTime());
         }
         Integer huiMinStatus = tHuiminCard.getHuiMinStatus();
-        // 惠民卡状态:1未开始 2已开始 3已结束
+        // 玩湃惠民卡状态:1未开始 2已开始 3已结束
         if (huiMinStatus != null){
             Date now = new Date();
             switch (huiMinStatus) {
@@ -81,6 +81,7 @@
         }
         List<Integer> cardIds = records.stream().map(THuiminCard::getId).collect(Collectors.toList());
         List<TPayHuimin> list = payHuiminService.list(new LambdaQueryWrapper<TPayHuimin>()
+                        .eq(TPayHuimin::getStatus,2)
                 .in(TPayHuimin::getCardId, cardIds));
 
         Map<Integer, Long> cardIdCountMap = list.stream()
@@ -93,7 +94,7 @@
         records.forEach(item -> {
             item.setBuyCount(cardIdCountMap.getOrDefault(item.getId(), 0L).intValue());
 
-            // 惠民卡状态计算逻辑
+            // 玩湃惠民卡状态计算逻辑
             Date startTime = item.getStartTime();
             Date endTime = item.getEndTime();
 
@@ -155,4 +156,14 @@
         tHuiminCardService.updateById(tHuiminCard);
         return "success";
     }
+    @GetMapping("/getCards")
+
+    public List<THuiminCard> getCards(@RequestParam("storeId")String storeId){
+        List<THuiminCard> list = tHuiminCardService.lambdaQuery().apply("FIND_IN_SET(" + storeId + ",storeIds)").list();
+        return list;
+    }
+    @GetMapping("/addPayHuiMing")
+    public void addPayHuiMing(@RequestParam("studentId")Integer studentId, @RequestParam("cardId")Integer cardId){
+        tHuiminCardService.recordGiftHuiminCard(studentId, cardId);
+    }
 }

--
Gitblit v1.7.1