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/MallMemberFootprintMapper.xml |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/mapper/modules/MallMemberFootprintMapper.xml b/src/main/resources/mapper/modules/MallMemberFootprintMapper.xml
index 9d83225..08e9e59 100644
--- a/src/main/resources/mapper/modules/MallMemberFootprintMapper.xml
+++ b/src/main/resources/mapper/modules/MallMemberFootprintMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="cc.mrbird.febs.mall.mapper.MallMemberFootprintMapper">
 
-    <select id="selectMemberCollectionListInPage" resultType="cc.mrbird.febs.mall.entity.MallMemberFootprint">
+    <select id="selectMemberFootprintListInPage" resultType="cc.mrbird.febs.mall.entity.MallMemberFootprint">
         select
             footprint.*
              ,goods.goods_name goodsName
@@ -10,11 +10,11 @@
              ,goods.present_price
              ,goods.is_sale
         from mall_member_footprint footprint
-            inner join mall_goods goods on footprint.goods_id=goods.ID
+            inner join mall_goods goods on footprint.goods_id=goods.ID and goods.is_sale = 1
         <where>
             <if test="record != null">
                 <if test="record.memberId != null">
-                    and collection.member_id = #{record.memberId}
+                    and footprint.member_id = #{record.memberId}
                 </if>
             </if>
         </where>

--
Gitblit v1.9.1