feat:智能柜订单取消

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/constant/order/HardOrderStatusEnum.java

@@ -19,6 +19,7 @@ public enum HardOrderStatusEnum {
     OFFLINE_PAY("6", "没有网络本地支付"),
     REFUND("10", "退款"),
     CANCEL("20", "已核销"),
+    UNFOLLOW("30", "已取消(智能柜使用)"),
     ;
     private final String type;
     private final String description;

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/HardDoorFlowDto.java

@@ -3,7 +3,11 @@ package com.bsd.pjcloud.hard.api.dto;
 import com.bsd.pjcloud.hard.api.entity.HardDoorFlowEntity;
 import lombok.Data;
 
+import java.time.LocalDate;
+
 @Data
 public class HardDoorFlowDto extends HardDoorFlowEntity {
 
+    private LocalDate[] createTimeList;
+
 }

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/entity/HardAuthEntity.java

@@ -77,6 +77,24 @@ public class HardAuthEntity extends Model<HardAuthEntity> {
     @Schema(description = "完成时间")
     private LocalDateTime isDoneTime;
 
+    /**
+     * 是否人工处理
+     */
+    @Schema(description = "是否人工处理")
+    private String isManualChange;
+
+    /**
+     * 人工处理时间
+     */
+    @Schema(description = "人工处理时间")
+    private LocalDateTime manualChangeTime;
+
+    /**
+     * 人工处理备注
+     */
+    @Schema(description = "人工处理时间")
+    private String manualChangeRemark;
+
     /**
      * 创建人
      */

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/entity/order/HardOrderEntity.java

@@ -178,11 +178,17 @@ public class HardOrderEntity extends Model<HardOrderEntity> {
     private String refundStatus;
 
     /**
-     * 订单取消时间
+     * 订单取消时间(退款订单)
      */
     @Schema(description = "订单取消时间")
     private LocalDateTime applyCancelTime;
 
+    /**
+     * 订单取消时间(智能柜)
+     */
+    @Schema(description = "订单取消时间(智能柜)")
+    private LocalDateTime unfollowTime;
+
     /**
      * 设备上的唯一订单号
      */