From 7efb5fea055cd5a95d8eb4457322adc7c417ac2a Mon Sep 17 00:00:00 2001
From: Bang Hu <hu_bang@hotmail.com>
Date: 星期四, 28 八月 2025 12:45:19 +0800
Subject: [PATCH] Merge branch 'master' of http://xearth.cn:6600/r/web-manage/web-manage-back
---
src/main/java/com/webmanage/controller/OrderController.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/webmanage/controller/OrderController.java b/src/main/java/com/webmanage/controller/OrderController.java
index baeb5f9..f3120a7 100644
--- a/src/main/java/com/webmanage/controller/OrderController.java
+++ b/src/main/java/com/webmanage/controller/OrderController.java
@@ -157,6 +157,17 @@
}
}
+ @PostMapping("/approval/page/with-product-conditions")
+ @ApiOperation("鍒嗛〉鏌ヨ寰呭鎵硅鍗曞垪琛紙鏀寔浜у搧鏉′欢锛�")
+ public Result<Object> getPendingApprovalOrderPageWithProductConditions(@Valid @RequestBody OrderQueryDTO queryDTO) {
+ try {
+ return Result.success(orderInfoService.getPendingApprovalOrderPageWithProductConditions(queryDTO));
+ } catch (Exception e) {
+ log.error("鏌ヨ寰呭鎵硅鍗曞垪琛ㄥけ璐�", e);
+ return Result.error("鏌ヨ寰呭鎵硅鍗曞垪琛ㄥけ璐ワ細" + e.getMessage());
+ }
+ }
+
@GetMapping("/detail/{orderId}")
@ApiOperation("鑾峰彇璁㈠崟璇︽儏")
public Result<OrderDetailVO> getOrderDetail(
--
Gitblit v1.8.0