From 529ad9dd8d1876b57e852bc45b602ba3ccc8df2a Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Wed, 10 Apr 2024 17:19:08 +0800
Subject: [PATCH] 公告-首页公告调整

---
 src/main/resources/mapper/modules/MallMemberCouponMapper.xml |   28 +++++++++++++++++++++++-----
 1 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/mapper/modules/MallMemberCouponMapper.xml b/src/main/resources/mapper/modules/MallMemberCouponMapper.xml
index 11e8e60..ecde786 100644
--- a/src/main/resources/mapper/modules/MallMemberCouponMapper.xml
+++ b/src/main/resources/mapper/modules/MallMemberCouponMapper.xml
@@ -5,11 +5,11 @@
     <select id="selectListInPage" resultType="cc.mrbird.febs.mall.vo.MallMemberCouponVo">
         select
         a.*,
-               b.cost_amount costAmount,
-               b.real_amount realAmount
+        b.cost_amount costAmount,
+        b.real_amount realAmount,
+        b.type type
         from mall_member_coupon a
         INNER join mall_goods_coupon b on b.id = a.coupon_id and b.state = 2
-        INNER join coupon_goods c on c.coupon_id = a.coupon_id
         <where>
             a.member_id=#{record.memberId}
             <if test="record.state == 1">
@@ -23,10 +23,28 @@
                 and a.state=#{record.state}
             </if>
             <if test="record.goodsId != null and record.goodsId != ''">
-                and c.goods_id = #{record.goodsId}
+                and a.goods_id=#{record.goodsId}
             </if>
         </where>
-        group by a.id
+        order by a.CREATED_TIME desc
+    </select>
+
+    <select id="selectListCreateInPage" resultType="cc.mrbird.febs.mall.vo.MallMemberCouponVo">
+        select
+        a.*,
+        b.cost_amount costAmount,
+        b.type type,
+        b.real_amount realAmount
+        from mall_member_coupon a
+        INNER join mall_goods_coupon b on b.id = a.coupon_id and b.state = 2
+        where
+            a.member_id=#{record.memberId}
+                and a.state=#{record.state}
+                and a.expire_time &gt;= #{record.expireTime}
+        and a.coupon_id in
+        <foreach collection = "list" item = "item"  separator=","  open = "(" close = ")" >
+            #{item}
+        </foreach >
         order by a.CREATED_TIME desc
     </select>
 

--
Gitblit v1.9.1