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 a254bde..ad136e9 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
@@ -1,5 +1,7 @@
 package com.bonus.material.order.controller;
 
+import cn.hutool.core.collection.CollectionUtil;
+import com.bonus.common.biz.enums.MaStatusEnum;
 import com.bonus.common.biz.enums.OrderStatusEnum;
 import com.bonus.common.core.web.controller.BaseController;
 import com.bonus.common.core.web.domain.AjaxResult;
@@ -83,29 +85,29 @@ public class OrderController extends BaseController {
             return error("参数错误");
         }
         // 退租
-  /*      if (orderInfoDto.getOrderStatus().equals("5")) {
+        if (orderInfoDto.getOrderStatus().equals(OrderStatusEnum.ORDER_UNDER_LEASE.getStatus())) {
             List<OrderDetailDto> dtos = orderMapper.getOrderDetailsByOrderId(orderInfoDto.getOrderId());
-            if (dtos.size() > 0) {
+            if (dtos.size() > 0 && CollectionUtil.isNotEmpty(dtos)) {
                 for (OrderDetailDto dto : dtos) {
-                    if ("0".equals(dto.getManageType())) {
+//                    if ("0".equals(dto.getManageType())) {
                         // 编码设备已退租的先下架
                         dto.setMaStatus("1");
                         orderMapper.updateDeviceStatus(dto);
-                    } else {
+                   /* } else {
                         // 数量设备已退租的增加库存
                         orderMapper.updateAddDevCount(dto);
-                    }
+                    }*/
                 }
             }
-        }*/
+        }
         // 取消
         if (orderInfoDto.getOrderStatus().equals(OrderStatusEnum.ORDER_CANCEL.getStatus())) {
             List<OrderDetailDto> dtos = orderMapper.getOrderDetailsByOrderId(orderInfoDto.getOrderId());
-            if (dtos.size() > 0) {
+            if (dtos.size() > 0 && CollectionUtil.isNotEmpty(dtos)) {
                 for (OrderDetailDto dto : dtos) {
 //                    if ("0".equals(dto.getManageType())) {
                         // 编码设备已取消的继续上架
-                        dto.setMaStatus("2");
+                        dto.setMaStatus(MaStatusEnum.LISTING.getCode().toString());
                         orderMapper.updateDeviceStatus(dto);
                    /* } else {
                         // 数量设备已退租的增加库存