更改状态枚举

gly-base-core/src/main/java/cn/com/taiji/core/entity/basic/QtkAgency.java

@@ -1,8 +1,7 @@
 package cn.com.taiji.core.entity.basic;
 
 import cn.com.taiji.common.entity.StringPropertyUUIDEntity;
-import cn.com.taiji.common.entity.StringUUIDEntity;
-import cn.com.taiji.core.entity.dict.basic.EnableFlag;
+import cn.com.taiji.core.entity.dict.EnableStatus;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -112,7 +111,7 @@ public class QtkAgency extends StringPropertyUUIDEntity {
     private String merchantId;//商户号*/
     @NotNull
     @Column(name = "STATUS")
-    private EnableFlag status = EnableFlag.ENABLE;
+    private EnableStatus status = EnableStatus.ENABLE;
    /* @Size(max = 64)
     @Column(name = "AGREEMENT_NAME")
     private String agreementName;//协议名称

gly-base-core/src/main/java/cn/com/taiji/core/entity/basic/QtkServiceHall.java

@@ -1,7 +1,7 @@
 package cn.com.taiji.core.entity.basic;
 
 import cn.com.taiji.common.entity.StringPropertyUUIDEntity;
-import cn.com.taiji.core.entity.dict.basic.EnableFlag;
+import cn.com.taiji.core.entity.dict.EnableStatus;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -107,7 +107,7 @@ public class QtkServiceHall extends StringPropertyUUIDEntity {
     @Column(name = "INFO")
     private String info;//备注
     @Column(name = "STATE")
-    private EnableFlag state =  EnableFlag.ENABLE;
+    private EnableStatus state =  EnableStatus.ENABLE;
     @Column(name = "INSERT_TIME")
     private LocalDateTime insertTime = LocalDateTime.now();//创建时间
     @Column(name = "UPDATE_TIME")

gly-base-core/src/main/java/cn/com/taiji/core/entity/dict/basic/EnableFlag.java

@@ -1,24 +0,0 @@
-package cn.com.taiji.core.entity.dict.basic;
-
-/**
- * @Author weicailin
- * @Date 2023/3/22 17:38
- * @Email 13079168756@163.com
- */
-public enum EnableFlag {
-    ENABLE("可使用") {},
-    DISABLE("禁用") {},
-    ;
-
-    private final String value;
-
-    EnableFlag(String value) {
-        this.value = value;
-
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-}

gly-base-core/src/main/java/cn/com/taiji/core/entity/issue/IssueAgreementAddress.java

@@ -1,19 +1,16 @@
 package cn.com.taiji.core.entity.issue;
 
-import java.math.BigDecimal;
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 import javax.persistence.*;
-import javax.validation.constraints.Digits;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 
 import cn.com.taiji.common.entity.StringPropertyUUIDEntity;
+import cn.com.taiji.core.entity.dict.EnableStatus;
 import lombok.Getter;
 import lombok.Setter;
-import cn.com.taiji.core.entity.dict.basic.EnableFlag;
 
 /**
 * 协议版本表
@@ -39,7 +36,7 @@ public class IssueAgreementAddress extends StringPropertyUUIDEntity {
 	@NotNull
 	@Column(name = "STATUS")
 	@Enumerated(EnumType.STRING)
-	private EnableFlag status;//状态
+	private EnableStatus status;//状态
 	@NotBlank
 	@Size(max = 32)
 	@Column(name = "REF_ID")

gly-base-core/src/main/java/cn/com/taiji/core/entity/issue/IssueCouponInfo.java

@@ -7,7 +7,7 @@ import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 import cn.com.taiji.common.entity.StringPropertyUUIDEntity;
-import cn.com.taiji.core.entity.dict.basic.EnableFlag;
+import cn.com.taiji.core.entity.dict.EnableStatus;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -41,7 +41,7 @@ public class IssueCouponInfo extends StringPropertyUUIDEntity {
 	private Integer thresholdValue;//剩余个数阈值（卡券剩余个数小于等于该阈值，则不允许发放）
 	@NotNull
 	@Column(name = "STATUS")
-	private EnableFlag status;//状态
+	private EnableStatus status;//状态
 	@NotBlank
 	@Size(max = 32)
 	@Column(name = "OPERATE_OPEN_ID")

gly-base-core/src/main/java/cn/com/taiji/core/entity/issue/IssueMultipleEquity.java

@@ -1,19 +1,16 @@
 package cn.com.taiji.core.entity.issue;
 
-import java.math.BigDecimal;
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 import javax.persistence.*;
-import javax.validation.constraints.Digits;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 
 import cn.com.taiji.common.entity.StringPropertyUUIDEntity;
+import cn.com.taiji.core.entity.dict.EnableStatus;
 import lombok.Getter;
 import lombok.Setter;
-import cn.com.taiji.core.entity.dict.basic.EnableFlag;
 
 /**
 * 批量权益包信息
@@ -75,7 +72,7 @@ public class IssueMultipleEquity extends StringPropertyUUIDEntity {
 	@NotNull
 	@Column(name = "STATUS")
 	@Enumerated(EnumType.STRING)
-	private EnableFlag status;//状态
+	private EnableStatus status;//状态
 	@NotNull
 	@Column(name = "EXAMINE")
 	private Integer examine;//审核状态(0--通过  1---不通过 2--待审核)

gly-base-core/src/main/java/cn/com/taiji/core/entity/issue/IssueProduct.java

@@ -8,8 +8,8 @@ import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 
 import cn.com.taiji.common.entity.StringPropertyUUIDEntity;
+import cn.com.taiji.core.entity.dict.EnableStatus;
 import cn.com.taiji.core.entity.dict.basic.CardType;
-import cn.com.taiji.core.entity.dict.basic.EnableFlag;
 import cn.com.taiji.core.entity.dict.basic.SecretKeyType;
 import lombok.Getter;
 import lombok.Setter;
@@ -53,9 +53,10 @@ public class IssueProduct extends StringPropertyUUIDEntity {
 	private String extensionTool;//推广工具
 	@Column(name = "CUSTOMER_TYPE")
 	private Integer customerType;//用户类型 1个人 2单位 3个人+单位
+	@NotNull
 	@Column(name = "CARD_TYPE")
 	@Enumerated(EnumType.STRING)
-	private CardType cardType;//卡类型 1记账卡 2储值卡 3预付卡
+	private CardType cardType;//卡类型
 	@Column(name = "VAN_TYPE")
 	private String vanType;//客货类型 1客车 2货车 3 专项作业车
 	@Size(max = 128)
@@ -97,8 +98,8 @@ public class IssueProduct extends StringPropertyUUIDEntity {
 	private Long ensureFee;//办理费——保证金费用
 	@Column(name = "PRESTORE_FEE")
 	private Long prestoreFee;//办理费——预存金费用
-	@Column(name = "DEFAULT_FEE")
-	private Long defaultFee;//违约费用
+	@Column(name = "MONTHLY_RATE")
+	private Integer monthlyRate;//欠费月收比例
 	@Column(name = "IS_PAY")
 	private Integer isPay;//是否支付 1是0否
 	@Column(name = "QT_SIGN")
@@ -131,7 +132,7 @@ public class IssueProduct extends StringPropertyUUIDEntity {
 	@NotBlank
 	@Size(max = 20)
 	@Column(name = "STATUS")
-	private EnableFlag status;//状态
+	private EnableStatus status;//状态
 	@Size(max = 500)
 	@Column(name = "REMARKS")
 	private String remarks;//备注

gly-base-core/src/main/java/cn/com/taiji/core/entity/issue/IssueProductAttachment.java

@@ -7,9 +7,9 @@ import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 
 import cn.com.taiji.common.entity.StringPropertyUUIDEntity;
+import cn.com.taiji.core.entity.dict.EnableStatus;
 import lombok.Getter;
 import lombok.Setter;
-import cn.com.taiji.core.entity.dict.basic.EnableFlag;
 
 /**
 * 上线附件流程表——发行产品
@@ -39,7 +39,7 @@ public class IssueProductAttachment extends StringPropertyUUIDEntity {
 	@NotNull
 	@Column(name = "STATUS")
 	@Enumerated(EnumType.STRING)
-	private EnableFlag status;//启用状态
+	private EnableStatus status;//启用状态
 	@NotNull
 	@Column(name = "INSERT_TIME")
 	private LocalDateTime insertTime = LocalDateTime.now();//创建时间

gly-base-core/src/main/java/cn/com/taiji/core/entity/issue/IssueProductPromotion.java

@@ -8,9 +8,9 @@ import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 
 import cn.com.taiji.common.entity.StringPropertyUUIDEntity;
+import cn.com.taiji.core.entity.dict.EnableStatus;
 import lombok.Getter;
 import lombok.Setter;
-import cn.com.taiji.core.entity.dict.basic.EnableFlag;
 
 /**
 * 推广发行产品表
@@ -62,7 +62,7 @@ public class IssueProductPromotion extends StringPropertyUUIDEntity {
 	@NotNull
 	@Column(name = "STATUS")
 	@Enumerated(EnumType.STRING)
-	private EnableFlag status;//状态
+	private EnableStatus status;//状态
 	@NotNull
 	@Column(name = "INSERT_TIME")
 	private LocalDateTime insertTime = LocalDateTime.now();//创建时间

gly-base-core/src/main/java/cn/com/taiji/core/entity/issue/IssueSingleEquity.java

@@ -1,20 +1,17 @@
 package cn.com.taiji.core.entity.issue;
 
-import java.math.BigDecimal;
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 import javax.persistence.*;
-import javax.validation.constraints.Digits;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 
 import cn.com.taiji.common.entity.StringPropertyUUIDEntity;
+import cn.com.taiji.core.entity.dict.EnableStatus;
 import cn.com.taiji.core.entity.dict.issue.EquityType;
 import lombok.Getter;
 import lombok.Setter;
-import cn.com.taiji.core.entity.dict.basic.EnableFlag;
 
 /**
 * 单项权益表
@@ -77,7 +74,7 @@ public class IssueSingleEquity extends StringPropertyUUIDEntity {
 	@NotNull
 	@Column(name = "STATUS")
 	@Enumerated(EnumType.STRING)
-	private EnableFlag status;//状态
+	private EnableStatus status;//状态
 	@NotNull
 	@Column(name = "EXAMINE")
 	private Integer examine;//审核状态(0--通过  1---不通过 2--待审核)

gly-base-core/src/main/java/cn/com/taiji/core/repo/jpa/basic/QtkAgencyRepo.java

@@ -2,8 +2,7 @@ package cn.com.taiji.core.repo.jpa.basic;
 
 import cn.com.taiji.common.repo.jpa.AbstractJpaRepo;
 import cn.com.taiji.core.entity.basic.QtkAgency;
-import cn.com.taiji.core.entity.basic.QtkServiceHall;
-import cn.com.taiji.core.entity.dict.basic.EnableFlag;
+import cn.com.taiji.core.entity.dict.EnableStatus;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.transaction.annotation.Transactional;
@@ -27,7 +26,7 @@ public interface QtkAgencyRepo extends AbstractJpaRepo<QtkAgency, String>{
     @Modifying
     @Transactional
     @Query("update  QtkAgency set status =?1 ,updateTime = ?2 where agencyId = ?3")
-    int updateState(EnableFlag state, LocalDateTime updateTime, String agencyId);
+    int updateState(EnableStatus state, LocalDateTime updateTime, String agencyId);
 
     @Query("from QtkAgency where name  like ?1 ")
     public List<QtkAgency> listByNameLike(String likeName);

gly-base-core/src/main/java/cn/com/taiji/core/repo/jpa/basic/QtkServicehallRepo.java

@@ -2,7 +2,7 @@ package cn.com.taiji.core.repo.jpa.basic;
 
 import cn.com.taiji.common.repo.jpa.AbstractJpaRepo;
 import cn.com.taiji.core.entity.basic.QtkServiceHall;
-import cn.com.taiji.core.entity.dict.basic.EnableFlag;
+import cn.com.taiji.core.entity.dict.EnableStatus;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.transaction.annotation.Transactional;
@@ -33,7 +33,7 @@ public interface QtkServicehallRepo extends AbstractJpaRepo<QtkServiceHall, Stri
     @Modifying
     @Transactional
     @Query("update  QtkServiceHall set state =?1 ,updateTime = ?2 where serviceHallId = ?3")
-    int updateState(EnableFlag state, LocalDateTime updateTime, String serviceHallId);
+    int updateState(EnableStatus state, LocalDateTime updateTime, String serviceHallId);
 
 
 

gly-base-core/src/main/java/cn/com/taiji/core/repo/jpa/issue/IssueCouponInfoRepo.java

@@ -1,13 +1,13 @@
 package cn.com.taiji.core.repo.jpa.issue;
 
 import cn.com.taiji.common.repo.jpa.AbstractJpaRepo;
-import cn.com.taiji.core.entity.dict.basic.EnableFlag;
+import cn.com.taiji.core.entity.dict.EnableStatus;
 import cn.com.taiji.core.entity.issue.IssueCouponInfo;
 
 import java.util.List;
 
 public interface IssueCouponInfoRepo extends AbstractJpaRepo<IssueCouponInfo, String>{
 
-    List<IssueCouponInfo> findByStatus(EnableFlag status);
+    List<IssueCouponInfo> findByStatus(EnableStatus status);
 
 }