From cd55aff7eea06f77a8f712cef1ad2744c44d0f8a Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期四, 20 六月 2024 18:56:16 +0800 Subject: [PATCH] 1.修改bug --- ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IOrderService.java | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 57 insertions(+), 0 deletions(-) diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IOrderService.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IOrderService.java index c1d75ad..3e74b85 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IOrderService.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IOrderService.java @@ -2,12 +2,16 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.common.core.utils.page.PageDTO; +import com.ruoyi.order.controller.management.dto.MgtOrderConfirmShipmentDTO; +import com.ruoyi.order.controller.management.dto.MgtOrderQuery; +import com.ruoyi.order.controller.management.vo.MgtOrderVO; import com.ruoyi.system.api.domain.Order; import com.ruoyi.system.api.domain.dto.HomeGoodsSkuDTO; import com.ruoyi.system.api.domain.dto.MemberOrderDTO; import com.ruoyi.system.api.domain.dto.MemberOrderListDTO; import com.ruoyi.system.api.domain.dto.OrderDTO; import com.ruoyi.system.api.domain.vo.MemberOrderListVO; +import com.ruoyi.system.api.domain.vo.MemberOrderNumVO; import com.ruoyi.system.api.domain.vo.MemberTiOrderVO; import com.ruoyi.system.api.domain.vo.OrderVO; import java.util.Collection; @@ -64,6 +68,8 @@ void AffirmOrderOne(@RequestBody MemberOrderListDTO memberOrderListDTO); + MemberOrderNumVO MemberOrderNum(@RequestBody MemberOrderListDTO memberOrderListDTO); + /** * 根据优惠券id集合查询订单列表 * @@ -71,4 +77,55 @@ * @return List<Order> */ List<Order> getOrderByCouponIds(Collection<Long> couponIds); + + /** + * 商城订单分页列表 + * + * @param query 商城订单查询对象 + * @return PageDTO<MgtMallOrderVO> + */ + PageDTO<MgtOrderVO> getOrderPage(MgtOrderQuery query); + + /** + * 获取商城订单详情 + * + * @param id 订单id + * @return MgtMallOrderVO + */ + MgtOrderVO getOrderDetail(Long id); + + /** + * 确认发货 + * + * @param dto 确认发货请求对象 + */ + void confirmShipmentOrder(MgtOrderConfirmShipmentDTO dto); + + /** + * 已收货 + * + * @param id 订单id + */ + void receivedGoods(Long id); + + /** + * 退款 + * + * @param id 订单id + */ + void refund(Long id); + + /** + * 退款退货 + * + * @param id 订单id + */ + void refundReturn(Long id); + + /** + * 拍卖订单退保证金 + * + * @param id 订单id + */ + void refundBond(Long id); } -- Gitblit v1.7.1