From 876e6e33d9d8ca7f936319826ad7cf89a8891cd0 Mon Sep 17 00:00:00 2001 From: zhangli <123879394@qq.com> Date: Sat, 23 Aug 2025 00:27:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AE=A2=E5=8D=95=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=97=B6=EF=BC=8C=E9=80=BB=E8=BE=91=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E7=9A=84=E6=A0=87=E8=AE=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/sczx/order/service/impl/OrderServiceImpl.java | 3 +-- src/main/resources/mapper/OrderMainMapper.xml | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java b/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java index f3b24f9..d025f72 100644 --- a/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java +++ b/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java @@ -337,8 +337,6 @@ public class OrderServiceImpl implements OrderService { //获取门店信息 CompanyStoreDTO companyStoreDTO = storeInteg.getStoreById(Integer.valueOf(orderMainPO.getStoreId().toString())); - CarModelSimpleDTO carModelSimpleDTO = carInteg.getCarModelByModelId(orderMainPO.getCarModelId()); - RentCarRuleDTO rentCarRuleDTO = carInteg.getRentCarRuleByCarRuleId(orderMainPO.getRentCarRuleId()); SimpleUserInfoDTO userInfoDTO = jwtUtil.getUserInfoFromToken(); OrderSubPO orderSubPO = orderSubPOList.get(0); @@ -629,6 +627,7 @@ public class OrderServiceImpl implements OrderService { } LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(OrderMainPO::getCustomerId, customerId) + .eq(OrderMainPO::getDelFlag, "0") .notIn(OrderMainPO::getOrderStatus, Arrays.asList(OrderStatusEnum.AUTO_END.getCode(), OrderStatusEnum.MANUAL_END.getCode())) .orderByDesc(OrderMainPO::getOrderId).last(" limit 1"); OrderMainPO orderMainPO = orderMainRepo.getOne(queryWrapper); diff --git a/src/main/resources/mapper/OrderMainMapper.xml b/src/main/resources/mapper/OrderMainMapper.xml index d031237..fbb1add 100644 --- a/src/main/resources/mapper/OrderMainMapper.xml +++ b/src/main/resources/mapper/OrderMainMapper.xml @@ -12,7 +12,7 @@ COUNT(CASE WHEN order_status = 'WAIT_RETURN' THEN 1 END) as pending_return_count, COUNT(CASE WHEN order_status = 'RENT_OVERDUE' THEN 1 END) as overdue_count FROM zc_order_main - WHERE store_id = #{storeId} + WHERE store_id = #{storeId} and del_flag = '0' GROUP BY store_id @@ -38,6 +38,7 @@ LEFT JOIN zc_car c on o.vehicle_id = c.id + o.del_flag = '0' and o.customer_id = #{customerId}