Merge branch 'main' into zhangli/2025-9-26_my

src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java

@@ -1034,7 +1034,7 @@ public class OrderServiceImpl implements OrderService {
                 updateWrapper.set(OrderMainPO::getOrderStatus, OrderStatusEnum.RENT_ING.getCode());
                 updateWrapper.set(OrderMainPO::getStartRentTime, currentTime);
                 updateWrapper.set(OrderMainPO::getPickCarTime, currentTime);
-                updateWrapper.set(endRentTime!=null ,OrderMainPO::getEndRentTime, endRentTime);
+                updateWrapper.set(OrderMainPO::getEndRentTime, endRentTime);
                 updateWrapper.set(OrderMainPO::getVehicleId, carDTO.getId());
                 updateWrapper.eq(OrderMainPO::getOrderNo, bindCarToOrderReq.getOrderNo());
                 orderMainRepo.update(updateWrapper);

src/main/java/com/sczx/order/utils/OrderUtil.java

@@ -1,6 +1,7 @@
 package com.sczx.order.utils;
 
 import com.sczx.order.common.enums.RentCarTypeEnum;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 
 import java.math.BigDecimal;
@@ -9,6 +10,7 @@ import java.time.format.DateTimeFormatter;
 import java.time.temporal.ChronoUnit;
 import java.util.UUID;
 
+@Slf4j
 public class OrderUtil {
 
     public static final String ORDER_PREFIX = "OC";
@@ -128,6 +130,7 @@ public class OrderUtil {
             //以租代售默认期限为30天
             endRentTime = origTime.plusDays(rerentInterval*30);
         }
+        log.info("获取预计还车时间：{}", endRentTime);
         return endRentTime;
     }
 

src/main/resources/logback.xml

@@ -45,6 +45,17 @@
         </encoder>
     </appender>
 
+    <!-- 如果使用 MyBatis 等框架，可以针对特定的 SQL 日志类进行配置 -->
+    <logger name="com.ibatis" level="DEBUG" additivity="false">
+        <appender-ref ref="SQL_FILE_APPENDER"/>
+        <appender-ref ref="STDOUT"/>
+    </logger>
+
+    <logger name="java.sql" level="DEBUG" additivity="false">
+        <appender-ref ref="SQL_FILE_APPENDER"/>
+        <appender-ref ref="STDOUT"/>
+    </logger>
+
     <root level="info">
         <appender-ref ref="INFO_FILE_APPENDER"/>
         <appender-ref ref="WARN_FILE_APPENDER"/>