需求

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

@@ -549,15 +549,15 @@ public class OrderBaseEs   {
     @Field(value = "parts_apply_status", type = FieldType.Keyword)
     private String partsApplyStatus;
 
-    @ApiModelProperty(value = "销售单下单时间")
+    @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 = "销售单下单时间")
+    @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 = "销售单下单时间")
+    @ApiModelProperty(value = "取消时间")
     @Field(value = "cancel_time", type = FieldType.Date,format = DateFormat.custom, pattern ="yyyy-MM-dd HH:mm:ss")
     private String cancelTime;
 }

mall-server-api/src/main/java/com/gree/mall/manager/bean/es/OrderBaseEsDate.java

@@ -535,5 +535,15 @@ public class OrderBaseEsDate {
     @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 Date firstDispatchTime;
 
+    @ApiModelProperty(value = "首次预约时间")
+    @Field(value = "first_appointment_time", type = FieldType.Date,format = DateFormat.custom, pattern ="yyyy-MM-dd HH:mm:ss")
+    private Date firstAppointmentTime;
+
+    @ApiModelProperty(value = "取消时间")
+    @Field(value = "cancel_time", type = FieldType.Date,format = DateFormat.custom, pattern ="yyyy-MM-dd HH:mm:ss")
+    private Date cancelTime;
 }

mall-server-api/src/main/java/com/gree/mall/manager/logic/LetterLogic.java

@@ -375,8 +375,8 @@ public class LetterLogic {
     }
 
     public void cancel(List<String> ids) {
-        if (leLetterService.lambdaQuery().in(LeLetter::getLeLetterId,ids).ne(LeLetter::getStatus,"WAIT").count()>0)
-            throw new RemoteServiceException("存在有非待发送的联络函");
+ /*       if (leLetterService.lambdaQuery().in(LeLetter::getLeLetterId,ids).ne(LeLetter::getStatus,"WAIT").count()>0)
+            throw new RemoteServiceException("存在有非待发送的联络函");*/
         leLetterService.lambdaUpdate().in(LeLetter::getLeLetterId,ids)
                 .set(LeLetter::getStatus, LetterStatusEnum.CANCEL.getKey()).update();
     }