From 40616c5802932c2216e97a44ec9abed182590bbe Mon Sep 17 00:00:00 2001
From: seatonwan9
Date: 星期四, 28 八月 2025 15:46:40 +0800
Subject: [PATCH] 更新代码

---
 src/main/java/com/webmanage/service/OrderInfoService.java |   29 ++++++++++++++++++++++++++---
 1 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/webmanage/service/OrderInfoService.java b/src/main/java/com/webmanage/service/OrderInfoService.java
index 63de046..07ff911 100644
--- a/src/main/java/com/webmanage/service/OrderInfoService.java
+++ b/src/main/java/com/webmanage/service/OrderInfoService.java
@@ -18,17 +18,32 @@
     /**
      * 鍒嗛〉鏌ヨ涔板璁㈠崟鍒楄〃
      */
-    PageResult<OrderInfo> getBuyerOrderPage(OrderQueryDTO queryDTO);
+    PageResult<OrderDetailVO> getBuyerOrderPage(OrderQueryDTO queryDTO);
 
     /**
      * 鍒嗛〉鏌ヨ鍗栧璁㈠崟鍒楄〃
      */
-    PageResult<OrderInfo> getSellerOrderPage(OrderQueryDTO queryDTO);
+    PageResult<OrderDetailVO> getSellerOrderPage(OrderQueryDTO queryDTO);
+
+    /**
+     * 鍒嗛〉鏌ヨ涔板璁㈠崟鍒楄〃锛堟敮鎸佷骇鍝佹潯浠讹級
+     */
+    PageResult<OrderDetailVO> getBuyerOrderPageWithProductConditions(OrderQueryDTO queryDTO);
+
+    /**
+     * 鍒嗛〉鏌ヨ鍗栧璁㈠崟鍒楄〃锛堟敮鎸佷骇鍝佹潯浠讹級
+     */
+    PageResult<OrderDetailVO> getSellerOrderPageWithProductConditions(OrderQueryDTO queryDTO);
 
     /**
      * 鍒嗛〉鏌ヨ寰呭鎵硅鍗曞垪琛�
      */
-    PageResult<OrderInfo> getPendingApprovalOrderPage(OrderQueryDTO queryDTO);
+    PageResult<OrderDetailVO> getPendingApprovalOrderPage(OrderQueryDTO queryDTO);
+
+    /**
+     * 鍒嗛〉鏌ヨ寰呭鎵硅鍗曞垪琛紙鏀寔浜у搧鏉′欢锛�
+     */
+    PageResult<OrderInfo> getPendingApprovalOrderPageWithProductConditions(OrderQueryDTO queryDTO);
 
     /**
      * 鑾峰彇璁㈠崟璇︽儏
@@ -122,4 +137,12 @@
      * @return 鏄惁鍙栨秷鎴愬姛
      */
     boolean cancelOrder(String orderId);
+
+    /**
+     * 鏍规嵁璁㈠崟ID鏇存柊宸ヤ綔娴両D
+     * @param orderId 璁㈠崟ID
+     * @param workflowId 宸ヤ綔娴佸疄渚婭D
+     * @return 鏄惁鏇存柊鎴愬姛
+     */
+    boolean updateWorkflowId(String orderId, String workflowId);
 }

--
Gitblit v1.8.0