From 1814c5c1999ac52387eaf70dfde20be9070bc26c Mon Sep 17 00:00:00 2001
From: zhangli <123879394@qq.com>
Date: Thu, 25 Sep 2025 02:06:31 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=AD=E7=A7=9F=E5=8E=BB=E6=8E=89=E7=A7=9F?=
 =?UTF-8?q?=E7=94=B5=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../order/service/impl/OrderServiceImpl.java  | 40 +++++++++----------
 1 file changed, 20 insertions(+), 20 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 014efe0..06c364f 100644
--- a/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java
@@ -275,13 +275,13 @@ public class OrderServiceImpl implements OrderService {
                 //获取续租车金额
                 BigDecimal rentCarOrderAmount = OrderUtil.getReRentCarAmount(rerentInterval, orderMainPO.getRentalPrice());
                 //获取租电金额
-                BigDecimal rentBatteyOrderAmount = BigDecimal.ZERO ;
-                RentBatteyRuleDTO rentBatteyRuleDTO = null;
-                if(orderMainPO.getRentBatteyRuleId()!=null) {
-                    rentBatteyRuleDTO = carInteg.getRentBatteyRuleByBatteyRuleId(orderMainPO.getRentBatteyRuleId());
-                    rentBatteyOrderAmount = Optional.ofNullable(rentBatteyRuleDTO).map(RentBatteyRuleDTO::getRentPrice).orElse(BigDecimal.ZERO);
-                    rentCarOrderAmount = rentCarOrderAmount.add(rentBatteyOrderAmount);
-                }
+//                BigDecimal rentBatteyOrderAmount = BigDecimal.ZERO ;
+//                RentBatteyRuleDTO rentBatteyRuleDTO = null;
+//                if(orderMainPO.getRentBatteyRuleId()!=null) {
+//                    rentBatteyRuleDTO = carInteg.getRentBatteyRuleByBatteyRuleId(orderMainPO.getRentBatteyRuleId());
+//                    rentBatteyOrderAmount = Optional.ofNullable(rentBatteyRuleDTO).map(RentBatteyRuleDTO::getRentPrice).orElse(BigDecimal.ZERO);
+//                    rentCarOrderAmount = rentCarOrderAmount.add(rentBatteyOrderAmount);
+//                }
                 String paymentId = OrderUtil.generateSubOrderNo(OrderUtil.ZF_PREFIX);
                 // 起支付返回预支付信息
                 RentCarRuleDTO rentCarRuleDTO = carInteg.getRentCarRuleByCarRuleId(orderMainPO.getRentCarRuleId());
@@ -307,19 +307,19 @@ public class OrderServiceImpl implements OrderService {
                 orderSubRepo.save(rentOrder);
 
                 //生成租电子订单
-                if(rentBatteyOrderAmount.compareTo(BigDecimal.ZERO)>0){
-                    //生成租电子订单
-                    OrderSubPO rentBatraayOrder = new OrderSubPO();
-                    rentBatraayOrder.setOrderId(orderMainPO.getOrderId());
-                    rentBatraayOrder.setSuborderNo(OrderUtil.generateSubOrderNo(OrderUtil.ZC_PREFIX));
-                    rentBatraayOrder.setPaymentId(paymentId);
-                    rentBatraayOrder.setSuborderType(SubOrderTypeEnum.RENTBATTEY.getCode());
-                    rentBatraayOrder.setAmount(rentBatteyOrderAmount);
-                    rentBatraayOrder.setCreatedAt(LocalDateTime.now());
-                    rentBatraayOrder.setPaymentMethod(paymentType);
-                    rentBatraayOrder.setPayStatus(PayStatusEnum.USERPAYING.getCode());
-                    orderSubRepo.save(rentBatraayOrder);
-                }
+//                if(rentBatteyOrderAmount.compareTo(BigDecimal.ZERO)>0){
+//                    //生成租电子订单
+//                    OrderSubPO rentBatraayOrder = new OrderSubPO();
+//                    rentBatraayOrder.setOrderId(orderMainPO.getOrderId());
+//                    rentBatraayOrder.setSuborderNo(OrderUtil.generateSubOrderNo(OrderUtil.ZC_PREFIX));
+//                    rentBatraayOrder.setPaymentId(paymentId);
+//                    rentBatraayOrder.setSuborderType(SubOrderTypeEnum.RENTBATTEY.getCode());
+//                    rentBatraayOrder.setAmount(rentBatteyOrderAmount);
+//                    rentBatraayOrder.setCreatedAt(LocalDateTime.now());
+//                    rentBatraayOrder.setPaymentMethod(paymentType);
+//                    rentBatraayOrder.setPayStatus(PayStatusEnum.USERPAYING.getCode());
+//                    orderSubRepo.save(rentBatraayOrder);
+//                }