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/IApiMallOrderInfoService.java | 39 ++++++++++++++++++++++++++++++++++++++- 1 files changed, 38 insertions(+), 1 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/mall/service/IApiMallOrderInfoService.java b/src/main/java/cc/mrbird/febs/mall/service/IApiMallOrderInfoService.java index 4424b48..1036672 100644 --- a/src/main/java/cc/mrbird/febs/mall/service/IApiMallOrderInfoService.java +++ b/src/main/java/cc/mrbird/febs/mall/service/IApiMallOrderInfoService.java @@ -1,12 +1,49 @@ package cc.mrbird.febs.mall.service; -import cc.mrbird.febs.mall.dto.AddOrderDto; +import cc.mrbird.febs.common.entity.FebsResponse; +import cc.mrbird.febs.mall.dto.*; import cc.mrbird.febs.mall.entity.MallOrderInfo; +import cc.mrbird.febs.mall.vo.OrderDetailVo; +import cc.mrbird.febs.mall.vo.OrderListVo; import com.baomidou.mybatisplus.extension.service.IService; + +import java.math.BigDecimal; +import java.util.List; +import java.util.Map; public interface IApiMallOrderInfoService extends IService<MallOrderInfo> { Long createOrder(AddOrderDto addOrderDto); void cancelOrder(Long id); + + Map<String, Object> payOrder(PayOrderDto payOrderDto); + + List<OrderListVo> findOrderList(OrderListDto orderListDto); + + OrderDetailVo findOrderDetailsById(Long id); + + Map<Long, BigDecimal> getCouponAmountMap(Long memberCouponId, List<AddOrderItemDto> items); + + void confirmOrder(Long id); + + void delOrder(Long id); + + void applyRefund(AddRefundDto addRefundDto); + + void refundExpress(RefundExpressDto refundExpressDto); + + void autoCancelOrder(Long id); + + void goodsComment(ApiAddCommentDtos addCommentDtos); + + FebsResponse refundOrder(Long id); + + FebsResponse applyRefundOrder(ApplyRefundOrderDto applyRefundOrderDto); + + FebsResponse cancelRefundOrder(Long id); + + FebsResponse createOrderVerify(ApiCreateOrderVerifyDto apiCreateOrderVerifyDto); + + FebsResponse chooseCoupon(ApiChooseCouponDto chooseCouponDto); } -- Gitblit v1.9.1