From f8f263f9149586e9694559a79a8a6f74128b144a Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期五, 21 六月 2024 11:12:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IOrderService.java | 68 +++++++++++++++++++++++++++++++++-
1 files changed, 66 insertions(+), 2 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 f41cdb2..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,17 +2,21 @@
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 org.springframework.web.bind.annotation.RequestBody;
-
+import java.util.Collection;
import java.util.List;
+import org.springframework.web.bind.annotation.RequestBody;
/**
* <p>
@@ -64,4 +68,64 @@
void AffirmOrderOne(@RequestBody MemberOrderListDTO memberOrderListDTO);
+ MemberOrderNumVO MemberOrderNum(@RequestBody MemberOrderListDTO memberOrderListDTO);
+
+ /**
+ * 根据优惠券id集合查询订单列表
+ *
+ * @param couponIds 优惠券id集合
+ * @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