From 545d3a5024f54976a6685a30c7c1a4107fd5d563 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Thu, 19 Dec 2024 17:50:05 +0800
Subject: [PATCH] fix(mall): 修复会员兑换碳币权限及数据展示问题- 修改会员兑换碳币权限判断逻辑，使用 withdrawState 替代 changeState - 调整 ApiRunDataVo 中 score 和 realScore 字段含义，确保数据展示正确 - 更新 buyVipList.html 中状态颜色，以更直观地显示不同状态

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

diff --git a/src/main/resources/mapper/modules/MallMemberCouponMapper.xml b/src/main/resources/mapper/modules/MallMemberCouponMapper.xml
index 480eb73..ecde786 100644
--- a/src/main/resources/mapper/modules/MallMemberCouponMapper.xml
+++ b/src/main/resources/mapper/modules/MallMemberCouponMapper.xml
@@ -5,10 +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
-        left join mall_goods_coupon b on b.id = a.coupon_id and b.state = 2
+        INNER join mall_goods_coupon b on b.id = a.coupon_id and b.state = 2
         <where>
             a.member_id=#{record.memberId}
             <if test="record.state == 1">
@@ -25,6 +26,25 @@
                 and a.goods_id=#{record.goodsId}
             </if>
         </where>
+        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>
 
@@ -53,6 +73,14 @@
         from mall_member_coupon a
         where a.member_id = #{memberId}
         and a.goods_id = #{goodsId}
+        and a.state = 1
+    </select>
+
+    <select id="selectListByMemberIdCouponIdWithOutInviteId" resultType="cc.mrbird.febs.mall.entity.MallMemberCoupon">
+        select
+            a.*
+        from mall_member_coupon a
+        where a.member_id = #{memberId}
         and a.coupon_id = #{couponId}
         and a.state = 1
     </select>

--
Gitblit v1.9.1