From 49306af1995aec6264410e624bb91db6876f666a Mon Sep 17 00:00:00 2001 From: Administrator <15274802129@163.com> Date: Thu, 25 Sep 2025 10:34:47 +0800 Subject: [PATCH] fix(mall):修复小程序登录时公司ID查询错误 - 将查询条件从 apiXcxLoginDto.getCode() 更正为 apiXcxLoginDto.getCompanyId() - 确保公司信息查询使用正确的参数 - 修复因参数错误导致的公司信息无法正确获取的问题 --- src/main/java/cc/mrbird/febs/mall/service/IAdminMallOrderService.java | 40 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 40 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 df78164..123719d 100644 --- a/src/main/java/cc/mrbird/febs/mall/service/IAdminMallOrderService.java +++ b/src/main/java/cc/mrbird/febs/mall/service/IAdminMallOrderService.java @@ -4,18 +4,26 @@ 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.*; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + public interface IAdminMallOrderService extends IService<MallOrderInfo> { + + IPage<MallOrderInfo> findOrderListInPage(MallOrderInfo mallOrderInfo, QueryRequest request); IPage<AdminMallOrderInfoVo> getOrderListInPage(MallOrderInfoDto mallOrderInfo, QueryRequest request); AdminMallOrderVo getMallOrderInfoById(long id); FebsResponse deliverGoods(DeliverGoodsDto deliverGoodsDto); + + void deliverGoodsByOrderNo(DeliverGoodsDto deliverGoodsDto); AdminOrderDetailVo getMallOrderDetailById(long id); @@ -38,4 +46,36 @@ FebsResponse deleteAddress(Long id); FebsResponse addAddress(AddAddressDto addAddressDto); + + List<AdminAddAddressTreeVo> getRefundAddress(); + + FebsResponse withAddressUpdate(WithAddressUpdateDto withAddressUpdateDto); + + AdminMallOrderRefundVo getMallOrderRefundInfoById(long id); + + IPage<AdminPayMethodVo> getPayMethodListInPage(PayMethodDto payMethodDto, QueryRequest request); + + AdminMallPayMethodEditVo getMallPayMethodEditInfoById(long id); + + FebsResponse payMethodEdit(PayMethodEditDto payMethodEditDto); + + FebsResponse cancelOrder(Long id); + + AdminMallMemberPaymentVo getMallMemberRefundPayInfoByFlowId(long id); + + IPage<AdminMallGoodsCommentVo> getCommentListInPage(AdminMallGoodsCommentDto adminMallGoodsCommentDto, QueryRequest request); + + FebsResponse showStateSwitchOn(Long id); + + FebsResponse showStateSwitchOff(Long id); + + 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); + + FebsResponse confirmOrder(AdminRefundOrderDto dto); } -- Gitblit v1.9.1