From 51f26723bee741bf112c8d0d965d0e2f2974bd04 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 31 三月 2025 10:02:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-activity/src/main/resources/mapper/HuiminCardMapper.xml | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/cloud-server-activity/src/main/resources/mapper/HuiminCardMapper.xml b/cloud-server-activity/src/main/resources/mapper/HuiminCardMapper.xml
index 7f5681f..d85a4d5 100644
--- a/cloud-server-activity/src/main/resources/mapper/HuiminCardMapper.xml
+++ b/cloud-server-activity/src/main/resources/mapper/HuiminCardMapper.xml
@@ -6,8 +6,18 @@
<select id="getHuiminAgreementAndList" resultType="com.dsh.activity.entity.THuiminCard">
select t1.* from t_huimin_card t1
where t1.storeId = #{storeId}
+ and t1.startTime <= now()
+ and t1.endTime >= now()
+ and t1.status = 1
order by t1.sort desc
limit #{pageNo}, #{pageSize}
</select>
+ <select id="getMyHuiminCardList" resultType="com.dsh.activity.model.response.MyHuiminCardVO">
+ select t1.* from t_pay_huimin t1
+ where t1.status = 2
+ and t1.appUserId = #{appUserId}
+ limit #{pageNo}, #{pageSize}
+
+ </select>
</mapper>
--
Gitblit v1.7.1