From efe9744eb6651298be9f48b84a5f17c58d7b64eb Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期五, 19 七月 2024 14:10:26 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IOrderService.java | 52 +++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 47 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..00af113 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,19 @@
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.time.LocalDateTime;
import java.util.Collection;
import java.util.List;
import org.springframework.web.bind.annotation.RequestBody;
@@ -54,6 +56,8 @@
List<Order> getOrderByGroupPurchaseId(Long id);
Order getOrderByGroupPurchaseMemberId(HomeGoodsSkuDTO homeGoodsSkuDTO);
+
+ Order getOrderByGroupPurchaseMemberId1(HomeGoodsSkuDTO homeGoodsSkuDTO);
List<OrderVO> getOrderByGroupPurchaseMemberList(HomeGoodsSkuDTO homeGoodsSkuDTO);
MemberTiOrderVO saveMemberOrder(@RequestBody MemberOrderDTO memberOrderDTO);
@@ -65,7 +69,11 @@
OrderVO MemberOrderOne(@RequestBody MemberOrderListDTO memberOrderListDTO);
void CancelOrderOne(@RequestBody MemberOrderListDTO memberOrderListDTO);
+ void delOrderOne(@RequestBody MemberOrderListDTO memberOrderListDTO);
+
void AffirmOrderOne(@RequestBody MemberOrderListDTO memberOrderListDTO);
+
+ MemberOrderNumVO MemberOrderNum(@RequestBody MemberOrderListDTO memberOrderListDTO);
/**
* 根据优惠券id集合查询订单列表
@@ -81,7 +89,7 @@
* @param query 商城订单查询对象
* @return PageDTO<MgtMallOrderVO>
*/
- PageDTO<MgtMallOrderVO> getMallOrderPage(MgtMallOrderQuery query);
+ PageDTO<MgtOrderVO> getOrderPage(MgtOrderQuery query);
/**
* 获取商城订单详情
@@ -89,12 +97,12 @@
* @param id 订单id
* @return MgtMallOrderVO
*/
- MgtMallOrderVO getMallOrderDetail(Long id);
+ MgtOrderVO getOrderDetail(Long id);
/**
* 确认发货
*
- * @param dto 确认收货请求对象
+ * @param dto 确认发货请求对象
*/
void confirmShipmentOrder(MgtOrderConfirmShipmentDTO dto);
@@ -104,4 +112,38 @@
* @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);
+
+ /**
+ * 查询统计订单列表
+ *
+ * @param startTime 开始时间
+ * @param endTime 结束时间
+ * @return List<Order>
+ */
+ List<Order> getStaticsOrderList(LocalDateTime startTime, LocalDateTime endTime);
+
+ List<Order> getOrderListByMubres(List<String> mubres);
+
+ void updateOrderStatusByMubres(List<String> formedGroupMubres);
}
--
Gitblit v1.7.1