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/java/cc/mrbird/febs/mall/mapper/MallMemberCouponMapper.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/mapper/MallMemberCouponMapper.java b/src/main/java/cc/mrbird/febs/mall/mapper/MallMemberCouponMapper.java
index 1315256..d456976 100644
--- a/src/main/java/cc/mrbird/febs/mall/mapper/MallMemberCouponMapper.java
+++ b/src/main/java/cc/mrbird/febs/mall/mapper/MallMemberCouponMapper.java
@@ -13,6 +13,7 @@
 public interface MallMemberCouponMapper extends BaseMapper<MallMemberCoupon> {
 
     IPage<MallMemberCouponVo> selectListInPage(IPage<MallMemberCouponVo> page,  @Param("record") MallMemberCouponDto mallMemberCouponDto);
+    List<MallMemberCouponVo> selectListCreateInPage(@Param("record") MallMemberCouponDto mallMemberCouponDto, @Param("list")List<Long> couponIds);
 
     List<MallMemberCoupon> selectListByExpireTime(@Param("date")DateTime date);
 
@@ -22,5 +23,7 @@
                                                                      @Param("inviteId")String inviteId);
 
     List<MallMemberCoupon> selectListByMemberIdAndGoodsIdAndCouponIdWithOutInviteId(@Param("memberId")Long memberId,
-                                                                     @Param("goodsId")Long goodsId;
+                                                                     @Param("goodsId")Long goodsId);
+
+    List<MallMemberCoupon> selectListByMemberIdCouponIdWithOutInviteId(@Param("memberId")Long memberId, @Param("couponId")Long couponId);
 }

--
Gitblit v1.9.1