From f386341ce2bb205bd056a7611d3ae678ca106e65 Mon Sep 17 00:00:00 2001
From: p-honggang.li <p-honggang.li@pcitc.com>
Date: 星期一, 08 九月 2025 16:26:09 +0800
Subject: [PATCH] 修改token参数类型问题
---
src/main/java/com/webmanage/controller/OrderController.java | 38 +++++++++++++++++++++++++++++++++++++-
1 files changed, 37 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/webmanage/controller/OrderController.java b/src/main/java/com/webmanage/controller/OrderController.java
index baeb5f9..069bf5f 100644
--- a/src/main/java/com/webmanage/controller/OrderController.java
+++ b/src/main/java/com/webmanage/controller/OrderController.java
@@ -68,7 +68,7 @@
@GetMapping("/idempotency/token")
@ApiOperation("鑾峰彇涓�娆℃�ч槻閲嶅鎻愪氦 Token")
- public Result<Object> getIdempotencyToken(@RequestParam(required = false) Long userId) {
+ public Result<Object> getIdempotencyToken(@RequestParam(required = false) String userId) {
try {
String token = tokenService.generateToken(userId);
return Result.success("token鐢熸垚",token);
@@ -151,6 +151,17 @@
public Result<Object> getPendingApprovalOrderPage(@Valid @RequestBody OrderQueryDTO queryDTO) {
try {
return Result.success(orderInfoService.getPendingApprovalOrderPage(queryDTO));
+ } catch (Exception e) {
+ log.error("鏌ヨ寰呭鎵硅鍗曞垪琛ㄥけ璐�", e);
+ return Result.error("鏌ヨ寰呭鎵硅鍗曞垪琛ㄥけ璐ワ細" + e.getMessage());
+ }
+ }
+
+ @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());
@@ -349,4 +360,29 @@
return Result.error("鍙栨秷璁㈠崟澶辫触锛�" + e.getMessage());
}
}
+
+ @GetMapping("/product/{productId}/has-completed-orders")
+ @ApiOperation("鏍规嵁浜у搧ID鍒ゆ柇鏄惁瀛樺湪瀹℃牳涓殑鍏宠仈璁㈠崟")
+ public Result<Boolean> hasCompletedOrdersByProductId(
+ @ApiParam("浜у搧ID") @PathVariable @NotBlank String productId) {
+ try {
+ boolean exists = orderInfoService.existsCompletedNotCancelledOrderByProductId(productId);
+ return Result.success(exists);
+ } catch (Exception e) {
+ log.error("鏌ヨ浜у搧鍏宠仈璁㈠崟瀛樺湪鎬уけ璐ワ紝浜у搧ID: {}", productId, e);
+ return Result.error("鏌ヨ澶辫触锛�" + e.getMessage());
+ }
+ }
+
+ @PostMapping("/status/isEvaluate")
+ @ApiOperation("鏇存柊璇勪环鐘舵��")
+ public Result<Object> updateOrderInfoIsEvaluate(@ApiParam("璁㈠崟ID") @RequestParam @NotBlank String orderId){
+ try {
+ boolean success = orderInfoService.updateOrderIsEvaluate(orderId);
+ return success ? Result.success("璇勪环鐘舵�佹洿鏂版垚鍔�") : Result.error("璇勪环鐘舵�佹洿鏂板け璐�");
+ } catch (Exception e) {
+ log.error("璇勪环鐘舵�佹洿鏂板け璐�", e);
+ return Result.error("璇勪环鐘舵�佹洿鏂板け璐ワ細" + e.getMessage());
+ }
+ }
}
--
Gitblit v1.8.0