From 4c569aaf19a55dcdd753f948cfb206986f3a2a89 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Wed, 11 Dec 2024 14:23:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=85=8D=E7=BD=AE=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../order/controller/OrderController.java       | 17 ++++++++++-------
 .../material/order/domain/OrderDetailDto.java   |  3 +++
 2 files changed, 13 insertions(+), 7 deletions(-)

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