注销明细实体

gly-base-core/src/main/java/cn/com/taiji/core/entity/ass/AssDeviceCancel.java

@@ -1,8 +1,6 @@
 package cn.com.taiji.core.entity.ass;
 
 import cn.com.taiji.core.entity.AbstractStringPropertyUUIDEntity;
-import cn.com.taiji.core.entity.dict.ass.CancelOrderStep;
-import cn.com.taiji.core.entity.dict.basic.CardType;
 import cn.com.taiji.core.entity.dict.basic.IdType;
 import cn.com.taiji.core.entity.dict.issue.RefundOperateType;
 import lombok.Getter;
@@ -25,9 +23,6 @@ public class AssDeviceCancel extends AbstractStringPropertyUUIDEntity {
     @NotBlank
     @Column(name = "ORDER_NO")
     private String orderNo;// 订单编号
-    @Column(name = "ORDER_STEP")
-    @Enumerated(EnumType.STRING)
-    private CancelOrderStep orderStep;//订单阶段
     @NotNull
     @Column(name = "HAS_DEVICE")
     private Boolean hasDevice;// 连设备注销
@@ -41,10 +36,10 @@ public class AssDeviceCancel extends AbstractStringPropertyUUIDEntity {
     private LocalDateTime oldObuExpireTime;//原签过期时间;
     @NotNull
     @Column(name = "PAYEE")
-    private Integer payee;// 收款方 1-黔通 2-渠道
+    private Integer payee;// 收款方 0-黔通 1-渠道
     @NotNull
     @Column(name = "FEE")
-    private Integer fee;// 支付金额，无需支付时为0
+    private Integer fee;// 支付金额-违约金，无需支付时为0
     @NotBlank
     @Column(name = "REASON")
     private String reason;// 注销原因
@@ -102,15 +97,16 @@ public class AssDeviceCancel extends AbstractStringPropertyUUIDEntity {
     @Column(name = "PROXY_URL")
     private String proxyUrl;// 授权书照片地址
 
-    @Column(name = "CANCEL_TIME")
-    private LocalDateTime cancelTime;//订单取消时间
-    @Column(name = "CANCEL_REASON")
-    private String cancelReason;//取消订单原因。取消订单时必填
-    @Column(name = "CANCEL_OP_ID")
-    private String cancelOpId;//取消订单操作人
     @Column(name = "INSERT_TIME")
     private LocalDateTime insertTime;
     @Column(name = "UPDATE_TIME")
     private LocalDateTime updateTime;
 
+    // 支付信息
+    @Column(name = "PAY_ORDER_NO")
+    private String payOrderNo;// 支付订单号
+    @Column(name = "PAY_TIME")
+    private Long payTime;// 支付时间;
+    @Column(name = "PAY_FEE")
+    private Integer payFee;// 支付金额;
 }