From ac918503bb5e8fad007348e7e39ba7275b75f334 Mon Sep 17 00:00:00 2001
From: p-honggang.li <p-honggang.li@pcitc.com>
Date: 星期一, 08 九月 2025 23:33:32 +0800
Subject: [PATCH] 修改取消订单，修改状态为已取消
---
src/main/java/com/webmanage/controller/OrderController.java | 42 +++++++++++++++++++++++++++++++++++++++---
1 files changed, 39 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/webmanage/controller/OrderController.java b/src/main/java/com/webmanage/controller/OrderController.java
index baeb5f9..25f5677 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);
@@ -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(
@@ -181,7 +192,7 @@
@ApiParam("闄勪欢鍦板潃") @RequestParam @NotBlank String fileUrl,
@ApiParam("瀛樺偍妗跺悕绉�") @RequestParam String bucketName,
@ApiParam("瀵硅薄鍚嶇О") @RequestParam String objectName,
- @ApiParam("涓婁紶鐢ㄦ埛ID") @RequestParam @NotNull Long uploadUserId,
+ @ApiParam("涓婁紶鐢ㄦ埛ID") @RequestParam @NotNull String uploadUserId,
@ApiParam("涓婁紶鐢ㄦ埛鍚�") @RequestParam @NotBlank String uploadUserName,
@ApiParam("闄勪欢绫诲瀷") @RequestParam String attachmentType,
@ApiParam("闄勪欢鎻忚堪") @RequestParam String description) {
@@ -201,7 +212,7 @@
@ApiOperation("娣诲姞璁㈠崟璇勪环")
public Result<Boolean> addOrderEvaluation(
@ApiParam("璁㈠崟ID") @RequestParam @NotBlank String orderId,
- @ApiParam("璇勪环浜篒D") @RequestParam @NotNull Long evaluatorId,
+ @ApiParam("璇勪环浜篒D") @RequestParam @NotNull String evaluatorId,
@ApiParam("璇勪环浜哄鍚�") @RequestParam @NotBlank String evaluatorName,
@ApiParam("璇勪环浜虹被鍨�") @RequestParam @NotBlank String evaluatorType,
@ApiParam("璇勪环鍐呭") @RequestParam @NotBlank String content,
@@ -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