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/MallLeaderAchieveMapper.java | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/mall/mapper/MallLeaderAchieveMapper.java b/src/main/java/cc/mrbird/febs/mall/mapper/MallLeaderAchieveMapper.java index 1278530..ba88684 100644 --- a/src/main/java/cc/mrbird/febs/mall/mapper/MallLeaderAchieveMapper.java +++ b/src/main/java/cc/mrbird/febs/mall/mapper/MallLeaderAchieveMapper.java @@ -1,8 +1,10 @@ package cc.mrbird.febs.mall.mapper; +import cc.mrbird.febs.mall.dto.ApiOrderProfitDto; import cc.mrbird.febs.mall.entity.MallLeaderAchieve; import cn.hutool.core.date.DateTime; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Param; import java.math.BigDecimal; @@ -17,4 +19,6 @@ int updateByUniqueCodeStateAndTime(@Param("updateTime")DateTime updateTime,@Param("uniqueCode")String uniqueCode, @Param("state")Integer stateOne, @Param("offsetDay")DateTime dateTime); BigDecimal selectProfitByStateAndDateTimeAndUniqueCode(@Param("state")Integer state, @Param("date") Date DateTime, @Param("uniqueCode")String uniqueCode); + + IPage<MallLeaderAchieve> selectApiLeaderProfitListInPage(IPage<MallLeaderAchieve> page, @Param("record")ApiOrderProfitDto apiOrderProfitDto); } -- Gitblit v1.9.1