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/service/IAdminMallOrderService.java | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/mall/service/IAdminMallOrderService.java b/src/main/java/cc/mrbird/febs/mall/service/IAdminMallOrderService.java index 1be6703..bae0b6e 100644 --- a/src/main/java/cc/mrbird/febs/mall/service/IAdminMallOrderService.java +++ b/src/main/java/cc/mrbird/febs/mall/service/IAdminMallOrderService.java @@ -4,6 +4,7 @@ import cc.mrbird.febs.common.entity.QueryRequest; import cc.mrbird.febs.mall.dto.*; import cc.mrbird.febs.mall.entity.MallOrderInfo; +import cc.mrbird.febs.mall.entity.MallOrderItem; import cc.mrbird.febs.mall.entity.MallOrderRefund; import cc.mrbird.febs.mall.entity.MallRefundEntity; import cc.mrbird.febs.mall.vo.*; @@ -71,4 +72,8 @@ void updateOrderStateAndDeliveryState(Long id, int value, int value1); IPage<MallRefundEntity> getOrderRefundListInPage(MallRefundEntity mallRefundEntity, QueryRequest request); + + IPage<AdminGoodsStatisticsVo> goodsStatistics(MallOrderItem mallOrderItem, QueryRequest request); + + FebsResponse deliverGoodsUpdate(DeliverGoodsDto deliverGoodsDto); } -- Gitblit v1.9.1