From 0b9f2eeb5e2ff7995f39d217e90a6c64e37366d4 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 17 六月 2024 15:32:44 +0800
Subject: [PATCH] 修改bug

---
 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IOrderService.java |   34 +++++++++++++++++++++++++++++-----
 1 files changed, 29 insertions(+), 5 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 8903573..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,15 +2,16 @@
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.common.core.utils.page.PageDTO;
-import com.ruoyi.order.controller.management.dto.MgtMallOrderQuery;
 import com.ruoyi.order.controller.management.dto.MgtOrderConfirmShipmentDTO;
-import com.ruoyi.order.controller.management.vo.MgtMallOrderVO;
+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;
@@ -67,6 +68,8 @@
 
     void AffirmOrderOne(@RequestBody MemberOrderListDTO memberOrderListDTO);
 
+    MemberOrderNumVO MemberOrderNum(@RequestBody MemberOrderListDTO memberOrderListDTO);
+
     /**
      * 根据优惠券id集合查询订单列表
      *
@@ -81,7 +84,7 @@
      * @param query 商城订单查询对象
      * @return PageDTO<MgtMallOrderVO>
      */
-    PageDTO<MgtMallOrderVO> getMallOrderPage(MgtMallOrderQuery query);
+    PageDTO<MgtOrderVO> getOrderPage(MgtOrderQuery query);
 
     /**
      * 获取商城订单详情
@@ -89,12 +92,12 @@
      * @param id 订单id
      * @return MgtMallOrderVO
      */
-    MgtMallOrderVO getMallOrderDetail(Long id);
+    MgtOrderVO getOrderDetail(Long id);
 
     /**
      * 确认发货
      *
-     * @param dto 确认收货请求对象
+     * @param dto 确认发货请求对象
      */
     void confirmShipmentOrder(MgtOrderConfirmShipmentDTO dto);
 
@@ -104,4 +107,25 @@
      * @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