商户订单详情vo日期数据格式化

nightFragrance-massage/src/main/java/com/ylx/order/domain/vo/merchant/OrderPageVO.java

@@ -45,11 +45,16 @@ public class OrderPageVO<T> implements IAfterSaleDisplay, IGeoRiskInfo {
     private BigDecimal finalAmount;
 
     @ApiModelProperty("预约开始时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime appointmentStartTime;
 
     @ApiModelProperty("预约结束时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime appointmentEndTime;
 
+    @ApiModelProperty("预约时间范围（格式化，示例：5月12日 16:00-18:00）")
+    private String appointmentTimeRange;
+
     @ApiModelProperty("联系人姓名")
     private String contactPersonName;
 
@@ -87,6 +92,6 @@ public class OrderPageVO<T> implements IAfterSaleDisplay, IGeoRiskInfo {
     private Long categoryId;
 
     @ApiModelProperty("下单时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime createTime;
 }

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

@@ -753,6 +753,7 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
             Integer tagCode = calcCustomerTagCode(vo, merchantId, now);
             vo.setCustomerTagCode(tagCode);
             vo.setCustomerTagDesc(CustomerTagEnum.getDescByCode(tagCode));
+            vo.setAppointmentTimeRange(formatTimeRange(vo.getAppointmentStartTime(), vo.getProjectDuration()));
 
             this.fillCurrentAfterSaleInfo(vo, vo.getId());
         }