From c67297af61ab9d897adae96f7e199c72c16d764b Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 02 十二月 2024 18:05:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderService.java |    6 ++++--
 1 files changed, 4 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..60fda94 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,11 @@
  * @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(Order order, Integer shopId, Long userId);
+
+    void writeOff(String code,Integer shopId);
 }

--
Gitblit v1.7.1