From 79c4524bc2cac69ef74cbf4adc6a092e3bfa4f4b Mon Sep 17 00:00:00 2001
From: seatonwan9
Date: 星期四, 28 八月 2025 02:07:17 +0800
Subject: [PATCH] 更新代码
---
src/main/java/com/webmanage/controller/OrderController.java | 35 +++++++++++++++++++++++++++++++++++
1 files changed, 35 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/webmanage/controller/OrderController.java b/src/main/java/com/webmanage/controller/OrderController.java
index f66ad4d..baeb5f9 100644
--- a/src/main/java/com/webmanage/controller/OrderController.java
+++ b/src/main/java/com/webmanage/controller/OrderController.java
@@ -43,6 +43,13 @@
catch (Exception e) { log.error("鏌ヨ涔板璁㈠崟鍒楄〃澶辫触", e); return Result.error("鏌ヨ涔板璁㈠崟鍒楄〃澶辫触锛�" + e.getMessage()); }
}
+ @PostMapping("/buyer/page/with-product-conditions")
+ @ApiOperation("鍒嗛〉鏌ヨ涔板璁㈠崟鍒楄〃锛堟敮鎸佷骇鍝佹潯浠讹級")
+ public Result<Object> getBuyerOrderPageWithProductConditions(@Valid @RequestBody OrderQueryDTO queryDTO) {
+ try { return Result.success(orderInfoService.getBuyerOrderPageWithProductConditions(queryDTO)); }
+ catch (Exception e) { log.error("鏌ヨ涔板璁㈠崟鍒楄〃澶辫触", e); return Result.error("鏌ヨ涔板璁㈠崟鍒楄〃澶辫触锛�" + e.getMessage()); }
+ }
+
@PostMapping("/create")
@ApiOperation("鍒涘缓璁㈠崟锛堝寘鍚鍗曡鎯咃級锛岄渶鍦� Header 鎼哄甫 Idempotency-Token 闃查噸澶嶆彁浜�")
public Result<OrderInfo> createOrder(@RequestHeader(value = "Idempotency-Token", required = false) String token,
@@ -119,6 +126,20 @@
return Result.error("鎻愪緵鑰匢D涓嶈兘涓虹┖");
}
return Result.success(orderInfoService.getSellerOrderPage(queryDTO));
+ } catch (Exception e) {
+ log.error("鏌ヨ鍗栧璁㈠崟鍒楄〃澶辫触", e);
+ return Result.error("鏌ヨ鍗栧璁㈠崟鍒楄〃澶辫触锛�" + e.getMessage());
+ }
+ }
+
+ @PostMapping("/seller/page/with-product-conditions")
+ @ApiOperation("鍒嗛〉鏌ヨ鍗栧璁㈠崟鍒楄〃锛堟敮鎸佷骇鍝佹潯浠讹級")
+ public Result<Object> getSellerOrderPageWithProductConditions(@Valid @RequestBody OrderQueryDTO queryDTO) {
+ try {
+ if (queryDTO.getProviderId() == null) {
+ return Result.error("鎻愪緵鑰匢D涓嶈兘涓虹┖");
+ }
+ return Result.success(orderInfoService.getSellerOrderPageWithProductConditions(queryDTO));
} catch (Exception e) {
log.error("鏌ヨ鍗栧璁㈠崟鍒楄〃澶辫触", e);
return Result.error("鏌ヨ鍗栧璁㈠崟鍒楄〃澶辫触锛�" + e.getMessage());
@@ -290,6 +311,20 @@
}
}
+ @PostMapping("/workflow/update")
+ @ApiOperation("鏍规嵁璁㈠崟ID鏇存柊宸ヤ綔娴両D锛坵orkflow_id锛�")
+ public Result<Boolean> updateWorkflowId(
+ @ApiParam("璁㈠崟ID") @RequestParam @NotBlank String orderId,
+ @ApiParam("宸ヤ綔娴両D") @RequestParam @NotBlank String workflowId) {
+ try {
+ boolean result = orderInfoService.updateWorkflowId(orderId, workflowId);
+ return result ? Result.success(true) : Result.error("鏇存柊宸ヤ綔娴両D澶辫触");
+ } catch (Exception e) {
+ log.error("鏇存柊宸ヤ綔娴両D澶辫触锛岃鍗旾D: {}", orderId, e);
+ return Result.error("鏇存柊宸ヤ綔娴両D澶辫触锛�" + e.getMessage());
+ }
+ }
+
@GetMapping("/agreement/check/{orderId}")
@ApiOperation("妫�鏌ヨ鍗曟槸鍚﹀寘鍚崗璁被鍨嬬殑瀛愯鍗�")
public Result<Boolean> checkAgreementPriceType(
--
Gitblit v1.8.0