From e2e8e9de828dc83db2fb254f29e544d6e7ff4d57 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 19 Sep 2023 11:17:17 +0800
Subject: [PATCH] bannner

---
 src/main/resources/mapper/modules/MallMemberCouponMapper.xml |   34 ++++++++++++++++++++++++++++++++--
 1 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/modules/MallMemberCouponMapper.xml b/src/main/resources/mapper/modules/MallMemberCouponMapper.xml
index fcc415c..20e28d8 100644
--- a/src/main/resources/mapper/modules/MallMemberCouponMapper.xml
+++ b/src/main/resources/mapper/modules/MallMemberCouponMapper.xml
@@ -4,15 +4,45 @@
 
     <select id="selectListInPage" resultType="cc.mrbird.febs.mall.vo.MallMemberCouponVo">
         select
-        a.*
+        a.*,
+               b.cost_amount costAmount,
+               b.real_amount realAmount
         from mall_member_coupon a
+        left join mall_goods_coupon b on b.id = a.coupon_id
         <where>
             a.member_id=#{record.memberId}
-            <if test="record.state != null and record.state != ''">
+            <if test="record.state == 1">
                 and a.state=#{record.state}
+                and a.expire_time &gt;= #{record.expireTime}
+            </if>
+            <if test="record.state == 2">
+                and a.state=#{record.state}
+            </if>
+            <if test="record.state == 3">
+                and a.state=#{record.state}
+            </if>
+            <if test="record.goodsId != null and record.goodsId != ''">
+                and a.goods_id=#{record.goodsId}
             </if>
         </where>
         order by a.CREATED_TIME desc
     </select>
 
+    <select id="selectListByExpireTime" resultType="cc.mrbird.febs.mall.entity.MallMemberCoupon">
+        select
+            a.*
+        from mall_member_coupon a
+        where a.expire_time &lt;= #{date}
+        and a.state = 1
+    </select>
+
+    <select id="selectListByMemberIdAndGoodsIdAndCouponId" resultType="cc.mrbird.febs.mall.entity.MallMemberCoupon">
+        select
+            a.*
+        from mall_member_coupon a
+        where a.member_id = #{memberId}
+        and a.goods_id = #{goodsId}
+        and a.coupon_id = #{couponId}
+    </select>
+
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1