From 3f45e8fdfa31d7b764d60a7c0cb5dd11944ed418 Mon Sep 17 00:00:00 2001
From: 刘帅 <rr.iii@qq.com>
Date: 星期一, 21 九月 2026 23:38:59 +0800
Subject: [PATCH] bug:统计数据修正

---
 cloud-server-activity/src/main/java/com/dsh/activity/controller/THuiminCardController.java |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 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 bf65325..42ed931 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
@@ -71,6 +71,7 @@
         if (tHuiminCard.getStatus() != null){
             queryWrapper.eq("status",tHuiminCard.getStatus());
         }
+        queryWrapper.orderByDesc("sort").orderByDesc("id");
         Page<THuiminCard> page = new Page<>();
         page.setCurrent(tHuiminCard.getCurrent());
         page.setSize(tHuiminCard.getSize());
@@ -81,6 +82,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()
@@ -155,4 +157,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