From 0787dfbaba6c70efc9a41d1cb48d3593640809ec Mon Sep 17 00:00:00 2001
From: "liang.chao" <1360241448@qq.com>
Date: Wed, 4 Dec 2024 09:30:43 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A3=85=E5=A4=87=E7=BC=96=E7=A0=81=E5=8F=AF?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D=EF=BC=8C=E7=BC=96=E7=A0=81=E8=A3=85=E5=A4=87?=
 =?UTF-8?q?=E9=80=80=E7=A7=9F=E5=90=8E=E5=85=88=E4=B8=8B=E6=9E=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../material/device/service/impl/DevInfoServiceImpl.java  | 8 ++++----
 .../bonus/material/order/controller/OrderController.java  | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java
index f8408d0..f02424c 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java
@@ -300,10 +300,10 @@ public class DevInfoServiceImpl implements DevInfoService {
             throw new ServiceException("非法参数异常: " + e.getMessage());
         }
 
-        DevInfo deviceNameCount = devInfoMapper.getDeviceNameCount(devInfo.getDeviceName());
+      /*  DevInfo deviceNameCount = devInfoMapper.getDeviceNameCount(devInfo.getDeviceName());
         if (deviceNameCount != null && deviceNameCount.getMaId() > 0) {
             return AjaxResult.error("设备名称已存在，请修改后重试！");
-        }
+        }*/
 
         //获取用户信息
         Long userId = SecurityUtils.getLoginUser().getUserid();
@@ -428,10 +428,10 @@ public class DevInfoServiceImpl implements DevInfoService {
         if (devInfo.getMaId() == null) {
             return AjaxResult.error("设备ID为空,请携带设备信息修改");
         }
-        DevInfo deviceId = devInfoMapper.getDeviceNameCount(devInfo.getDeviceName());
+        /*DevInfo deviceId = devInfoMapper.getDeviceNameCount(devInfo.getDeviceName());
         if (deviceId != null && !deviceId.getMaId().equals(devInfo.getMaId())) {
             return AjaxResult.error("设备名称已存在，请修改后重试！");
-        }
+        }*/
         return devInfoMapper.updateDevInfo(devInfo) > 0 ? AjaxResult.success("修改成功") : AjaxResult.error("修改失败");
     }
 
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 9240854..1a35d34 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
@@ -86,8 +86,8 @@ public class OrderController extends BaseController {
             if (dtos.size() > 0) {
                 for (OrderDetailDto dto : dtos) {
                     if ("0".equals(dto.getManageType())) {
-                        // 编码设备已退租的重新上架
-                        dto.setMaStatus("2");
+                        // 编码设备已退租的先下架
+                        dto.setMaStatus("1");
                         orderMapper.updateDeviceStatus(dto);
                     } else {
                         // 数量设备已退租的增加库存