From cda9decfde8c6b518639c5da506aa293c07f88ff Mon Sep 17 00:00:00 2001
From: p-honggang.li <p-honggang.li@pcitc.com>
Date: 星期一, 08 九月 2025 16:43:04 +0800
Subject: [PATCH] 修改附件上传用户id类型为string,及审核页面不显示带文件上传状态
---
src/main/java/com/webmanage/controller/OrderController.java | 75 ++++++++++++++++++++++++++++++++++++-
1 files changed, 73 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/webmanage/controller/OrderController.java b/src/main/java/com/webmanage/controller/OrderController.java
index f66ad4d..418d9c0 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,
@@ -61,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);
@@ -125,11 +132,36 @@
}
}
+ @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());
+ }
+ }
+
@PostMapping("/approval/page")
@ApiOperation("鍒嗛〉鏌ヨ寰呭鎵硅鍗曞垪琛�")
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());
@@ -160,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) {
@@ -290,6 +322,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(
@@ -314,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