From 5ec647ac8a2d7ca23ca21496b5ddad8eabdf909b Mon Sep 17 00:00:00 2001
From: "liang.chao" <1360241448@qq.com>
Date: Fri, 29 Nov 2024 18:07:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/bonus/material/order/mapper/OrderMapper.java  | 2 ++
 .../material/order/service/impl/OrderServiceImpl.java      | 7 +++++--
 .../resources/mapper/material/device/DevInfoMapper.xml     | 1 +
 .../resources/mapper/material/order/OrderInfoMapper.xml    | 3 +++
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/mapper/OrderMapper.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/mapper/OrderMapper.java
index b22663d..d3d4c76 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/mapper/OrderMapper.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/mapper/OrderMapper.java
@@ -28,4 +28,6 @@ public interface OrderMapper {
     void updateMaStatus(OrderDetailDto orderDetailDto);
 
     Integer updateOrderStatus(@Param("ids") List<Integer> ids, @Param("orderStatus") String orderStatus,@Param("userName") String userName);
+
+    Integer updateDevCount(OrderDetailDto orderDetailDto);
 }
diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java
index b42bfd4..7550f4c 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java
@@ -36,6 +36,9 @@ public class OrderServiceImpl implements OrderService {
                 DevInfo devInfo = orderMapper.getdeviceCount(orderDetailDto);
                 if (devInfo.getDeviceCount() < orderDetailDto.getNum()) {
                     throw new RuntimeException(devInfo.getDeviceName() + "库存不足");
+                } else {
+                    // 改库存
+                    orderMapper.updateDevCount(orderDetailDto);
                 }
             } else {
                 //如果是编码设备，改设备状态为在租
@@ -69,11 +72,11 @@ public class OrderServiceImpl implements OrderService {
             for (String id : ids.split(",")) {
                 OrderDetailDto orderDetailDto = orderMapper.selectOrderDetailsById(id);
                 // 待出库
-                if ("2".equals(orderDetailDto.getOrderStatus())){
+                if ("2".equals(orderDetailDto.getOrderStatus())) {
                     dto.setOrderStatus("2");
                 }
                 // 待收货
-                if ("3".equals(orderDetailDto.getOrderStatus())){
+                if ("3".equals(orderDetailDto.getOrderStatus())) {
                     dto.setCzOrderStatus("3");
                 }
                 list.add(orderDetailDto);
diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml
index ecdd8dc..6af4302 100644
--- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml
+++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml
@@ -220,6 +220,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             d.type_id as typeId,
             mt4.type_name as typeName,
             mt4.unit_name as unitName,
+            mt4.manage_type as manageType,
             d.ma_status as maStatus,
             d.brand as brand,
             d.model_name as modelName,
diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml
index 99fe5ee..1946487 100644
--- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml
+++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml
@@ -58,6 +58,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </update>
+    <update id="updateDevCount">
+        update ma_dev_info set device_count = device_count - #{num} where ma_id = #{maId} and is_active = 1
+    </update>
     <select id="getdeviceCount" resultType="com.bonus.material.device.domain.DevInfo">
         select device_count,device_name from ma_dev_info where ma_id = #{maId} and is_active = 1
     </select>