修改bug

nightFragrance-massage/src/main/java/com/ylx/massage/domain/TOrder.java

@@ -275,6 +275,9 @@ public class TOrder implements Serializable {
     @ApiModelProperty("开始服务时间")
     private LocalDateTime startTime;
 
+    @TableField(exist = false)
+    private String startTimeStr;
+
     /**
      * 结束时间
      * 技师完成服务的时间
@@ -283,6 +286,9 @@ public class TOrder implements Serializable {
     @ApiModelProperty("结束时间")
     private LocalDateTime endTime;
 
+    @TableField(exist = false)
+    private String endTimeStr;
+
     /**
      * 拒接原因
      * 技师拒绝接单的原因说明

nightFragrance-massage/src/main/java/com/ylx/massage/service/impl/OrderValidationServiceImpl.java

@@ -100,8 +100,12 @@ public class OrderValidationServiceImpl implements OrderValidationService {
         log.info("技师 {} 有 {} 个进行中的订单，开始时间范围校验", technicianId, inProgressOrders.size());
 
         //新订单的开始和结束时间
-        LocalDateTime newOrderStart = OrderTimeRangeUtils.estimateStartTime(newOrder);
-        LocalDateTime newOrderEnd = OrderTimeRangeUtils.estimateEndTime(newOrder);
+        /*LocalDateTime newOrderStart = OrderTimeRangeUtils.estimateStartTime(newOrder);
+        LocalDateTime newOrderEnd = OrderTimeRangeUtils.estimateEndTime(newOrder);*/
+        String startTimeStr = newOrder.getStartTimeStr();
+        LocalDateTime newOrderStart = LocalDateTime.parse(startTimeStr, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+        String endTimeStr = newOrder.getEndTimeStr();
+        LocalDateTime newOrderEnd = LocalDateTime.parse(endTimeStr, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
 
         // 创建临时订单对象用于时间范围校验
         TOrder newOrderWithTime = new TOrder();

nightFragrance-massage/src/main/java/com/ylx/massage/service/impl/TOrderServiceImpl.java

@@ -904,7 +904,7 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
      *
      * @param technicianId 技师ID
      * @param dateStr 查询日期（格式：yyyy-MM-dd），为null则查询当天
-     * @return 技师当天可预约时间VO
+     * @return TechnicianAvailabilityVo 技师当天可预约时间VO
      */
     @Override
     public TechnicianAvailabilityVo getTechnicianAvailability(String technicianId, String dateStr) {
@@ -987,7 +987,6 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
 
         // 7. 根据查询日期判断是否可预约
         LocalDate today = LocalDate.now();
-
         if (queryDate.isBefore(today)) {
             // 查询日期是过去的日期，所有时间段都不可预约
             markAllTimeSlotsUnavailable(timeSlots, "日期已过期");
@@ -1014,7 +1013,6 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
      * @param orderNo 订单号
      */
     private void markTimeSlotsUnavailable(List<TimeSlotVo> timeSlots, LocalDateTime start, LocalDateTime end, String orderNo) {
-        LocalDate date = start.toLocalDate();
         LocalTime startTime = start.toLocalTime();
         LocalTime endTime = end.toLocalTime();