From f0da95925bcb8ad19b0d1cc78afe4b4a4ae188a6 Mon Sep 17 00:00:00 2001
From: p-honggang.li <p-honggang.li@pcitc.com>
Date: 星期四, 28 八月 2025 09:55:51 +0800
Subject: [PATCH] Merge branch 'master' of http://xearth.cn:6600/r/web-manage/web-manage-back
---
src/main/java/com/webmanage/service/OrderInfoService.java | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/webmanage/service/OrderInfoService.java b/src/main/java/com/webmanage/service/OrderInfoService.java
index 63de046..a7a367f 100644
--- a/src/main/java/com/webmanage/service/OrderInfoService.java
+++ b/src/main/java/com/webmanage/service/OrderInfoService.java
@@ -18,12 +18,22 @@
/**
* 鍒嗛〉鏌ヨ涔板璁㈠崟鍒楄〃
*/
- 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);
/**
* 鍒嗛〉鏌ヨ寰呭鎵硅鍗曞垪琛�
@@ -122,4 +132,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