From 8657f3758fa1acef3445f82b82f81fdba5e0c1db Mon Sep 17 00:00:00 2001 From: Administrator <15274802129@163.com> Date: Thu, 25 Sep 2025 11:29:00 +0800 Subject: [PATCH] feat(member): 更新会员公司ID逻辑 - 从API DTO中提取公司ID - 验证并转换公司编码为内部ID - 设置会员关联的公司ID - 优化公司信息查询逻辑 - 修复公司ID更新问题 - 确保会员信息正确绑定公司关系 --- src/main/java/cc/mrbird/febs/mall/service/IAdminMallOrderService.java | 26 ++++++++++++++++++++++++++ 1 files changed, 26 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 3560aed..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,7 +4,9 @@ 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; @@ -13,11 +15,15 @@ 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); @@ -52,4 +58,24 @@ 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