From e45a54511df99a68cf13942b3f0a398444fee4e5 Mon Sep 17 00:00:00 2001 From: mashuai Date: Tue, 25 Feb 2025 15:05:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E9=9C=80=E6=B1=82=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/service/impl/OrderServiceImpl.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java index 3903c15..026e850 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java @@ -348,9 +348,18 @@ public class OrderServiceImpl implements OrderService { // 订单完成，修改装备为下架状态 if (orderInfoDto.getOrderStatus().equals(OrderStatusEnum.ORDER_FINISHED.getStatus().toString())) { if (dtos.size() > 0 && CollectionUtil.isNotEmpty(dtos)) { - for (OrderDetailDto dto : dtos) { - dto.setMaStatus(MaStatusEnum.ON_HIRE.getCode().toString()); - orderMapper.updateDeviceStatus(dto); + if (CollectionUtil.isNotEmpty(orderInfoDto.getMaIds())) { + for (OrderDetailDto dto : dtos) { + if (orderInfoDto.getMaIds().contains(dto.getMaId())) { + dto.setMaStatus(MaStatusEnum.ON_HIRE.getCode().toString()); + orderMapper.updateDeviceStatus(dto); + } + } + } else { + for (OrderDetailDto dto : dtos) { + dto.setMaStatus(MaStatusEnum.ON_HIRE.getCode().toString()); + orderMapper.updateDeviceStatus(dto); + } } } }