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/MallInvoiceMapper.java | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/mall/mapper/MallInvoiceMapper.java b/src/main/java/cc/mrbird/febs/mall/mapper/MallInvoiceMapper.java index cbcf691..74c7d8a 100644 --- a/src/main/java/cc/mrbird/febs/mall/mapper/MallInvoiceMapper.java +++ b/src/main/java/cc/mrbird/febs/mall/mapper/MallInvoiceMapper.java @@ -3,6 +3,8 @@ import cc.mrbird.febs.mall.dto.AdminMallInvoiceDto; import cc.mrbird.febs.mall.dto.ApiMallInvoiceDto; import cc.mrbird.febs.mall.entity.MallInvoice; +import cc.mrbird.febs.mall.entity.MallOrderItem; +import cc.mrbird.febs.mall.vo.AdminInvoiceDetailVo; import cc.mrbird.febs.mall.vo.ApiMallInvoiceVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -18,4 +20,7 @@ List<MallInvoice> selectByFapiaoApplyIdAndMemberId(@Param("fapiaoApplyId")String fapiaoApplyId, @Param("memberId")Long memberId); IPage<MallInvoice> getInvoiceListInPage(Page<MallInvoice> page, @Param("record")AdminMallInvoiceDto mallInvoiceDto); + + AdminInvoiceDetailVo getAdminInvoiceDetailVoById(@Param("id")long id); + List<MallOrderItem> getInvoiceItemList(@Param("record")MallInvoice mallInvoice); } -- Gitblit v1.9.1