‘linchangsheng’ 4 months ago
parent
commit
c2fc166739

+ 10 - 0
mall-server-api/src/main/java/com/gree/mall/manager/bean/es/OrderBaseEs.java

@@ -549,5 +549,15 @@ public class OrderBaseEs   {
     @Field(value = "parts_apply_status", type = FieldType.Keyword)
     private String partsApplyStatus;
 
+    @ApiModelProperty(value = "销售单下单时间")
+    @Field(value = "first_dispatch_time", type = FieldType.Date,format = DateFormat.custom, pattern ="yyyy-MM-dd HH:mm:ss")
+    private String firstDispatchTime;
+
+    @ApiModelProperty(value = "销售单下单时间")
+    @Field(value = "first_appointment_time", type = FieldType.Date,format = DateFormat.custom, pattern ="yyyy-MM-dd HH:mm:ss")
+    private String firstAppointmentTime;
 
+    @ApiModelProperty(value = "销售单下单时间")
+    @Field(value = "cancel_time", type = FieldType.Date,format = DateFormat.custom, pattern ="yyyy-MM-dd HH:mm:ss")
+    private String cancelTime;
 }

+ 10 - 0
mall-server-api/src/main/java/com/gree/mall/manager/bean/listvo/workorder/OrderBaseVO.java

@@ -7,6 +7,9 @@ import com.gree.mall.manager.plus.entity.PgOrderBase;
 import com.gree.mall.manager.plus.entity.PgOrderFlag;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.data.elasticsearch.annotations.DateFormat;
+import org.springframework.data.elasticsearch.annotations.Field;
+import org.springframework.data.elasticsearch.annotations.FieldType;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
@@ -220,5 +223,12 @@ public class OrderBaseVO     {
     @ApiModelProperty(value = "评价时间")
     private Date appraiseTime;
 
+    @ApiModelProperty(value = "首次派工时间")
+    private Date firstDispatchTime;
 
+    @ApiModelProperty(value = "首次预约时间")
+    private Date firstAppointmentTime;
+
+    @ApiModelProperty(value = "取消服务时间")
+    private Date cancelTime;
 }