From 5728732f45cc45f3c5cbde0abe7a7c5efee605b9 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 09 十二月 2024 15:31:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderService.java | 16 ++++++++++++++--
1 files changed, 14 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 541715a..6250043 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,11 @@
package com.ruoyi.order.service;
import com.baomidou.mybatisplus.extension.service.IService;
-import model.Order;
+import com.ruoyi.order.model.Order;
+import com.ruoyi.order.vo.OrderDetailVO;
+import com.ruoyi.order.vo.OrderVO;
+
+import java.util.List;
/**
* <p>
@@ -12,5 +16,13 @@
* @since 2024-11-21
*/
public interface OrderService extends IService<Order> {
- boolean check(Integer orderId, Integer shopId);
+ List<OrderVO> selectOrderListByUserId(Integer status,Long userId);
+
+ OrderDetailVO getOrderDetail(Long orderId);
+
+ boolean check(Order order, Integer shopId, Long userId);
+
+ void writeOff(String code,Integer shopId);
+
+ void commission(Long orderId);
}
--
Gitblit v1.7.1