From d6ef18f23c4b298cb9b977ab3a5d65e2f4a39fe2 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 06 十一月 2024 18:02:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/vo/OrderDetailVO.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/vo/OrderDetailVO.java b/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/vo/OrderDetailVO.java
index cf99e4a..d249077 100644
--- a/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/vo/OrderDetailVO.java
+++ b/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/vo/OrderDetailVO.java
@@ -1,6 +1,7 @@
package com.ruoyi.user.vo;
-import com.ruoyi.user.entity.Order;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.order.api.entity.Order;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -16,7 +17,7 @@
public class OrderDetailVO {
@ApiModelProperty("订单id")
- private Integer orderId;
+ private String orderId;
@ApiModelProperty("订单编号")
private String orderNumber;
@@ -37,7 +38,7 @@
private String reservationAddress;
@ApiModelProperty("上门时间")
- private Date time;
+ private String time;
@ApiModelProperty("服务人员名称")
private String serverName;
@@ -52,12 +53,15 @@
private Integer state;
@ApiModelProperty("接单时间(师傅接单或后台派单，更新该字段时间)")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date acceptTime;
@ApiModelProperty("师傅到达预约地点时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date arriveTime;
@ApiModelProperty("订单完成时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date completeTime;
@ApiModelProperty("订单补贴金额")
@@ -68,6 +72,11 @@
@ApiModelProperty("家电照片")
private String photo;
+ @ApiModelProperty("师傅照片")
+ private String workPic;
+
+ @ApiModelProperty("是否评价(0:未评价,1:已评价)")
+ private Integer isEvaluate;
public OrderDetailVO(Order order) {
this.orderId = order.getId();
@@ -87,5 +96,6 @@
this.completeTime = order.getCompleteTime();
this.subsidy = order.getSubsidy();
this.address = order.getAddress();
+ this.isEvaluate = order.getIsEvaluate();
}
}
--
Gitblit v1.7.1