From 331ad4b5877bf06cfb99fa198045aacb18c3b47a Mon Sep 17 00:00:00 2001 From: zhangli <123879394@qq.com> Date: Wed, 30 Jul 2025 00:09:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=B5=8B=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/sczx/order/convert/OrderConvert.java | 1 + .../order/service/impl/OrderServiceImpl.java | 23 ++++++++++--------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/sczx/order/convert/OrderConvert.java b/src/main/java/com/sczx/order/convert/OrderConvert.java index 3a382a7..3325b6b 100644 --- a/src/main/java/com/sczx/order/convert/OrderConvert.java +++ b/src/main/java/com/sczx/order/convert/OrderConvert.java @@ -32,6 +32,7 @@ public interface OrderConvert { @Mapping(source = "rentCarOrderReq.isAutoDeduct", target = "isAutoDeduct"), @Mapping(source = "rentCarOrderReq.isDepositFree", target = "isDepositFree"), @Mapping(source = "rentCarOrderReq.batteryType", target = "batteryType"), + @Mapping(source = "userInfoDTO.userId", target = "customerId"), @Mapping(source = "userInfoDTO.userName", target = "customerName"), @Mapping(source = "userInfoDTO.mobileNumber", target = "customerPhone"), @Mapping(source = "rentCarRuleDTO.rentalType", target = "rentalType"), 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 399570f..8733dff 100644 --- a/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java +++ b/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java @@ -60,20 +60,21 @@ public class OrderServiceImpl implements OrderService { SimpleUserInfoDTO userInfoDTO = jwtUtil.getUserInfoFromToken(); + //获取门店信息 + CompanyStoreDTO companyStoreDTO = storeInteg.getStoreById(Integer.valueOf(rentCarOrderReq.getStoreId().toString())); + + CarModelSimpleDTO carModelSimpleDTO = carInteg.getCarModelByModelId(rentCarOrderReq.getCarModelId()); + + RentCarRuleDTO rentCarRuleDTO = carInteg.getRentCarRuleByCarRuleId(rentCarOrderReq.getRentCarRuleId()); + + RentBatteyRuleDTO rentBatteyRuleDTO = null; + if(rentCarOrderReq.getRentBatteyRuleId()!=null){ + rentBatteyRuleDTO = carInteg.getRentBatteyRuleByBatteyRuleId(rentCarOrderReq.getRentBatteyRuleId()); + } + String redisLockKey = RedisKeyConstants.ORDER_SUB_KEY + userInfoDTO.getUserId(); if(redisUtil.getRedisLock(redisLockKey, "租车下单")) { try{ - //获取门店信息 - CompanyStoreDTO companyStoreDTO = storeInteg.getStoreById(Integer.valueOf(rentCarOrderReq.getStoreId().toString())); - - CarModelSimpleDTO carModelSimpleDTO = carInteg.getCarModelByModelId(rentCarOrderReq.getCarModelId()); - - RentCarRuleDTO rentCarRuleDTO = carInteg.getRentCarRuleByCarRuleId(rentCarOrderReq.getRentCarRuleId()); - - RentBatteyRuleDTO rentBatteyRuleDTO = null; - if(rentCarOrderReq.getRentBatteyRuleId()!=null){ - rentBatteyRuleDTO = carInteg.getRentBatteyRuleByBatteyRuleId(rentCarOrderReq.getRentBatteyRuleId()); - } //TODO 这里保存订单要做事物处理 //生成订单主表