Browse Source

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

wangzhijun 7 giờ trước cách đây
mục cha
commit
2f8d889b72

+ 14 - 4
nightFragrance-massage/src/main/java/com/ylx/order/domain/vo/merchant/MerchantOrderDetailVO.java

@@ -1,11 +1,13 @@
 package com.ylx.order.domain.vo.merchant;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ylx.order.service.IAfterSaleDisplay;
 import com.ylx.order.service.IGeoRiskInfo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
 
 @Data
 public class MerchantOrderDetailVO<T> implements IAfterSaleDisplay, IGeoRiskInfo {
@@ -41,10 +43,12 @@ public class MerchantOrderDetailVO<T> implements IAfterSaleDisplay, IGeoRiskInfo
     private BigDecimal finalAmount;
 
     @ApiModelProperty("预约开始时间")
-    private String appointmentStartTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime appointmentStartTime;
 
     @ApiModelProperty("预约结束时间")
-    private String appointmentEndTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime appointmentEndTime;
 
     @ApiModelProperty("预约时间范围(格式化,示例:5月12日 16:00-18:00)")
     private String appointmentTimeRange;
@@ -74,10 +78,16 @@ public class MerchantOrderDetailVO<T> implements IAfterSaleDisplay, IGeoRiskInfo
     private String orderId;
 
     @ApiModelProperty("下单时间")
-    private String createTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime createTime;
 
     @ApiModelProperty("付款时间")
-    private String paidTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime paidTime;
+
+    @ApiModelProperty("服务完成时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime completedTime;
 
     @ApiModelProperty("售后单ID")
     private Long afterSalesServiceId;