From 7307fad287994fce2567bf4a7bdd4b7d3f06ea83 Mon Sep 17 00:00:00 2001
From: p-honggang.li <p-honggang.li@pcitc.com>
Date: 星期三, 03 九月 2025 18:30:53 +0800
Subject: [PATCH] 修改积分交易

---
 src/main/java/com/webmanage/service/OrderInfoService.java |   16 +++++++++++++++-
 1 files changed, 15 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..0c07516 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,13 @@
      * @return 鏄惁鏇存柊鎴愬姛
      */
     boolean updateWorkflowId(String orderId, String workflowId);
+
+    /**
+     * 鏍规嵁浜у搧ID鍒ゆ柇鏄惁瀛樺湪鏈彇娑堜笖宸插畬鎴愮殑鍏宠仈璁㈠崟
+     * @param productId 浜у搧ID
+     * @return 瀛樺湪杩斿洖true锛屼笉瀛樺湪杩斿洖false
+     */
+    boolean existsCompletedNotCancelledOrderByProductId(String productId);
+
+    boolean updateOrderIsEvaluate(String orderId);
 }

--
Gitblit v1.8.0