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); + } } } }