From 5bc0375793f9187e3d90b7ec6846ab4d8eac5f36 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期五, 14 六月 2024 18:59:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IOrderService.java | 29 +++++++++++++++++++++++++----
1 files changed, 25 insertions(+), 4 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..6ce91c4 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
@@ -4,7 +4,7 @@
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.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;
@@ -81,7 +81,7 @@
* @param query 商城订单查询对象
* @return PageDTO<MgtMallOrderVO>
*/
- PageDTO<MgtMallOrderVO> getMallOrderPage(MgtMallOrderQuery query);
+ PageDTO<MgtOrderVO> getOrderPage(MgtMallOrderQuery query);
/**
* 获取商城订单详情
@@ -89,12 +89,12 @@
* @param id 订单id
* @return MgtMallOrderVO
*/
- MgtMallOrderVO getMallOrderDetail(Long id);
+ MgtOrderVO getOrderDetail(Long id);
/**
* 确认发货
*
- * @param dto 确认收货请求对象
+ * @param dto 确认发货请求对象
*/
void confirmShipmentOrder(MgtOrderConfirmShipmentDTO dto);
@@ -104,4 +104,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