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 | 92 ++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 85 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/webmanage/service/OrderInfoService.java b/src/main/java/com/webmanage/service/OrderInfoService.java
index 8e85fc7..a7a367f 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,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);
/**
* 鍒嗛〉鏌ヨ寰呭鎵硅鍗曞垪琛�
@@ -35,15 +48,15 @@
/**
* 鍒涘缓璁㈠崟锛堝寘鍚鍗曞ご涓庢槑缁嗘彃鍏ワ級锛岃繑鍥炶鍗曠紪鍙�
*/
- String createOrder(CreateOrderDTO createOrderDTO);
+ OrderInfo createOrder(CreateOrderDTO createOrderDTO);
/**
* 涓婁紶璁㈠崟闄勪欢
*/
- 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 +67,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 +96,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