From ed4f07531b9cb0794e976a14cee3b591dec8d4f6 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期六, 20 七月 2024 21:22:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/IOrderService.java | 8 ++++++++
1 files changed, 8 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 60939f4..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
@@ -56,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);
@@ -66,6 +68,8 @@
OrderVO MemberOrderOne(@RequestBody MemberOrderListDTO memberOrderListDTO);
void CancelOrderOne(@RequestBody MemberOrderListDTO memberOrderListDTO);
+
+ void delOrderOne(@RequestBody MemberOrderListDTO memberOrderListDTO);
void AffirmOrderOne(@RequestBody MemberOrderListDTO memberOrderListDTO);
@@ -138,4 +142,8 @@
* @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