From e5d17ab1bc9e0779b325c53bf23d61ae4a15432e Mon Sep 17 00:00:00 2001
From: seatonwan9
Date: 星期四, 28 八月 2025 16:17:52 +0800
Subject: [PATCH] 更新代码
---
src/main/java/com/webmanage/service/OrderInfoService.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/webmanage/service/OrderInfoService.java b/src/main/java/com/webmanage/service/OrderInfoService.java
index a7a367f..ea54fd5 100644
--- a/src/main/java/com/webmanage/service/OrderInfoService.java
+++ b/src/main/java/com/webmanage/service/OrderInfoService.java
@@ -38,7 +38,12 @@
/**
* 鍒嗛〉鏌ヨ寰呭鎵硅鍗曞垪琛�
*/
- PageResult<OrderInfo> getPendingApprovalOrderPage(OrderQueryDTO queryDTO);
+ PageResult<OrderDetailVO> getPendingApprovalOrderPage(OrderQueryDTO queryDTO);
+
+ /**
+ * 鍒嗛〉鏌ヨ寰呭鎵硅鍗曞垪琛紙鏀寔浜у搧鏉′欢锛�
+ */
+ PageResult<OrderInfo> getPendingApprovalOrderPageWithProductConditions(OrderQueryDTO queryDTO);
/**
* 鑾峰彇璁㈠崟璇︽儏
@@ -140,4 +145,11 @@
* @return 鏄惁鏇存柊鎴愬姛
*/
boolean updateWorkflowId(String orderId, String workflowId);
+
+ /**
+ * 鏍规嵁浜у搧ID鍒ゆ柇鏄惁瀛樺湪鏈彇娑堜笖宸插畬鎴愮殑鍏宠仈璁㈠崟
+ * @param productId 浜у搧ID
+ * @return 瀛樺湪杩斿洖true锛屼笉瀛樺湪杩斿洖false
+ */
+ boolean existsCompletedNotCancelledOrderByProductId(String productId);
}
--
Gitblit v1.8.0