调整

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

@@ -1,16 +1,18 @@
 package cn.com.taiji.core.entity.ass;
 
-import cn.com.taiji.common.entity.StringPropertyUUIDEntity;
-import cn.com.taiji.core.entity.dict.AuditStatus;
-import cn.com.taiji.core.entity.dict.basic.SourceType;
-import lombok.Getter;
-import lombok.Setter;
+import java.time.LocalDateTime;
 
 import javax.persistence.*;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
-import java.time.LocalDateTime;
+
+import cn.com.taiji.common.entity.StringPropertyUUIDEntity;
+import cn.com.taiji.core.entity.dict.AuditStatus;
+import cn.com.taiji.core.entity.dict.ass.AssOrderStatus;
+import cn.com.taiji.core.entity.dict.basic.SourceType;
+import lombok.Getter;
+import lombok.Setter;
 
 
 /**
@@ -35,6 +37,10 @@ public class AssReimburseOrder extends StringPropertyUUIDEntity {
 	private String agencyId;//订单渠道编号
 	@Column(name = "STAFF_OPENID")
 	private String staffOpenId;//业务员openid
+	@NotBlank
+	@Size(max = 20)
+	@Column(name = "CUSTOMER_ID")
+	private String customerId;//客户openID
 	@NotNull
 	@Column(name = "FEE")
 	private Long fee;//补缴金额
@@ -52,8 +58,9 @@ public class AssReimburseOrder extends StringPropertyUUIDEntity {
 	@Column(name = "INFO")
 	private String info;//补缴原因
 	@NotNull
-	@Column(name = "reimburse_Status")
-	private Integer reimburseStatus=0;//状态，0-未完成 2-已完成
+	@Column(name = "REIMBURSE_STATUS")
+	@Enumerated(EnumType.STRING)
+	private AssOrderStatus reimburseStatus;//状态
 	@Column(name = "REIMBURSE_TIME")
 	private LocalDateTime reimburseTime;//补缴完成时间
 

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

@@ -20,7 +20,7 @@ import java.time.LocalDateTime;
 @Getter
 @Setter
 @Entity
-@Table(name = "ASS_REIMBURSE_ORDER")
+@Table(name = "ASS_REIMBURSE_ORDER_TRANS")
 public class AssReimburseOrderTrans extends StringPropertyUUIDEntity {