From 464254ba0e542c22fac68c7512f06a9a8df34b28 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 13 六月 2024 21:09:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IOrderService.java | 63 +++++++++++++++++++++++++++++++
1 files changed, 63 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 d4c3098..8903573 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
@@ -1,9 +1,21 @@
package com.ruoyi.order.service;
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.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.MemberTiOrderVO;
+import com.ruoyi.system.api.domain.vo.OrderVO;
+import java.util.Collection;
import java.util.List;
+import org.springframework.web.bind.annotation.RequestBody;
/**
* <p>
@@ -41,4 +53,55 @@
*/
List<Order> getOrderByGroupPurchaseId(Long id);
+ Order getOrderByGroupPurchaseMemberId(HomeGoodsSkuDTO homeGoodsSkuDTO);
+ List<OrderVO> getOrderByGroupPurchaseMemberList(HomeGoodsSkuDTO homeGoodsSkuDTO);
+
+ MemberTiOrderVO saveMemberOrder(@RequestBody MemberOrderDTO memberOrderDTO);
+
+ MemberTiOrderVO updMemberOrder(@RequestBody MemberOrderDTO memberOrderDTO);
+
+ PageDTO<MemberOrderListVO> MemberrderList(@RequestBody MemberOrderListDTO memberOrderListDTO);
+
+ OrderVO MemberOrderOne(@RequestBody MemberOrderListDTO memberOrderListDTO);
+ void CancelOrderOne(@RequestBody MemberOrderListDTO memberOrderListDTO);
+
+ void AffirmOrderOne(@RequestBody MemberOrderListDTO memberOrderListDTO);
+
+ /**
+ * 根据优惠券id集合查询订单列表
+ *
+ * @param couponIds 优惠券id集合
+ * @return List<Order>
+ */
+ List<Order> getOrderByCouponIds(Collection<Long> couponIds);
+
+ /**
+ * 商城订单分页列表
+ *
+ * @param query 商城订单查询对象
+ * @return PageDTO<MgtMallOrderVO>
+ */
+ PageDTO<MgtMallOrderVO> getMallOrderPage(MgtMallOrderQuery query);
+
+ /**
+ * 获取商城订单详情
+ *
+ * @param id 订单id
+ * @return MgtMallOrderVO
+ */
+ MgtMallOrderVO getMallOrderDetail(Long id);
+
+ /**
+ * 确认发货
+ *
+ * @param dto 确认收货请求对象
+ */
+ void confirmShipmentOrder(MgtOrderConfirmShipmentDTO dto);
+
+ /**
+ * 已收货
+ *
+ * @param id 订单id
+ */
+ void receivedGoods(Long id);
}
--
Gitblit v1.7.1