From 5d025d86b8f3b03a41bda5d34a47d8c7a87e99e4 Mon Sep 17 00:00:00 2001 From: syruan <15555146157@163.com> Date: Tue, 14 Oct 2025 20:18:12 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/common/biz/enums/MaStatusEnum.java | 9 +++++---- .../material/order/mapper/OrderMapper.java | 2 ++ .../order/service/impl/OrderServiceImpl.java | 17 +++++++++-------- .../mapper/material/order/OrderInfoMapper.xml | 6 ++++-- 4 files changed, 20 insertions(+), 14 deletions(-) diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/MaStatusEnum.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/MaStatusEnum.java index 40e4fb6..07a7750 100644 --- a/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/MaStatusEnum.java +++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/MaStatusEnum.java @@ -12,10 +12,11 @@ import java.util.Objects; public enum MaStatusEnum { TO_BE_LISTED(0, "草稿"), - ON_HIRE(1, "下架"), - LISTING(2, "上架"), - UNDER_RENT(3,"在租"), - OWN(4,"自有"); + ON_HIRE(1, "在库"), + LISTING(2, "自用中"), + UNDER_RENT(3,"共享中"), + OWN(4,"退役"), + REPAIR(5, "维修中"); private final Integer code; private final String name; 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 26a7553..ae9200f 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 @@ -26,6 +26,7 @@ public interface OrderMapper { Integer updateDeviceStatus(OrderDetailDto orderDetailDto); List getOrderDetails(OrderInfoDto orderInfoDto); + OrderInfoDto getOrderDetailsById(OrderDetailDto orderInfoDto); List getOrderStatusCount(OrderDetailDto orderInfoDto); @@ -37,6 +38,7 @@ public interface OrderMapper { Integer updateOrderStatus(@Param("orderId") Integer orderId, @Param("maIds") List maIds, @Param("orderStatus") String orderStatus, @Param("userName") String userName, @Param("remark") String remark); Integer updateDevCount(OrderDetailDto orderDetailDto); + Integer updateAddDevCount(OrderDetailDto orderDetailDto); List selectOrderDetailsByOrderId(String orderId); 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 dece16b..3616c6c 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 @@ -107,17 +107,17 @@ public class OrderServiceImpl implements OrderService { if (maInfo == null || maInfo.getMaStatus() == null) { throw new RuntimeException("设备信息异常"); } - if (!maInfo.getMaStatus().equals(MaStatusEnum.LISTING.getCode())) { - throw new RuntimeException("设备非上架状态，无法下单!"); + if (!maInfo.getMaStatus().equals(MaStatusEnum.ON_HIRE.getCode())) { + throw new RuntimeException("设备非在库状态，无法下单!"); } String devPersonPhone = maInfo.getPersonPhone(); - //如果是编码设备，改设备状态为在租 - orderDetailDto.setMaStatus(MaStatusEnum.UNDER_RENT.getCode().toString()); - Integer updateDeviceStatus = orderMapper.updateDeviceStatus(orderDetailDto); - if (updateDeviceStatus < 1) { - throw new RuntimeException("设备状态修改失败"); - } + //如果是编码设备，改设备状态为共享中 +// orderDetailDto.setMaStatus(MaStatusEnum.UNDER_RENT.getCode().toString()); +// Integer updateDeviceStatus = orderMapper.updateDeviceStatus(orderDetailDto); +// if (updateDeviceStatus < 1) { +// throw new RuntimeException("设备状态修改失败"); +// } // 更改购物车状态为已下单 orderMapper.updateMaStatus(orderDetailDto); } @@ -532,6 +532,7 @@ public class OrderServiceImpl implements OrderService { OrderDetailDto orderDetailDto = orderMapper.selectOrderDetailsById(id); list.add(orderDetailDto); } + list.removeIf(Objects::isNull); dto.setDetailsList(list); Optional minOrderStatus = list.stream().min(Comparator.comparingInt(p -> Integer.parseInt(p.getOrderStatus()))); minOrderStatus.ifPresent(orderDetailDto -> dto.setOrderStatus(orderDetailDto.getOrderStatus())); 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 f1cb4fb..8f5e947 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 @@ -202,6 +202,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" moi.order_time order by moi.order_time desc + + + SELECT name AS label, + area_code AS value + FROM sys_cnarea + WHERE parent_code = 0 + ORDER BY area_code + + + \ No newline at end of file diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devchange/MaDevInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devchange/MaDevInfoMapper.xml index 4c576ab..bd65d32 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devchange/MaDevInfoMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devchange/MaDevInfoMapper.xml @@ -318,13 +318,15 @@ mdi.buy_price AS originalValue, mdi.unit AS unit, mdq.next_check_time AS nextMaintenanceDate, - mdi.max_working_hours AS maxServiceLifeYears + mdi.max_working_hours AS maxServiceLifeYears, + sc.name AS province from ma_dev_info mdi LEFT JOIN ma_type_view mtv ON mtv.typeId = mdi.type_id LEFT JOIN jj_sing_project jsp ON mdi.on_project = jsp.pro_code LEFT JOIN sys_dept sd ON sd.dept_id = mdi.on_company LEFT JOIN ma_dev_qc mdq ON mdq.ma_id = mdi.ma_id LEFT JOIN ma_supplier ms ON ms.supplier_id = mdi.supplier_id + LEFT JOIN sys_cnarea sc ON sc.area_code = mdi.province_id mdi.is_active = '1' @@ -334,6 +336,12 @@ and mdi.item_type_model like concat('%', #{specificationModel}, '%') + + + and sc.area_code = #{province} + + + and mtv.maxTypeId = #{majorId} diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevMergeMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevMergeMapper.xml index 7fe161c..5b25f5b 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevMergeMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevMergeMapper.xml @@ -96,6 +96,7 @@ code, ma_status, province_id, + on_company, identify_code, type_id, @@ -118,7 +119,8 @@ #{manageType}, #{code}, '0', - '34', + '340000000000', + #{propertyUnitId}, #{originalCode}, #{typeId}, @@ -179,6 +181,12 @@ + + + UPDATE ma_dev_info SET change_status = #{data.value} WHERE ma_id = #{data.key} + + +