diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java index ddf6424..59b4f04 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/controller/OrderController.java @@ -88,15 +88,18 @@ public class OrderController extends BaseController { if (orderInfoDto.getOrderStatus().equals(OrderStatusEnum.ORDER_UNDER_LEASE.getStatus())) { List dtos = orderMapper.getOrderDetailsByOrderId(orderInfoDto.getOrderId()); if (dtos.size() > 0 && CollectionUtil.isNotEmpty(dtos)) { - for (OrderDetailDto dto : dtos) { -// if ("0".equals(dto.getManageType())) { - // 编码设备已退租的先下架 + if (CollectionUtil.isNotEmpty(orderInfoDto.getMaIds())) { + for (OrderDetailDto dto : dtos) { + if (orderInfoDto.getMaIds().contains(dto.getMaId())) { + dto.setMaStatus("1"); + orderMapper.updateDeviceStatus(dto); + } + } + } else { + for (OrderDetailDto dto : dtos) { dto.setMaStatus("1"); orderMapper.updateDeviceStatus(dto); - /* } else { - // 数量设备已退租的增加库存 - orderMapper.updateAddDevCount(dto); - }*/ + } } } } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderDetailDto.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderDetailDto.java index 3be9558..a63f664 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderDetailDto.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderDetailDto.java @@ -30,6 +30,9 @@ public class OrderDetailDto { @ApiModelProperty(value = "设备id") private Integer maId; + @ApiModelProperty(value = "设备ids") + private List maIds; + @ApiModelProperty(value = "设备类型id") private Integer typeId;