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 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} + + update ma_dev_info set device_count = device_count - #{num} where ma_id = #{maId} and is_active = 1 +