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/MallRefundMapper.xml | 12 ++----------
1 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallRefundMapper.xml b/src/main/resources/mapper/modules/MallRefundMapper.xml
index a3d9624..5bb7a9b 100644
--- a/src/main/resources/mapper/modules/MallRefundMapper.xml
+++ b/src/main/resources/mapper/modules/MallRefundMapper.xml
@@ -28,17 +28,15 @@
b.order_time orderTime,
b.order_no orderNo,
b.status,
+ c.id itemId,
c.goods_name goodsName,
c.cnt,
d.name refundMemberName,
- d.phone refundMemberPhone,
- e.name leaderName,
- e.phone leaderPhone
+ d.phone refundMemberPhone
from mall_refund a
inner join mall_order_info b on a.order_id = b.id
inner join mall_order_item c on a.item_id = c.id
inner join mall_member d on a.member_id = d.id
- inner join mall_team_leader e on b.take_unique_code = e.unique_code
<where>
<if test="record != null" >
<if test="record.state!=null and record.state!=''">
@@ -49,12 +47,6 @@
</if>
<if test="record.refundMemberPhone!=null and record.refundMemberPhone!=''">
and d.phone like concat('%',#{record.refundMemberPhone},'%')
- </if>
- <if test="record.leaderName!=null and record.leaderName!=''">
- and e.name like concat('%',#{record.leaderName},'%')
- </if>
- <if test="record.leaderPhone!=null and record.leaderPhone!=''">
- and e.phone like concat('%',#{record.leaderPhone},'%')
</if>
</if>
</where>
--
Gitblit v1.9.1