增加配置属性

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<OrderDetailDto> dtos = orderMapper.getOrderDetailsByOrderId(orderInfoDto.getOrderId());
             if (dtos.size() > 0 && CollectionUtil.isNotEmpty(dtos)) {
+                if (CollectionUtil.isNotEmpty(orderInfoDto.getMaIds())) {
                     for (OrderDetailDto dto : dtos) {
-//                    if ("0".equals(dto.getManageType())) {
-                        // 编码设备已退租的先下架
+                        if (orderInfoDto.getMaIds().contains(dto.getMaId())) {
                             dto.setMaStatus("1");
                             orderMapper.updateDeviceStatus(dto);
-                   /* } else { 
-                        // 数量设备已退租的增加库存
-                        orderMapper.updateAddDevCount(dto);
-                    }*/
+                        }
+                    }
+                } else {
+                    for (OrderDetailDto dto : dtos) {
+                        dto.setMaStatus("1");
+                        orderMapper.updateDeviceStatus(dto);
+                    }
                 }
             }
         }

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<Integer> maIds;
+
     @ApiModelProperty(value = "设备类型id")
     private Integer typeId;