diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java index c70335f..4a74cae 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java @@ -161,6 +161,18 @@ public class OrderController { if (StrUtil.isBlank(deleteRequest.getId()) && CollUtil.isEmpty(deleteRequest.getIds())) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); } + + if (deleteRequest.getStatus() != null) { + OrderFilterRequest orderFilterRequest = new OrderFilterRequest(); + orderFilterRequest.setStatus(deleteRequest.getStatus()); + orderFilterRequest.setId(deleteRequest.getId()); + List orderEntityList = orderService.filterListOr(orderFilterRequest); + if (CollUtil.isEmpty(orderEntityList)) { + return ResultVOUtils.error(520, "单据不存在!"); + } + } + + if (CollUtil.isNotEmpty(deleteRequest.getIds())) { orderService.deleteOrders(deleteRequest.getIds()); } else { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/inout/DeleteRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/inout/DeleteRequest.java index 86a6c63..ddb3d7a 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/inout/DeleteRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/inout/DeleteRequest.java @@ -8,5 +8,6 @@ import java.util.List; public class DeleteRequest { String id; + private Integer status; List ids; }