From a981c07d34edd0975b9d556d97c1f851ce79974c Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 04 十二月 2024 13:40:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderService.java |   10 +++++++---
 1 files changed, 7 insertions(+), 3 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..709bfce 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
@@ -1,7 +1,7 @@
 package com.ruoyi.order.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.order.vo.OrderDetailVO;
+import vo.OrderDetailVO;
 import com.ruoyi.order.vo.OrderVO;
 import model.Order;
 
@@ -16,9 +16,13 @@
  * @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);
+
+    void commission(Long orderId);
 }

--
Gitblit v1.7.1