From ccfa611b6c2e128c0e8191e458302a85cbf8c4ee Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期五, 10 四月 2026 16:41:41 +0800
Subject: [PATCH] 删除取消
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java
index deec95f..a4c5f10 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java
@@ -265,7 +265,7 @@
}
WkOrder order = this.getById(id);
if (Objects.isNull(order)) {
- throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�");
+ return R.ok("鍗曟嵁宸蹭笉瀛樺湪鎴栧凡鍙栨秷");
}
if (!order.getExceStatus().equals(AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val)) {
throw new CoolException("褰撳墠鍗曟嵁鐘舵�佷负" + AsnExceStatus.getExceStatus(order.getExceStatus()) + "锛� 涓嶅彲鎵ц鍙栨秷鎿嶄綔锛侊紒");
@@ -295,10 +295,10 @@
}
if (!this.remove(new LambdaQueryWrapper<WkOrder>().eq(WkOrder::getId, id))) {
- throw new CoolException("涓诲崟鍒犻櫎澶辫触锛侊紒");
+ return R.ok("鍗曟嵁宸蹭笉瀛樺湪鎴栧凡鍙栨秷");
}
outStockItemService.remove(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, id));
- return R.ok("鎿嶄綔鎴愬姛");
+ return R.ok("鍙栨秷鎴愬姛");
}
/**
@@ -889,11 +889,13 @@
@Transactional(rollbackFor = Exception.class)
public R cancelOutOrderByItems(List<WkOrderItem> orderItems) {
Map<Long, List<WkOrderItem>> listMap = orderItems.stream().collect(Collectors.groupingBy(WkOrderItem::getOrderId));
+ boolean anyProcessed = false;
for (Long key : listMap.keySet()) {
WkOrder order = this.getById(key);
if (Objects.isNull(order)) {
- throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�");
+ continue;
}
+ anyProcessed = true;
List<WkOrderItem> items = listMap.get(key);
if (!items.isEmpty()) {
for (WkOrderItem orderItem : items) {
@@ -916,14 +918,11 @@
}
if (!this.remove(new LambdaQueryWrapper<WkOrder>().eq(WkOrder::getId, key))) {
- throw new CoolException("涓诲崟鍒犻櫎澶辫触锛侊紒");
+ continue;
}
- if (!outStockItemService.remove(new LambdaQueryWrapper<WkOrderItem>()
- .eq(WkOrderItem::getOrderId, key))) {
- throw new CoolException("鍗曟嵁鏄庣粏鍒犻櫎澶辫触锛侊紒");
- }
+ outStockItemService.remove(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, key));
}
- return R.ok("鎿嶄綔鎴愬姛");
+ return R.ok(anyProcessed ? "鍙栨秷鎴愬姛" : "鍗曟嵁宸蹭笉瀛樺湪鎴栧凡鍙栨秷");
}
--
Gitblit v1.9.1