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/service/impl/InsProductServiceImpl.java | 7 +--
inspect-server/src/main/java/com/ruoyi/inspect/service/InsProductService.java | 2
inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java | 32 +++++-----------
inspect-server/src/main/java/com/ruoyi/inspect/dto/ProductOrderRevokeDTO.java | 35 +++++++++++++++++
4 files changed, 49 insertions(+), 27 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();
}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/dto/ProductOrderRevokeDTO.java b/inspect-server/src/main/java/com/ruoyi/inspect/dto/ProductOrderRevokeDTO.java
new file mode 100644
index 0000000..1e92ed2
--- /dev/null
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/dto/ProductOrderRevokeDTO.java
@@ -0,0 +1,35 @@
+package com.ruoyi.inspect.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 鎴愬搧涓嬪崟锛氭墜鍔ㄤ笅鍗曟挙閿�dto
+ */
+@Data
+public class ProductOrderRevokeDTO {
+
+ private Integer id;
+
+ /**
+ * 鎾ら攢鐨勬楠岄」id鍒楄〃
+ */
+ private List<Integer> ids;
+
+ /**
+ * 璁㈠崟id
+ */
+ private Integer orderId;
+
+ /**
+ * 璁㈠崟鐘舵��
+ */
+ private Integer state;
+
+ /**
+ * 鎾ら攢妫�楠岄」id瀛楃涓�
+ */
+ private String revocationInsProductIds;
+
+}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/InsProductService.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/InsProductService.java
index 487aef2..84fc601 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/InsProductService.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/InsProductService.java
@@ -24,7 +24,7 @@
boolean write(InsOrder insOrder);
- IPage<InsProduct> selectNoProducts(Page page, InsProduct insProduct, Integer orderId, String ids);
+ IPage<InsProduct> selectNoProducts(Page page, Integer orderId, String ids);
void checkUpdate(Integer orderId,Integer state);
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsProductServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsProductServiceImpl.java
index 2f7409b..aef9f1f 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsProductServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsProductServiceImpl.java
@@ -61,15 +61,14 @@
//鏌ヨ寰呮椤圭洰
@Override
- public IPage<InsProduct> selectNoProducts(Page page, InsProduct insProduct, Integer orderId, String ids) {
+ public IPage<InsProduct> selectNoProducts(Page page, Integer orderId, String ids) {
List<Integer> noIds = null;
if (StringUtils.isNotBlank(ids)) {
- noIds = Arrays.asList(ids.split(",")).stream()
+ noIds = Arrays.stream(ids.split(","))
.map(Integer::parseInt)
.collect(Collectors.toList());
}
- IPage<InsProduct> insProductIPage = baseMapper.selectNoProducts(page, orderId, noIds);
- return insProductIPage;
+ return baseMapper.selectNoProducts(page, orderId, noIds);
}
//瀹℃牳寰呮鎾ら攢
--
Gitblit v1.9.3