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 |   97 +++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 90 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/webmanage/service/OrderInfoService.java b/src/main/java/com/webmanage/service/OrderInfoService.java
index d50282a..07ff911 100644
--- a/src/main/java/com/webmanage/service/OrderInfoService.java
+++ b/src/main/java/com/webmanage/service/OrderInfoService.java
@@ -3,9 +3,12 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.webmanage.common.PageResult;
 import com.webmanage.dto.CreateOrderDTO;
+import com.webmanage.dto.FileCheckDTO;
 import com.webmanage.dto.OrderQueryDTO;
+import com.webmanage.dto.UpdateOrderDetailDTO;
 import com.webmanage.entity.OrderInfo;
 import com.webmanage.vo.OrderDetailVO;
+import com.webmanage.dto.OrderApprovalDTO;
 
 /**
  * 璁㈠崟淇℃伅Service鎺ュ彛
@@ -15,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);
 
     /**
      * 鑾峰彇璁㈠崟璇︽儏
@@ -40,10 +58,10 @@
     /**
      * 涓婁紶璁㈠崟闄勪欢
      */
-    boolean uploadOrderAttachment(String orderId, String fileName, String originalName, 
-                                String fileType, Long fileSize, String fileUrl, 
-                                String bucketName, String objectName, Long uploadUserId, 
-                                String uploadUserName, String attachmentType, String description);
+    Long uploadOrderAttachment(String orderId, String fileName, String originalName, 
+                             String fileType, Long fileSize, String fileUrl, 
+                             String bucketName, String objectName, Long uploadUserId, 
+                             String uploadUserName, String attachmentType, String description);
 
     /**
      * 娣诲姞璁㈠崟璇勪环
@@ -54,6 +72,27 @@
                              Boolean isAnonymous);
 
     /**
+     * 鏇存柊璁㈠崟鐘舵�佸埌涓嬩竴涓姸鎬�
+     * @param orderId 璁㈠崟ID
+     * @return 鏄惁鏇存柊鎴愬姛
+     */
+    boolean updateOrderStatusToNext(String orderId);
+
+    /**
+     * 鍒犻櫎璁㈠崟闄勪欢
+     * @param attachmentId 闄勪欢ID
+     * @return 鏄惁鍒犻櫎鎴愬姛
+     */
+    boolean deleteOrderAttachment(Long attachmentId);
+
+    /**
+     * 鏇存柊璁㈠崟鐘舵�佸埌涓婁竴涓姸鎬�
+     * @param orderId 璁㈠崟ID
+     * @return 鏄惁鏇存柊鎴愬姛
+     */
+    boolean updateOrderStatusToPrevious(String orderId);
+
+    /**
      * 浜ゆ槗纭
      */
     boolean confirmTransaction(String orderId, Long userId);
@@ -62,4 +101,48 @@
      * 鍥炲璇勪环
      */
     boolean replyEvaluation(Long evaluationId, String replyContent, Long replyUserId);
+
+    /**
+     * 鏇存柊璁㈠崟璇︽儏锛堝寘鍚鍗曠姸鎬佸拰璇︽儏澶囨敞锛�
+     */
+    boolean updateOrderDetail(UpdateOrderDetailDTO updateOrderDetailDTO);
+
+    /**
+     * 鏂囦欢鏍告煡
+     */
+    boolean checkFiles(FileCheckDTO fileCheckDTO);
+
+    /**
+     * 瀹℃壒閫氳繃
+     */
+    boolean approveOrder(OrderApprovalDTO orderApprovalDTO);
+
+    /**
+     * 妫�鏌ヨ鍗曟槸鍚﹀寘鍚崗璁被鍨嬬殑瀛愯鍗�
+     * @param orderId 璁㈠崟ID
+     * @return 鏄惁鍖呭惈鍗忚绫诲瀷瀛愯鍗�
+     */
+    boolean hasAgreementPriceType(String orderId);
+
+    /**
+     * 鍙洿鏂拌鍗曡鎯呯殑澶囨敞淇℃伅锛堜笉鏇存柊璁㈠崟鐘舵�侊級
+     * @param updateOrderDetailDTO 鏇存柊璁㈠崟璇︽儏DTO
+     * @return 鏄惁鏇存柊鎴愬姛
+     */
+    boolean updateOrderDetailRemarksOnly(UpdateOrderDetailDTO.UpdateOrderDetailRemarksOnlyDTO updateOrderDetailDTO);
+
+    /**
+     * 鍙栨秷璁㈠崟
+     * @param orderId 璁㈠崟ID
+     * @return 鏄惁鍙栨秷鎴愬姛
+     */
+    boolean cancelOrder(String orderId);
+
+    /**
+     * 鏍规嵁璁㈠崟ID鏇存柊宸ヤ綔娴両D
+     * @param orderId 璁㈠崟ID
+     * @param workflowId 宸ヤ綔娴佸疄渚婭D
+     * @return 鏄惁鏇存柊鎴愬姛
+     */
+    boolean updateWorkflowId(String orderId, String workflowId);
 }

--
Gitblit v1.8.0