From ac918503bb5e8fad007348e7e39ba7275b75f334 Mon Sep 17 00:00:00 2001
From: p-honggang.li <p-honggang.li@pcitc.com>
Date: 星期一, 08 九月 2025 23:33:32 +0800
Subject: [PATCH] 修改取消订单,修改状态为已取消

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

diff --git a/src/main/java/com/webmanage/service/OrderInfoService.java b/src/main/java/com/webmanage/service/OrderInfoService.java
index 0c07516..1c9c1aa 100644
--- a/src/main/java/com/webmanage/service/OrderInfoService.java
+++ b/src/main/java/com/webmanage/service/OrderInfoService.java
@@ -43,7 +43,7 @@
     /**
      * 鍒嗛〉鏌ヨ寰呭鎵硅鍗曞垪琛紙鏀寔浜у搧鏉′欢锛�
      */
-    PageResult<OrderInfo> getPendingApprovalOrderPageWithProductConditions(OrderQueryDTO queryDTO);
+    PageResult<OrderDetailVO> getPendingApprovalOrderPageWithProductConditions(OrderQueryDTO queryDTO);
 
     /**
      * 鑾峰彇璁㈠崟璇︽儏
@@ -60,13 +60,13 @@
      */
     Long uploadOrderAttachment(String orderId, String fileName, String originalName, 
                              String fileType, Long fileSize, String fileUrl, 
-                             String bucketName, String objectName, Long uploadUserId, 
+                             String bucketName, String objectName, String uploadUserId,
                              String uploadUserName, String attachmentType, String description);
 
     /**
      * 娣诲姞璁㈠崟璇勪环
      */
-    boolean addOrderEvaluation(String orderId, Long evaluatorId, String evaluatorName, 
+    boolean addOrderEvaluation(String orderId, String evaluatorId, String evaluatorName,
                              String evaluatorType, String content, Integer rating, 
                              Integer serviceRating, Integer qualityRating, Integer deliveryRating, 
                              Boolean isAnonymous);

--
Gitblit v1.8.0