From 36ce1f3549df46609b4e3bc0bf0810bd0c85277e Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 28 十一月 2024 17:15:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderService.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderService.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderService.java
index 0961a26..cd40477 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderService.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderService.java
@@ -16,9 +16,9 @@
  * @since 2024-11-21
  */
 public interface OrderService extends IService<Order> {
-    List<OrderVO> getOrderList(Integer status);
+    List<OrderVO> selectOrderListByUserId(Integer status,Long userId);
 
     OrderDetailVO getOrderDetail(Long orderId);
 
-    boolean check(Long orderId, Long shopId);
+    boolean check(String orderNumber, Long shopId);
 }

--
Gitblit v1.7.1