From 73573560c015286a7860791f423c61aa9dbac4c8 Mon Sep 17 00:00:00 2001
From: zhangli <123879394@qq.com>
Date: Mon, 4 Aug 2025 00:12:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=A2=84=E8=AE=A1=E8=BF=98?=
 =?UTF-8?q?=E8=BD=A6=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../order/common/enums/RentCarTypeEnum.java   | 21 +++++++++++++++++++
 .../order/service/impl/OrderServiceImpl.java  | 12 ++++++-----
 2 files changed, 28 insertions(+), 5 deletions(-)
 create mode 100644 src/main/java/com/sczx/order/common/enums/RentCarTypeEnum.java

diff --git a/src/main/java/com/sczx/order/common/enums/RentCarTypeEnum.java b/src/main/java/com/sczx/order/common/enums/RentCarTypeEnum.java
new file mode 100644
index 0000000..4fd0b0f
--- /dev/null
+++ b/src/main/java/com/sczx/order/common/enums/RentCarTypeEnum.java
@@ -0,0 +1,21 @@
+package com.sczx.order.common.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @Author: 张黎
+ * @Date: 2024/03/08/17:42
+ * @Description: 订单状态
+ */
+@AllArgsConstructor
+@Getter
+public enum RentCarTypeEnum {
+    DAILY_RENTAL("2", "日租"),
+    DAYS_RENTAL("3", "按天数租"),
+    RENT_INSTEAD_SELL("4", "以租代售"),
+    ;
+    private final String code;
+
+    private final String msg;
+}
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 dc057da..df87336 100644
--- a/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java
@@ -4,10 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.sczx.order.common.constant.RedisKeyConstants;
-import com.sczx.order.common.enums.MiniProgramTypeEnum;
-import com.sczx.order.common.enums.OrderStatusEnum;
-import com.sczx.order.common.enums.PaymentTypeEnum;
-import com.sczx.order.common.enums.SubOrderTypeEnum;
+import com.sczx.order.common.enums.*;
 import com.sczx.order.convert.OrderConvert;
 import com.sczx.order.convert.OrderSubConvert;
 import com.sczx.order.dto.*;
@@ -99,7 +96,12 @@ public class OrderServiceImpl implements OrderService {
                     //TODO 默认应该是待支付状态,这里先默认支付完成待取车
 //                    orderMainPO.setOrderStatus(OrderStatusEnum.WAIT_PAY.getCode());
                     orderMainPO.setOrderStatus(OrderStatusEnum.WAIT_PICK.getCode());
-
+                    orderMainPO.setFirstOrderTime(LocalDateTime.now());
+                    if(StringUtils.equalsIgnoreCase(RentCarTypeEnum.DAILY_RENTAL.getCode(), rentCarRuleDTO.getRentalType())){
+                        orderMainPO.setEndRentTime(LocalDateTime.now().plusDays(1));
+                    } else if(StringUtils.equalsIgnoreCase(RentCarTypeEnum.DAYS_RENTAL.getCode(), rentCarRuleDTO.getRentalType())){
+                        orderMainPO.setEndRentTime(LocalDateTime.now().plusDays(rentCarRuleDTO.getRentalDays()));
+                    }
 
                     //生成子表订单
                     String paymentType;