From 2eaeb19b16af087d17c186c6220bf64f2fc07f4f Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 07 五月 2026 14:51:57 +0800
Subject: [PATCH] 手动下单：检验中订单撤销报错问题修复
---
inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java | 32 ++++++++++----------------------
1 files changed, 10 insertions(+), 22 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java
index ecf318f..217b5b3 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java
@@ -33,6 +33,7 @@
import java.util.List;
import java.util.Map;
import java.util.Objects;
+import java.util.stream.Collectors;
@RestController
@AllArgsConstructor
@@ -132,44 +133,31 @@
}
- @ApiOperation(value = "鎾ら攢")
+ @ApiOperation(value = "鎾ら攢鏈鏍歌鍗�")
@PostMapping("/updateStatus")
- public Result<?> updateStatus(@RequestBody Map<String, Object> param) {
- Integer id = (Integer) param.get("id");
- insOrderService.updateStatus(id);
+ public Result<?> updateStatus(@RequestBody ProductOrderRevokeDTO revokeDTO) {
+ insOrderService.updateStatus(revokeDTO.getId());
return Result.success();
}
//寰呮鐨勬挙閿�鐨勬煡璇㈠緟妫�椤圭洰
@GetMapping("/selectNoProducts")
- public Result<?> selectNoProducts(Page page, InsProduct insProduct, Integer orderId, String ids) {
- return Result.success(insProductService.selectNoProducts(page, insProduct, orderId, ids));
+ public Result<?> selectNoProducts(Page page, ProductOrderRevokeDTO revokeDTO) {
+ return Result.success(insProductService.selectNoProducts(page, revokeDTO.getOrderId(), revokeDTO.getRevocationInsProductIds()));
}
@ApiOperation(value = "寰呮鐨勬挙閿�")
@PostMapping("/updateInspected")
- public Result<?> updateInspected(@RequestBody Map<String, Object> param) {
- Integer orderId = (Integer) param.get("orderId");
- String ids = (String) param.get("ids");
- Integer typeSource = (Integer) param.get("typeSource");
- Long ifsInventoryId = Long.parseLong(param.get("ifsInventoryId").toString());
- if (Objects.nonNull(typeSource) && typeSource == 1) {
- ifsInventoryQuantityMapper.update(null, new LambdaUpdateWrapper<IfsInventoryQuantity>()
- .set(IfsInventoryQuantity::getState, 0)
- .eq(IfsInventoryQuantity::getId, ifsInventoryId));
- insOrderService.update(null, new LambdaUpdateWrapper<InsOrder>().set(InsOrder::getState, -1).eq(InsOrder::getId, orderId)); // 鎾ら攢
- }
- insProductService.updateInspected(orderId, ids);
+ public Result<?> updateInspected(@RequestBody ProductOrderRevokeDTO revokeDTO) {
+ insProductService.updateInspected(revokeDTO.getOrderId(), revokeDTO.getIds().stream().map(String::valueOf).collect(Collectors.joining(",")));
return Result.success();
}
@ApiOperation(value = "瀹℃牳寰呮鎾ら攢")
@PostMapping("/checkUpdate")
- public Result<?> checkUpdate(@RequestBody Map<String, Object> param) {
- Integer orderId = (Integer) param.get("orderId");
- Integer state = (Integer) param.get("state");
- insProductService.checkUpdate(orderId, state);
+ public Result<?> checkUpdate(@RequestBody ProductOrderRevokeDTO revokeDTO) {
+ insProductService.checkUpdate(revokeDTO.getOrderId(), revokeDTO.getState());
return Result.success();
}
--
Gitblit v1.9.3