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/service/OrderInfoService.java | 2
src/main/java/com/webmanage/dto/OrderApprovalDTO.java | 2
src/main/java/com/webmanage/service/impl/OrderInfoServiceImpl.java | 66 +++++++++++++++++---------------
src/main/java/com/webmanage/entity/OrderEvaluation.java | 2
src/main/java/com/webmanage/controller/OrderController.java | 2
src/main/java/com/webmanage/entity/OrderApproval.java | 2
6 files changed, 40 insertions(+), 36 deletions(-)
diff --git a/src/main/java/com/webmanage/controller/OrderController.java b/src/main/java/com/webmanage/controller/OrderController.java
index 418d9c0..25f5677 100644
--- a/src/main/java/com/webmanage/controller/OrderController.java
+++ b/src/main/java/com/webmanage/controller/OrderController.java
@@ -212,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,
diff --git a/src/main/java/com/webmanage/dto/OrderApprovalDTO.java b/src/main/java/com/webmanage/dto/OrderApprovalDTO.java
index f42a2fc..eef058c 100644
--- a/src/main/java/com/webmanage/dto/OrderApprovalDTO.java
+++ b/src/main/java/com/webmanage/dto/OrderApprovalDTO.java
@@ -22,7 +22,7 @@
@ApiModelProperty("瀹℃壒浜篒D")
@NotNull(message = "瀹℃壒浜篒D涓嶈兘涓虹┖")
- private Long approverId;
+ private String approverId;
@ApiModelProperty("瀹℃壒浜哄鍚�")
@NotBlank(message = "瀹℃壒浜哄鍚嶄笉鑳戒负绌�")
diff --git a/src/main/java/com/webmanage/entity/OrderApproval.java b/src/main/java/com/webmanage/entity/OrderApproval.java
index e14f9c7..c11ab33 100644
--- a/src/main/java/com/webmanage/entity/OrderApproval.java
+++ b/src/main/java/com/webmanage/entity/OrderApproval.java
@@ -39,7 +39,7 @@
@ApiModelProperty("瀹℃壒浜篒D")
@TableField("approver_id")
- private Long approverId;
+ private String approverId;
@ApiModelProperty("瀹℃壒浜哄鍚�")
@TableField("approver_name")
diff --git a/src/main/java/com/webmanage/entity/OrderEvaluation.java b/src/main/java/com/webmanage/entity/OrderEvaluation.java
index 435635e..60a6979 100644
--- a/src/main/java/com/webmanage/entity/OrderEvaluation.java
+++ b/src/main/java/com/webmanage/entity/OrderEvaluation.java
@@ -27,7 +27,7 @@
@ApiModelProperty("璇勪环浜篒D")
@TableField("evaluator_id")
- private Long evaluatorId;
+ private String evaluatorId;
@ApiModelProperty("璇勪环浜哄鍚�")
@TableField("evaluator_name")
diff --git a/src/main/java/com/webmanage/service/OrderInfoService.java b/src/main/java/com/webmanage/service/OrderInfoService.java
index 6d0b1d3..1c9c1aa 100644
--- a/src/main/java/com/webmanage/service/OrderInfoService.java
+++ b/src/main/java/com/webmanage/service/OrderInfoService.java
@@ -66,7 +66,7 @@
/**
* 娣诲姞璁㈠崟璇勪环
*/
- boolean addOrderEvaluation(String orderId, Long evaluatorId, String evaluatorName,
+ boolean addOrderEvaluation(String orderId, String evaluatorId, String evaluatorName,
String evaluatorType, String content, Integer rating,
Integer serviceRating, Integer qualityRating, Integer deliveryRating,
Boolean isAnonymous);
diff --git a/src/main/java/com/webmanage/service/impl/OrderInfoServiceImpl.java b/src/main/java/com/webmanage/service/impl/OrderInfoServiceImpl.java
index fed0d0e..9db84be 100644
--- a/src/main/java/com/webmanage/service/impl/OrderInfoServiceImpl.java
+++ b/src/main/java/com/webmanage/service/impl/OrderInfoServiceImpl.java
@@ -677,7 +677,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public boolean addOrderEvaluation(String orderId, Long evaluatorId, String evaluatorName,
+ public boolean addOrderEvaluation(String orderId, String evaluatorId, String evaluatorName,
String evaluatorType, String content, Integer rating,
Integer serviceRating, Integer qualityRating, Integer deliveryRating,
Boolean isAnonymous) {
@@ -1300,46 +1300,50 @@
try {
// 1. 鍒犻櫎璁㈠崟闄勪欢锛堝寘鎷琈inIO鏂囦欢鍜屾暟鎹簱璁板綍锛�
log.info("寮�濮嬪垹闄よ鍗曢檮浠讹紝璁㈠崟ID: {}", orderId);
- List<OrderAttachment> attachments = orderAttachmentMapper.selectByOrderId(orderId);
- for (OrderAttachment attachment : attachments) {
- try {
- // 鍒犻櫎MinIO涓殑鏂囦欢
- if (StringUtils.hasText(attachment.getObjectName())) {
- log.info("鍒犻櫎MinIO鏂囦欢锛屽璞″悕绉�: {}", attachment.getObjectName());
- minioService.deleteFile(attachment.getObjectName());
- }
- // 鍒犻櫎鏁版嵁搴撹褰�
- orderAttachmentMapper.deleteById(attachment.getId());
- log.info("鍒犻櫎闄勪欢璁板綍鎴愬姛锛岄檮浠禝D: {}", attachment.getId());
- } catch (Exception e) {
- log.error("鍒犻櫎闄勪欢澶辫触锛岄檮浠禝D: {}, 閿欒: {}", attachment.getId(), e.getMessage());
- // 缁х画鍒犻櫎鍏朵粬闄勪欢锛屼笉涓柇鏁翠釜娴佺▼
- }
- }
+// List<OrderAttachment> attachments = orderAttachmentMapper.selectByOrderId(orderId);
+// for (OrderAttachment attachment : attachments) {
+// try {
+// // 鍒犻櫎MinIO涓殑鏂囦欢
+// if (StringUtils.hasText(attachment.getObjectName())) {
+// log.info("鍒犻櫎MinIO鏂囦欢锛屽璞″悕绉�: {}", attachment.getObjectName());
+// minioService.deleteFile(attachment.getObjectName());
+// }
+// // 鍒犻櫎鏁版嵁搴撹褰�
+// orderAttachmentMapper.deleteById(attachment.getId());
+// log.info("鍒犻櫎闄勪欢璁板綍鎴愬姛锛岄檮浠禝D: {}", attachment.getId());
+// } catch (Exception e) {
+// log.error("鍒犻櫎闄勪欢澶辫触锛岄檮浠禝D: {}, 閿欒: {}", attachment.getId(), e.getMessage());
+// // 缁х画鍒犻櫎鍏朵粬闄勪欢锛屼笉涓柇鏁翠釜娴佺▼
+// }
+// }
// 2. 閫昏緫鍒犻櫎璁㈠崟璇︽儏
- log.info("寮�濮嬮�昏緫鍒犻櫎璁㈠崟璇︽儏锛岃鍗旾D: {}", orderId);
+ // log.info("寮�濮嬮�昏緫鍒犻櫎璁㈠崟璇︽儏锛岃鍗旾D: {}", orderId);
// 鍏堟煡璇㈣鍗曡鎯呭垪琛紝鐒跺悗閫愪釜閫昏緫鍒犻櫎
- List<OrderDetail> orderDetails = orderDetailMapper.selectByOrderId(orderId);
- int detailDeleted = 0;
- for (OrderDetail detail : orderDetails) {
- int result = orderDetailMapper.deleteById(detail.getId());
- if (result > 0) {
- detailDeleted++;
- }
- }
- log.info("閫昏緫鍒犻櫎璁㈠崟璇︽儏瀹屾垚锛屽奖鍝嶈鏁�: {}", detailDeleted);
+// List<OrderDetail> orderDetails = orderDetailMapper.selectByOrderId(orderId);
+// int detailDeleted = 0;
+// for (OrderDetail detail : orderDetails) {
+// int result = orderDetailMapper.deleteById(detail.getId());
+// if (result > 0) {
+// detailDeleted++;
+// }
+// }
+// log.info("閫昏緫鍒犻櫎璁㈠崟璇︽儏瀹屾垚锛屽奖鍝嶈鏁�: {}", detailDeleted);
// 3. 鍒犻櫎璁㈠崟淇℃伅锛堥�昏緫鍒犻櫎锛�
- log.info("寮�濮嬪垹闄よ鍗曚俊鎭紝璁㈠崟ID: {}", orderId);
- int orderDeleted = this.baseMapper.deleteById(orderId);
- log.info("鍒犻櫎璁㈠崟淇℃伅瀹屾垚锛屽奖鍝嶈鏁�: {}", orderDeleted);
+// log.info("寮�濮嬪垹闄よ鍗曚俊鎭紝璁㈠崟ID: {}", orderId);
+// int orderDeleted = this.baseMapper.deleteById(orderId);
+// log.info("鍒犻櫎璁㈠崟淇℃伅瀹屾垚锛屽奖鍝嶈鏁�: {}", orderDeleted);
+ // 鏇存柊璁㈠崟鐘舵�佷负宸插畬鎴�
+ orderInfo.setOrderStatus("宸插彇娑�");
+ orderInfo.setUpdatedAt(LocalDateTime.now());
+ int orderDeleted = this.baseMapper.updateById(orderInfo);
if (orderDeleted > 0) {
log.info("璁㈠崟鍙栨秷鎴愬姛锛岃鍗旾D: {}", orderId);
return true;
} else {
- log.error("鍒犻櫎璁㈠崟淇℃伅澶辫触锛屽奖鍝嶈鏁颁负0锛岃鍗旾D: {}", orderId);
+ log.error("鏇存柊璁㈠崟淇℃伅澶辫触锛屽奖鍝嶈鏁颁负0锛岃鍗旾D: {}", orderId);
throw new BusinessException("鍒犻櫎璁㈠崟淇℃伅澶辫触");
}
} catch (Exception e) {
--
Gitblit v1.8.0