From efa1a4d29afeac22b62a624858f6cb31b96b43f0 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 17 五月 2024 11:48:02 +0800
Subject: [PATCH] 提交所有枚举类
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/OrderReturnRequest.java | 9
ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/domain/pojo/Coupon.java | 3
ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/domain/pojo/Article.java | 11
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/domain/pojo/AuctionBidRecord.java | 3
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/pojo/GoodsGroupPurchase.java | 9
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/ArticleStatusEnum.java | 42 ++
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/PaymentMethodEnum.java | 39 ++
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/AuthenticationEnum.java | 39 ++
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/BidStatusEnum.java | 39 ++
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/MemberCollection.java | 3
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/RequestTypeEnum.java | 39 ++
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/ReturnRequestStatusEnum.java | 42 ++
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/Member.java | 5
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/domain/pojo/AuctionGoods.java | 9
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/pojo/GoodsSeckill.java | 6
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/OrderStatusEnum.java | 42 ++
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/pojo/GoodsSku.java | 3
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/ArticleTypeEnum.java | 26 +
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/AuctionStartStatusEnum.java | 40 ++
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/InvoicingApplication.java | 9
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/AuditStatusEnum.java | 40 ++
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/Order.java | 9
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/CouponStatusEnum.java | 40 ++
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/GenderEnum.java | 40 ++
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/BannerTypeEnum.java | 38 ++
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/AuctionTypeEnum.java | 39 ++
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/TitleTypeEnum.java | 39 ++
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/domain/pojo/AuctionSalesroomGoods.java | 3
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/OrderFromEnum.java | 42 ++
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/CollectionTypeEnum.java | 41 ++
/dev/null | 49 --
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/domain/pojo/AuctionVideo.java | 8
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/InvoiceTypeEnum.java | 39 ++
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/ListingStatusEnum.java | 39 ++
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/GroupStatusEnum.java | 40 ++
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/StartStatusEnum.java | 40 ++
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/domain/pojo/AuctionSalesroom.java | 9
ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/domain/pojo/PromotionBanner.java | 3
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/CouponTypeEnum.java | 40 ++
ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/domain/pojo/CouponMember.java | 3
40 files changed, 931 insertions(+), 88 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/ApproveConfigEnum.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/ApproveConfigEnum.java
deleted file mode 100644
index 6d079b5..0000000
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/ApproveConfigEnum.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.ruoyi.common.core.enums;
-
-import lombok.Getter;
-
-/**
- * @Description
- * @Author xiaochen
- * @Date 2023/6/8 16:42
- */
-public enum ApproveConfigEnum {
-
- /*审批类型 1=交车审批、2=续约审批、3=退车审批*/
-
- DELIVERY_APPROVAL(1, "交车审批"),
- RENEWAL_APPROVAL(2, "续约审批"),
- RETURN_APPROVAL(3, "退车审批");
-
- @Getter
- private String desc;
-
-
- @Getter
- private int code;
-
-
- ApproveConfigEnum(int code, String desc) {
- this.code = code;
- this.desc = desc;
- }
-
- /**
- * 通过code获取枚举
- *
- * @param code
- * @return
- */
- public static ApproveConfigEnum fromCode(Integer code) {
- ApproveConfigEnum[] resultTypes = ApproveConfigEnum.values();
- for (ApproveConfigEnum resultType : resultTypes) {
- if (code.equals(resultType.getCode())) {
- return resultType;
- }
- }
- return null;
- }
-
-}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/ArticleStatusEnum.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/ArticleStatusEnum.java
new file mode 100644
index 0000000..3d19109
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/ArticleStatusEnum.java
@@ -0,0 +1,42 @@
+package com.ruoyi.common.core.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import com.fasterxml.jackson.annotation.JsonValue;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+
+@Getter
+@AllArgsConstructor
+public enum ArticleStatusEnum {
+
+ /*状态 1=待审核 2=已通过 3=已拒绝 4被举报*/
+
+ TO_BE_REVIEWED(1, "待审核"),
+ PASSED(2, "已通过"),
+ REJECTED(3, "已拒绝"),
+ REPORTED(4, "被举报");
+
+ @EnumValue
+ private final int code;
+ @JsonValue
+ private final String desc;
+
+
+ /**
+ * 通过code获取枚举
+ *
+ * @param code
+ * @return
+ */
+ public static ArticleStatusEnum fromCode(Integer code) {
+ ArticleStatusEnum[] resultTypes = ArticleStatusEnum.values();
+ for (ArticleStatusEnum resultType : resultTypes) {
+ if (code.equals(resultType.getCode())) {
+ return resultType;
+ }
+ }
+ return null;
+ }
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/ArticleTypeEnum.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/ArticleTypeEnum.java
new file mode 100644
index 0000000..d811d27
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/ArticleTypeEnum.java
@@ -0,0 +1,26 @@
+package com.ruoyi.common.core.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import com.fasterxml.jackson.annotation.JsonValue;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum ArticleTypeEnum {
+ PLATFORM_RELEASE(1, "平台发布"),
+ USER_POSTING(2, "用户发布");
+ @JsonValue
+ private final Integer code;
+ @EnumValue
+ private final String desc;
+
+ public static ArticleTypeEnum getEnumByCode(Integer code) {
+ for (ArticleTypeEnum e : ArticleTypeEnum.values()) {
+ if (e.code.equals(code)) {
+ return e;
+ }
+ }
+ return null;
+ }
+}
\ No newline at end of file
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/AuctionStartStatusEnum.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/AuctionStartStatusEnum.java
new file mode 100644
index 0000000..b50aea0
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/AuctionStartStatusEnum.java
@@ -0,0 +1,40 @@
+package com.ruoyi.common.core.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import com.fasterxml.jackson.annotation.JsonValue;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+
+@Getter
+@AllArgsConstructor
+public enum AuctionStartStatusEnum {
+
+ /*开始状态 0=预展中 1=拍卖中 2=已结束*/
+
+ IN_PREVIEW(0, "预展中"),
+ IN_AUCTION(1, "拍卖中"),
+ ENDED(1, "已结束");
+ @EnumValue
+ private final int code;
+ @JsonValue
+ private final String desc;
+
+
+ /**
+ * 通过code获取枚举
+ *
+ * @param code
+ * @return
+ */
+ public static AuctionStartStatusEnum fromCode(Integer code) {
+ AuctionStartStatusEnum[] resultTypes = AuctionStartStatusEnum.values();
+ for (AuctionStartStatusEnum resultType : resultTypes) {
+ if (code.equals(resultType.getCode())) {
+ return resultType;
+ }
+ }
+ return null;
+ }
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/AuctionTypeEnum.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/AuctionTypeEnum.java
new file mode 100644
index 0000000..674502d
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/AuctionTypeEnum.java
@@ -0,0 +1,39 @@
+package com.ruoyi.common.core.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import com.fasterxml.jackson.annotation.JsonValue;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+
+@Getter
+@AllArgsConstructor
+public enum AuctionTypeEnum {
+
+ /* 拍卖类型 0=线下拍卖 1=线上线下结合*/
+
+ OFFLINE(0, "线下拍卖"),
+ COMBINING_ONLINE_AND_OFFLINE(1, "线上线下结合");
+ @EnumValue
+ private final int code;
+ @JsonValue
+ private final String desc;
+
+
+ /**
+ * 通过code获取枚举
+ *
+ * @param code
+ * @return
+ */
+ public static AuctionTypeEnum fromCode(Integer code) {
+ AuctionTypeEnum[] resultTypes = AuctionTypeEnum.values();
+ for (AuctionTypeEnum resultType : resultTypes) {
+ if (code.equals(resultType.getCode())) {
+ return resultType;
+ }
+ }
+ return null;
+ }
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/AuditStateEnum.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/AuditStateEnum.java
deleted file mode 100644
index 9a6f806..0000000
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/AuditStateEnum.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.ruoyi.common.core.enums;
-
-import lombok.Getter;
-
-/**
- * @Description
- * @Author xiaochen
- * @Date 2023/6/8 16:42
- */
-public enum AuditStateEnum {
-
- /*审核状态 0待审批 1通过 2驳回 3已撤回*/
-
- PENDING_APPROVAL(0, "待审批"),
- APPROVED(1, "审批通过"),
- APPROVAL_REJECTION(2, "审批驳回"),
- WITHDRAWN(3, "已撤回");
-
- @Getter
- private String desc;
-
-
- @Getter
- private int code;
-
-
- AuditStateEnum(int code, String desc) {
- this.code = code;
- this.desc = desc;
- }
-
- /**
- * 通过code获取枚举
- *
- * @param code
- * @return
- */
- public static AuditStateEnum fromCode(Integer code) {
- AuditStateEnum[] resultTypes = AuditStateEnum.values();
- for (AuditStateEnum resultType : resultTypes) {
- if (code.equals(resultType.getCode())) {
- return resultType;
- }
- }
- return null;
- }
-
-}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/AuditStatusEnum.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/AuditStatusEnum.java
new file mode 100644
index 0000000..78d6e94
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/AuditStatusEnum.java
@@ -0,0 +1,40 @@
+package com.ruoyi.common.core.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import com.fasterxml.jackson.annotation.JsonValue;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+
+@Getter
+@AllArgsConstructor
+public enum AuditStatusEnum {
+
+ /*审核状态 1待审批 2已通过 3已拒绝*/
+
+ TO_BE_REVIEWED(1, "待审核"),
+ PASSED(2, "已通过"),
+ REJECTED(3, "已拒绝");
+ @EnumValue
+ private final int code;
+ @JsonValue
+ private final String desc;
+
+
+ /**
+ * 通过code获取枚举
+ *
+ * @param code
+ * @return
+ */
+ public static AuditStatusEnum fromCode(Integer code) {
+ AuditStatusEnum[] resultTypes = AuditStatusEnum.values();
+ for (AuditStatusEnum resultType : resultTypes) {
+ if (code.equals(resultType.getCode())) {
+ return resultType;
+ }
+ }
+ return null;
+ }
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/AuditTypeEnum.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/AuditTypeEnum.java
deleted file mode 100644
index 242381f..0000000
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/AuditTypeEnum.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.ruoyi.common.core.enums;
-
-import lombok.Getter;
-
-/**
- * @Description
- * @Author xiaochen
- * @Date 2023/6/8 16:42
- */
-public enum AuditTypeEnum {
-
- /*审核类型 1交车申请 2续约申请 3退车申请 4事故账单申请*/
-
- DELIVERY_APPLICATION(1, "交车申请"),
- RENEWAL_APPLICATION(2, "续约申请"),
- RETURN_APPLICATION(3, "退车申请"),
- ACCIDENT_BILL_APPLICATION(4, "事故账单申请");
-
- @Getter
- private String desc;
-
-
- @Getter
- private int code;
-
-
- AuditTypeEnum(int code, String desc) {
- this.code = code;
- this.desc = desc;
- }
-
- /**
- * 通过code获取枚举
- *
- * @param code
- * @return
- */
- public static AuditTypeEnum fromCode(Integer code) {
- AuditTypeEnum[] resultTypes = AuditTypeEnum.values();
- for (AuditTypeEnum resultType : resultTypes) {
- if (code.equals(resultType.getCode())) {
- return resultType;
- }
- }
- return null;
- }
-
-}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/AuthenticationEnum.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/AuthenticationEnum.java
new file mode 100644
index 0000000..8bea6cd
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/AuthenticationEnum.java
@@ -0,0 +1,39 @@
+package com.ruoyi.common.core.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import com.fasterxml.jackson.annotation.JsonValue;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+
+@Getter
+@AllArgsConstructor
+public enum AuthenticationEnum {
+
+ /*实名认证 0=不需实名 1=需要实名*/
+
+ NO_REAL_NAME_REQUIRED(0, "不需实名"),
+ REAL_NAME_REQUIRED(1, "需要实名");
+ @EnumValue
+ private final int code;
+ @JsonValue
+ private final String desc;
+
+
+ /**
+ * 通过code获取枚举
+ *
+ * @param code
+ * @return
+ */
+ public static AuthenticationEnum fromCode(Integer code) {
+ AuthenticationEnum[] resultTypes = AuthenticationEnum.values();
+ for (AuthenticationEnum resultType : resultTypes) {
+ if (code.equals(resultType.getCode())) {
+ return resultType;
+ }
+ }
+ return null;
+ }
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/BannerTypeEnum.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/BannerTypeEnum.java
new file mode 100644
index 0000000..7dce997
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/BannerTypeEnum.java
@@ -0,0 +1,38 @@
+package com.ruoyi.common.core.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import com.fasterxml.jackson.annotation.JsonValue;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+
+@Getter
+@AllArgsConstructor
+public enum BannerTypeEnum {
+
+ /* 轮播图类型 1=商城首页 2=资讯首页*/
+ MALL_HOMEPAGE(1, "已领取"),
+ INFORMATION_HOMEPAGE(2, "资讯首页");
+ @EnumValue
+ private final int code;
+ @JsonValue
+ private final String desc;
+
+
+ /**
+ * 通过code获取枚举
+ *
+ * @param code
+ * @return
+ */
+ public static BannerTypeEnum fromCode(Integer code) {
+ BannerTypeEnum[] resultTypes = BannerTypeEnum.values();
+ for (BannerTypeEnum resultType : resultTypes) {
+ if (code.equals(resultType.getCode())) {
+ return resultType;
+ }
+ }
+ return null;
+ }
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/BidStatusEnum.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/BidStatusEnum.java
new file mode 100644
index 0000000..af2505f
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/BidStatusEnum.java
@@ -0,0 +1,39 @@
+package com.ruoyi.common.core.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import com.fasterxml.jackson.annotation.JsonValue;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+
+@Getter
+@AllArgsConstructor
+public enum BidStatusEnum {
+
+ /*抬头类型 1=企业单位 2=个人/非企业单位*/
+
+ ELIMINATE(0, "淘汰"),
+ LEAD(1, "领先");
+ @EnumValue
+ private final int code;
+ @JsonValue
+ private final String desc;
+
+
+ /**
+ * 通过code获取枚举
+ *
+ * @param code
+ * @return
+ */
+ public static BidStatusEnum fromCode(Integer code) {
+ BidStatusEnum[] resultTypes = BidStatusEnum.values();
+ for (BidStatusEnum resultType : resultTypes) {
+ if (code.equals(resultType.getCode())) {
+ return resultType;
+ }
+ }
+ return null;
+ }
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/CarColorEnum.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/CarColorEnum.java
deleted file mode 100644
index bd98e7c..0000000
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/CarColorEnum.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.ruoyi.common.core.enums;
-
-import lombok.Getter;
-
-/**
- * @Description
- * @Author xiaochen
- * @Date 2023/6/8 16:42
- */
-public enum CarColorEnum {
-
- /*1=白色、2=黑色、3=银色、4=灰色、5=红色、6=蓝色、7=绿色、8=黄色、9=金色、10=紫色、11=橙色、12=其他*/
-
- WHITE(1, "白色"),
- BLACK(2, "黑色"),
- SILVERY(3, "银色"),
- GREY(4, "灰色"),
- RED(5, "红色"),
- BLUE(6, "蓝色"),
- GREEN(7, "绿色"),
- YELLOW(8, "黄色"),
- GOLDEN(9, "金色"),
- PURPLE(10, "紫色"),
- ORANGE(11, "橙色"),
- OTHER(12, "其他");
-
- @Getter
- private String desc;
-
-
- @Getter
- private int code;
-
-
- CarColorEnum(int code, String desc) {
- this.code = code;
- this.desc = desc;
- }
-
- /**
- * 通过code获取枚举
- *
- * @param code
- * @return
- */
- public static CarColorEnum fromCode(Integer code) {
- CarColorEnum[] resultTypes = CarColorEnum.values();
- for (CarColorEnum resultType : resultTypes) {
- if (code.equals(resultType.getCode())) {
- return resultType;
- }
- }
- return null;
- }
-
-}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/CarStateEnum.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/CarStateEnum.java
deleted file mode 100644
index 7c67e22..0000000
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/CarStateEnum.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.ruoyi.common.core.enums;
-
-import lombok.Getter;
-
-/**
- * @Description
- * @Author xiaochen
- * @Date 2023/6/8 16:42
- */
-public enum CarStateEnum {
-
- /*状态1= 待上户、2=待办证、3=待整备、4=待租、5=已租、6=已处置*/
-
- PENDING_REGISTRATION(1, "待上户"),
- PENDING_CERTIFICATE(2, "待办证"),
- TO_BE_PREPARED(3, "待整备"),
- FOR_RENT(4, "待租"),
- RENTED(5, "已租"),
- DISPOSED(6, "已处置");
-
- @Getter
- private String desc;
-
-
- @Getter
- private int code;
-
-
- CarStateEnum(int code, String desc) {
- this.code = code;
- this.desc = desc;
- }
-
- /**
- * 通过code获取枚举
- *
- * @param code
- * @return
- */
- public static CarStateEnum fromCode(Integer code) {
- CarStateEnum[] resultTypes = CarStateEnum.values();
- for (CarStateEnum resultType : resultTypes) {
- if (code.equals(resultType.getCode())) {
- return resultType;
- }
- }
- return null;
- }
-
-}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/CollectionTypeEnum.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/CollectionTypeEnum.java
new file mode 100644
index 0000000..23d7cb1
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/CollectionTypeEnum.java
@@ -0,0 +1,41 @@
+package com.ruoyi.common.core.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import com.fasterxml.jackson.annotation.JsonValue;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+
+@Getter
+@AllArgsConstructor
+public enum CollectionTypeEnum {
+
+ /*收藏类型1=商城商品 2=资讯文章 3=普通拍品*/
+
+ MALL_PRODUCTS(1, "商城商品"),
+ INFORMATION_ARTICLES(2, "资讯文章"),
+ REGULAR_ITEMS(3, "普通拍品");
+
+ @EnumValue
+ private final int code;
+ @JsonValue
+ private final String desc;
+
+
+ /**
+ * 通过code获取枚举
+ *
+ * @param code
+ * @return
+ */
+ public static CollectionTypeEnum fromCode(Integer code) {
+ CollectionTypeEnum[] resultTypes = CollectionTypeEnum.values();
+ for (CollectionTypeEnum resultType : resultTypes) {
+ if (code.equals(resultType.getCode())) {
+ return resultType;
+ }
+ }
+ return null;
+ }
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/ContractStateEnum.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/ContractStateEnum.java
deleted file mode 100644
index 279a8a3..0000000
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/ContractStateEnum.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.ruoyi.common.core.enums;
-
-import lombok.Getter;
-
-/**
- * @Description
- * @Author xiaochen
- * @Date 2023/6/8 16:42
- */
-public enum ContractStateEnum {
-
- /*合同状态 1签约中 2审批拒绝 3续约中 4待执行 5执行中 6结算中 7已结束 8已作废 9即将到期 10已到期 11已撤销*/
-
- SIGNING(1, "签约中"),
- APPROVAL_REJECTION(2, "审批拒绝"),
- UNDER_RENEWAL(3, "续约中"),
- TO_BE_EXECUTED(4, "待执行"),
- UNDER_EXECUTION(5, "执行中"),
- SETTLEMENT_PROGRESS(6, "结算中"),
- ENDED(7, "已结束"),
- VOIDED(8, "已作废"),
- DUE(9, "即将到期"),
- EXPIRED(10, "已到期"),
- REVOKED(11, "已撤销");
-
- @Getter
- private String desc;
-
-
- @Getter
- private int code;
-
-
- ContractStateEnum(int code, String desc) {
- this.code = code;
- this.desc = desc;
- }
-
- /**
- * 通过code获取枚举
- *
- * @param code
- * @return
- */
- public static ContractStateEnum fromCode(Integer code) {
- ContractStateEnum[] resultTypes = ContractStateEnum.values();
- for (ContractStateEnum resultType : resultTypes) {
- if (code.equals(resultType.getCode())) {
- return resultType;
- }
- }
- return null;
- }
-
-}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/ContractTypeEnum.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/ContractTypeEnum.java
deleted file mode 100644
index f566b01..0000000
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/ContractTypeEnum.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.ruoyi.common.core.enums;
-
-import lombok.Getter;
-
-/**
- * @Description
- * @Author xiaochen
- * @Date 2023/6/8 16:42
- */
-public enum ContractTypeEnum {
-
- /*合同类型 1=纯租 2=以租代购 3=打工模式*/
- PURE_RENT(1, "纯租"),
- CAR_LEASE(2, "以租代购"),
- WORKING_MODE(3, "打工模式");
-
- @Getter
- private String desc;
-
-
- @Getter
- private int code;
-
-
- ContractTypeEnum(int code, String desc) {
- this.code = code;
- this.desc = desc;
- }
-
- /**
- * 通过code获取枚举
- *
- * @param code
- * @return
- */
- public static ContractTypeEnum fromCode(Integer code) {
- ContractTypeEnum[] resultTypes = ContractTypeEnum.values();
- for (ContractTypeEnum resultType : resultTypes) {
- if (code.equals(resultType.getCode())) {
- return resultType;
- }
- }
- return null;
- }
-
-}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/CouponStatusEnum.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/CouponStatusEnum.java
new file mode 100644
index 0000000..8fa8d1f
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/CouponStatusEnum.java
@@ -0,0 +1,40 @@
+package com.ruoyi.common.core.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import com.fasterxml.jackson.annotation.JsonValue;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+
+@Getter
+@AllArgsConstructor
+public enum CouponStatusEnum {
+
+ /* 优惠券状态 -1删除 0已过期 1已领取 2已使用*/
+ DELETED(-1, "删除"),
+ EXPIRED(0, "已过期 "),
+ RECEIVED(1, "已领取"),
+ USED(2, "已使用");
+ @EnumValue
+ private final int code;
+ @JsonValue
+ private final String desc;
+
+
+ /**
+ * 通过code获取枚举
+ *
+ * @param code
+ * @return
+ */
+ public static CouponStatusEnum fromCode(Integer code) {
+ CouponStatusEnum[] resultTypes = CouponStatusEnum.values();
+ for (CouponStatusEnum resultType : resultTypes) {
+ if (code.equals(resultType.getCode())) {
+ return resultType;
+ }
+ }
+ return null;
+ }
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/CouponTypeEnum.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/CouponTypeEnum.java
new file mode 100644
index 0000000..c6a9080
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/CouponTypeEnum.java
@@ -0,0 +1,40 @@
+package com.ruoyi.common.core.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import com.fasterxml.jackson.annotation.JsonValue;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+
+@Getter
+@AllArgsConstructor
+public enum CouponTypeEnum {
+
+ /* 优惠券类型 1=满减券 2=代金券 3=折扣券*/
+
+ FULL_REDUCTION_COUPON(1, "满减券"),
+ CASH_COUPON(2, "代金券"),
+ COUPON(3, "折扣券");
+ @EnumValue
+ private final int code;
+ @JsonValue
+ private final String desc;
+
+
+ /**
+ * 通过code获取枚举
+ *
+ * @param code
+ * @return
+ */
+ public static CouponTypeEnum fromCode(Integer code) {
+ CouponTypeEnum[] resultTypes = CouponTypeEnum.values();
+ for (CouponTypeEnum resultType : resultTypes) {
+ if (code.equals(resultType.getCode())) {
+ return resultType;
+ }
+ }
+ return null;
+ }
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/GenderEnum.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/GenderEnum.java
new file mode 100644
index 0000000..7cdfee6
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/GenderEnum.java
@@ -0,0 +1,40 @@
+package com.ruoyi.common.core.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import com.fasterxml.jackson.annotation.JsonValue;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+
+@Getter
+@AllArgsConstructor
+public enum GenderEnum {
+
+ /* 性别 0=女,1=男,2=未知*/
+
+ FEMALE(0, "女"),
+ MALE(1, "男"),
+ UNKNOWN(2, "未知");
+ @EnumValue
+ private final int code;
+ @JsonValue
+ private final String desc;
+
+
+ /**
+ * 通过code获取枚举
+ *
+ * @param code
+ * @return
+ */
+ public static GenderEnum fromCode(Integer code) {
+ GenderEnum[] resultTypes = GenderEnum.values();
+ for (GenderEnum resultType : resultTypes) {
+ if (code.equals(resultType.getCode())) {
+ return resultType;
+ }
+ }
+ return null;
+ }
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/GroupStatusEnum.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/GroupStatusEnum.java
new file mode 100644
index 0000000..50abb01
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/GroupStatusEnum.java
@@ -0,0 +1,40 @@
+package com.ruoyi.common.core.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import com.fasterxml.jackson.annotation.JsonValue;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+
+@Getter
+@AllArgsConstructor
+public enum GroupStatusEnum {
+
+ /* 成团状态 0=待成团 1=已成团 2=成团失败*/
+
+ TO_FORM_A_GROUP(0, "待成团"),
+ FORMED_INTO_A_GROUP(1, "已成团"),
+ GROUP_FAILURE(2, "成团失败");
+ @EnumValue
+ private final int code;
+ @JsonValue
+ private final String desc;
+
+
+ /**
+ * 通过code获取枚举
+ *
+ * @param code
+ * @return
+ */
+ public static GroupStatusEnum fromCode(Integer code) {
+ GroupStatusEnum[] resultTypes = GroupStatusEnum.values();
+ for (GroupStatusEnum resultType : resultTypes) {
+ if (code.equals(resultType.getCode())) {
+ return resultType;
+ }
+ }
+ return null;
+ }
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/HandoverStateEnum.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/HandoverStateEnum.java
deleted file mode 100644
index e8b13fa..0000000
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/HandoverStateEnum.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.ruoyi.common.core.enums;
-
-import lombok.Getter;
-
-/**
- * @Description
- * @Author xiaochen
- * @Date 2023/6/8 16:42
- */
-public enum HandoverStateEnum {
-
- /*交车状态 1待交车 2待审批 3已交车 4审批拒绝*/
-
- VEHICLE_DELIVERED(1, "待交车"),
- PENDING_APPROVAL(2, "待审批"),
- DELIVERED(3, "已交车"),
- APPROVAL_REJECTION(4, "审批拒绝"),
- REVOKED(5, "已撤销");
-
- @Getter
- private String desc;
-
-
- @Getter
- private int code;
-
-
- HandoverStateEnum(int code, String desc) {
- this.code = code;
- this.desc = desc;
- }
-
- /**
- * 通过code获取枚举
- *
- * @param code
- * @return
- */
- public static HandoverStateEnum fromCode(Integer code) {
- HandoverStateEnum[] resultTypes = HandoverStateEnum.values();
- for (HandoverStateEnum resultType : resultTypes) {
- if (code.equals(resultType.getCode())) {
- return resultType;
- }
- }
- return null;
- }
-
-}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/ImportTypeEnum.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/ImportTypeEnum.java
deleted file mode 100644
index 34f21bc..0000000
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/ImportTypeEnum.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.ruoyi.common.core.enums;
-
-import lombok.Getter;
-
-/**
- * @Description
- * @Author xiaochen
- * @Date 2023/6/8 16:42
- */
-public enum ImportTypeEnum {
-
- /*1=新车车辆导入 、2=已有车辆导入、3=上户导入、4=设备导入、5=违章导入、6=违章图片导入、7=保养记录导入、8=保单导入、9=合同导入*/
-
- NEW_CAR(1, "新车车辆导入"),
- EXIST_CAR(2, "已有车辆导入"),
- WEALTHY(3, "上户导入"),
- DEVICE(4, "设备导入"),
- VIOLATION(5, "违章导入"),
- VIOLATION_PICTURE(6, "违章图片导入"),
- SERVICE(7, "保养记录导入"),
- WARRANTY(8, "保单导入"),
- CONTRACT(9, "合同导入"),
- CERTIFICATE(10, "办证导入"),
- INSPECTANNUALLY(11, "车辆年检导入"),
- MAINTENANCE(12, "车辆维修导入");
-
- @Getter
- private String desc;
-
-
- @Getter
- private int code;
-
-
- ImportTypeEnum(int code, String desc) {
- this.code = code;
- this.desc = desc;
- }
-
- /**
- * 通过code获取枚举
- *
- * @param code
- * @return
- */
- public static ImportTypeEnum fromCode(Integer code) {
- ImportTypeEnum[] resultTypes = ImportTypeEnum.values();
- for (ImportTypeEnum resultType : resultTypes) {
- if (code.equals(resultType.getCode())) {
- return resultType;
- }
- }
- return null;
- }
-
-}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/InvoiceTypeEnum.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/InvoiceTypeEnum.java
new file mode 100644
index 0000000..9590c08
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/InvoiceTypeEnum.java
@@ -0,0 +1,39 @@
+package com.ruoyi.common.core.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import com.fasterxml.jackson.annotation.JsonValue;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+
+@Getter
+@AllArgsConstructor
+public enum InvoiceTypeEnum {
+
+ /*发票类型 1=普票 2=专票*/
+
+ UNIVERSAL_TICKET(1, "普票"),
+ SPECIAL_TICKET(2, "专票");
+ @EnumValue
+ private final int code;
+ @JsonValue
+ private final String desc;
+
+
+ /**
+ * 通过code获取枚举
+ *
+ * @param code
+ * @return
+ */
+ public static InvoiceTypeEnum fromCode(Integer code) {
+ InvoiceTypeEnum[] resultTypes = InvoiceTypeEnum.values();
+ for (InvoiceTypeEnum resultType : resultTypes) {
+ if (code.equals(resultType.getCode())) {
+ return resultType;
+ }
+ }
+ return null;
+ }
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/ListingStatusEnum.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/ListingStatusEnum.java
new file mode 100644
index 0000000..2574b5e
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/ListingStatusEnum.java
@@ -0,0 +1,39 @@
+package com.ruoyi.common.core.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import com.fasterxml.jackson.annotation.JsonValue;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+
+@Getter
+@AllArgsConstructor
+public enum ListingStatusEnum {
+
+ /*上架状态 0=上架中 1=已下架*/
+
+ ON_SHELVES(0, "上架中"),
+ REMOVED_FROM_THE_SHELF(1, "已下架");
+ @EnumValue
+ private final int code;
+ @JsonValue
+ private final String desc;
+
+
+ /**
+ * 通过code获取枚举
+ *
+ * @param code
+ * @return
+ */
+ public static ListingStatusEnum fromCode(Integer code) {
+ ListingStatusEnum[] resultTypes = ListingStatusEnum.values();
+ for (ListingStatusEnum resultType : resultTypes) {
+ if (code.equals(resultType.getCode())) {
+ return resultType;
+ }
+ }
+ return null;
+ }
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/OrderFromEnum.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/OrderFromEnum.java
new file mode 100644
index 0000000..763b56d
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/OrderFromEnum.java
@@ -0,0 +1,42 @@
+package com.ruoyi.common.core.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import com.fasterxml.jackson.annotation.JsonValue;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+
+@Getter
+@AllArgsConstructor
+public enum OrderFromEnum {
+
+ /* 订单来源 1=商品订单 2=秒杀订单 3=团购订单 4=保证金 5=拍卖订单*/
+
+ COMMODITY_ORDER(1, "商品订单"),
+ SNAP_ORDERS(2, "秒杀订单"),
+ GROUP_PURCHASE_ORDERS(3, "团购订单"),
+ BOND(4, "保证金"),
+ AUCTION_ORDERS(5, "拍卖订单");
+ @EnumValue
+ private final int code;
+ @JsonValue
+ private final String desc;
+
+
+ /**
+ * 通过code获取枚举
+ *
+ * @param code
+ * @return
+ */
+ public static OrderFromEnum fromCode(Integer code) {
+ OrderFromEnum[] resultTypes = OrderFromEnum.values();
+ for (OrderFromEnum resultType : resultTypes) {
+ if (code.equals(resultType.getCode())) {
+ return resultType;
+ }
+ }
+ return null;
+ }
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/OrderStatusEnum.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/OrderStatusEnum.java
new file mode 100644
index 0000000..f63e689
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/OrderStatusEnum.java
@@ -0,0 +1,42 @@
+package com.ruoyi.common.core.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import com.fasterxml.jackson.annotation.JsonValue;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+
+@Getter
+@AllArgsConstructor
+public enum OrderStatusEnum {
+
+ /*订单状态 1=待发货 2=待收货 3=已完成 4=已取消*/
+
+ TO_BE_SHIPPED(1, "待发货"),
+ GOODS_TO_BE_RECEIVED(2, "待收货"),
+ FINISHED(3, "已完成"),
+ CANCELED(4, "已取消");
+
+ @EnumValue
+ private final int code;
+ @JsonValue
+ private final String desc;
+
+
+ /**
+ * 通过code获取枚举
+ *
+ * @param code
+ * @return
+ */
+ public static OrderStatusEnum fromCode(Integer code) {
+ OrderStatusEnum[] resultTypes = OrderStatusEnum.values();
+ for (OrderStatusEnum resultType : resultTypes) {
+ if (code.equals(resultType.getCode())) {
+ return resultType;
+ }
+ }
+ return null;
+ }
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/PaymentMethodEnum.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/PaymentMethodEnum.java
new file mode 100644
index 0000000..eb2c956
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/PaymentMethodEnum.java
@@ -0,0 +1,39 @@
+package com.ruoyi.common.core.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import com.fasterxml.jackson.annotation.JsonValue;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+
+@Getter
+@AllArgsConstructor
+public enum PaymentMethodEnum {
+
+ /* 支付方式 1=微信 2=支付宝*/
+
+ WECHAT(1, "男"),
+ ALIPAY(2, "未知");
+ @EnumValue
+ private final int code;
+ @JsonValue
+ private final String desc;
+
+
+ /**
+ * 通过code获取枚举
+ *
+ * @param code
+ * @return
+ */
+ public static PaymentMethodEnum fromCode(Integer code) {
+ PaymentMethodEnum[] resultTypes = PaymentMethodEnum.values();
+ for (PaymentMethodEnum resultType : resultTypes) {
+ if (code.equals(resultType.getCode())) {
+ return resultType;
+ }
+ }
+ return null;
+ }
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/PurchaseStateEnum.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/PurchaseStateEnum.java
deleted file mode 100644
index 538ec4c..0000000
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/PurchaseStateEnum.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.ruoyi.common.core.enums;
-
-import lombok.Getter;
-
-/**
- * @Description
- * @Author xiaochen
- * @Date 2023/6/8 16:42
- */
-public enum PurchaseStateEnum {
-
- /*购买状态 1在保 2停保 3复保 4脱保*/
-
- UNDER_PROTECTION(1, "在保"),
- SUSPENSION_MAINTENANCE(2, "停保"),
- REINSURANCE(3, "复保"),
- DELISTING(4, "脱保");
-
- @Getter
- private String desc;
-
-
- @Getter
- private int code;
-
-
- PurchaseStateEnum(int code, String desc) {
- this.code = code;
- this.desc = desc;
- }
-
- /**
- * 通过code获取枚举
- *
- * @param code
- * @return
- */
- public static PurchaseStateEnum fromCode(Integer code) {
- PurchaseStateEnum[] resultTypes = PurchaseStateEnum.values();
- for (PurchaseStateEnum resultType : resultTypes) {
- if (code.equals(resultType.getCode())) {
- return resultType;
- }
- }
- return null;
- }
-
-}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/RequestTypeEnum.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/RequestTypeEnum.java
new file mode 100644
index 0000000..c81f4fa
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/RequestTypeEnum.java
@@ -0,0 +1,39 @@
+package com.ruoyi.common.core.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import com.fasterxml.jackson.annotation.JsonValue;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+
+@Getter
+@AllArgsConstructor
+public enum RequestTypeEnum {
+
+ /*售后类型 1=退款 2=退款退货*/
+
+ REFUND(1, "退款"),
+ REFUNDS_AND_RETURNS(2, "退款退货");
+ @EnumValue
+ private final int code;
+ @JsonValue
+ private final String desc;
+
+
+ /**
+ * 通过code获取枚举
+ *
+ * @param code
+ * @return
+ */
+ public static RequestTypeEnum fromCode(Integer code) {
+ RequestTypeEnum[] resultTypes = RequestTypeEnum.values();
+ for (RequestTypeEnum resultType : resultTypes) {
+ if (code.equals(resultType.getCode())) {
+ return resultType;
+ }
+ }
+ return null;
+ }
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/ReturnCarTypeEnum.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/ReturnCarTypeEnum.java
deleted file mode 100644
index bdce874..0000000
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/ReturnCarTypeEnum.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.ruoyi.common.core.enums;
-
-import lombok.Getter;
-
-/**
- * @Description
- * @Author xiaochen
- * @Date 2023/6/8 16:42
- */
-public enum ReturnCarTypeEnum {
-
- /*合同类型 合同到期、提前退车、强制收车*/
- EXPIRE(1, "合同到期"),
- EARLY_WITHDRAWAL(2, "提前退车"),
- COMPULSORY_COLLECTION(3, "强制收车");
-
- @Getter
- private String desc;
-
-
- @Getter
- private int code;
-
-
- ReturnCarTypeEnum(int code, String desc) {
- this.code = code;
- this.desc = desc;
- }
-
- /**
- * 通过code获取枚举
- *
- * @param code
- * @return
- */
- public static ReturnCarTypeEnum fromCode(Integer code) {
- ReturnCarTypeEnum[] resultTypes = ReturnCarTypeEnum.values();
- for (ReturnCarTypeEnum resultType : resultTypes) {
- if (code.equals(resultType.getCode())) {
- return resultType;
- }
- }
- return null;
- }
-
-}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/ReturnRequestStatusEnum.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/ReturnRequestStatusEnum.java
new file mode 100644
index 0000000..a21cd15
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/ReturnRequestStatusEnum.java
@@ -0,0 +1,42 @@
+package com.ruoyi.common.core.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import com.fasterxml.jackson.annotation.JsonValue;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+
+@Getter
+@AllArgsConstructor
+public enum ReturnRequestStatusEnum {
+
+ /*售后状态 1=待审核 2=待退货 3=待平台收货 4=已完成 5=已拒绝*/
+
+ TO_BE_REVIEWED(1, "待审核"),
+ TO_BE_RETURNED(2, "待退货"),
+ TO_BE_RECEIVED_BY_THE_PLATFORM(3, "待平台收货"),
+ COMPLETED(4, "已完成"),
+ REJECTED(5, "已拒绝");
+ @EnumValue
+ private final int code;
+ @JsonValue
+ private final String desc;
+
+
+ /**
+ * 通过code获取枚举
+ *
+ * @param code
+ * @return
+ */
+ public static ReturnRequestStatusEnum fromCode(Integer code) {
+ ReturnRequestStatusEnum[] resultTypes = ReturnRequestStatusEnum.values();
+ for (ReturnRequestStatusEnum resultType : resultTypes) {
+ if (code.equals(resultType.getCode())) {
+ return resultType;
+ }
+ }
+ return null;
+ }
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/ReturnStateEnum.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/ReturnStateEnum.java
deleted file mode 100644
index 7914cdc..0000000
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/ReturnStateEnum.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.ruoyi.common.core.enums;
-
-import lombok.Getter;
-
-/**
- * @Description
- * @Author xiaochen
- * @Date 2023/6/8 16:42
- */
-public enum ReturnStateEnum {
-
- /*退车状态 1=待验车 2=待生成账单 3=待审批 4=已退车 5=审批拒绝*/
-
- VEHICLE_INSPECTED(1, "待验车"),
- PENDING_BILL_GENERATION(2, "待生成账单"),
- PENDING_APPROVAL(3, "待审批"),
- RETURNED_VEHICLE(4, "已退车"),
- APPROVAL_REJECTION(5, "审批拒绝"),
- REVOKED(6, "已撤销");
-
- @Getter
- private String desc;
-
-
- @Getter
- private int code;
-
-
- ReturnStateEnum(int code, String desc) {
- this.code = code;
- this.desc = desc;
- }
-
- /**
- * 通过code获取枚举
- *
- * @param code
- * @return
- */
- public static ReturnStateEnum fromCode(Integer code) {
- ReturnStateEnum[] resultTypes = ReturnStateEnum.values();
- for (ReturnStateEnum resultType : resultTypes) {
- if (code.equals(resultType.getCode())) {
- return resultType;
- }
- }
- return null;
- }
-
-}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/StartStatusEnum.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/StartStatusEnum.java
new file mode 100644
index 0000000..788f6b8
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/StartStatusEnum.java
@@ -0,0 +1,40 @@
+package com.ruoyi.common.core.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import com.fasterxml.jackson.annotation.JsonValue;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+
+@Getter
+@AllArgsConstructor
+public enum StartStatusEnum {
+
+ /*开始状态 0=未开始 1=已开始 2=已结束*/
+
+ NOT_STARTED(0, "未开始"),
+ STARTED(1, "已开始"),
+ ENDED(1, "已结束");
+ @EnumValue
+ private final int code;
+ @JsonValue
+ private final String desc;
+
+
+ /**
+ * 通过code获取枚举
+ *
+ * @param code
+ * @return
+ */
+ public static StartStatusEnum fromCode(Integer code) {
+ StartStatusEnum[] resultTypes = StartStatusEnum.values();
+ for (StartStatusEnum resultType : resultTypes) {
+ if (code.equals(resultType.getCode())) {
+ return resultType;
+ }
+ }
+ return null;
+ }
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/TitleTypeEnum.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/TitleTypeEnum.java
new file mode 100644
index 0000000..b629818
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/TitleTypeEnum.java
@@ -0,0 +1,39 @@
+package com.ruoyi.common.core.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import com.fasterxml.jackson.annotation.JsonValue;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+
+@Getter
+@AllArgsConstructor
+public enum TitleTypeEnum {
+
+ /*抬头类型 1=企业单位 2=个人/非企业单位*/
+
+ ENTERPRISE_UNIT(1, "企业单位"),
+ NON_ENTERPRISE_UNITS(2, "个人/非企业单位");
+ @EnumValue
+ private final int code;
+ @JsonValue
+ private final String desc;
+
+
+ /**
+ * 通过code获取枚举
+ *
+ * @param code
+ * @return
+ */
+ public static TitleTypeEnum fromCode(Integer code) {
+ TitleTypeEnum[] resultTypes = TitleTypeEnum.values();
+ for (TitleTypeEnum resultType : resultTypes) {
+ if (code.equals(resultType.getCode())) {
+ return resultType;
+ }
+ }
+ return null;
+ }
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/WarrantyStateEnum.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/WarrantyStateEnum.java
deleted file mode 100644
index cad7e1b..0000000
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/WarrantyStateEnum.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.ruoyi.common.core.enums;
-
-import lombok.Getter;
-
-/**
- * @Description
- * @Author xiaochen
- * @Date 2023/6/8 16:42
- */
-public enum WarrantyStateEnum {
-
- /*保单状态 1正常 2已脱保 3已停保 4即将到期 5建议停保*/
-
- NORMAL(1, "正常"),
- DELISTED(2, "已脱保"),
- DISCONTINUED_WARRANTY(3, "已停保"),
- DUE(4, "即将到期"),
- SUGGEST_DISCONTINUING_MAINTENANCE(5, "建议停保");
-
- @Getter
- private String desc;
-
-
- @Getter
- private int code;
-
-
- WarrantyStateEnum(int code, String desc) {
- this.code = code;
- this.desc = desc;
- }
-
- /**
- * 通过code获取枚举
- *
- * @param code
- * @return
- */
- public static WarrantyStateEnum fromCode(Integer code) {
- WarrantyStateEnum[] resultTypes = WarrantyStateEnum.values();
- for (WarrantyStateEnum resultType : resultTypes) {
- if (code.equals(resultType.getCode())) {
- return resultType;
- }
- }
- return null;
- }
-
-}
diff --git a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/domain/pojo/Article.java b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/domain/pojo/Article.java
index 3260ff0..69a5dd3 100644
--- a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/domain/pojo/Article.java
+++ b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/domain/pojo/Article.java
@@ -6,6 +6,8 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.enums.ArticleTypeEnum;
+import com.ruoyi.common.core.enums.AuditStatusEnum;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
@@ -36,7 +38,7 @@
private Long id;
@ApiModelProperty(value = "资讯类型 1=平台发布 2=用户发布")
- private Integer articleType;
+ private ArticleTypeEnum articleType;
@ApiModelProperty(value = "资讯标题")
private String title;
@@ -50,11 +52,8 @@
@ApiModelProperty(value = "资讯视频")
private String videoUrl;
- @ApiModelProperty(value = "状态 1=待审核 2=已通过 3=已拒绝")
- private Integer status;
-
- @ApiModelProperty(value = "举报状态 0=正常 1=被举报")
- private Integer reportStatus;
+ @ApiModelProperty(value = "状态 1=待审核 2=已通过 3=已拒绝 4被举报")
+ private AuditStatusEnum status;
@ApiModelProperty(value = "举报用户")
private String reportBy;
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/domain/pojo/AuctionBidRecord.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/domain/pojo/AuctionBidRecord.java
index ef21bee..8b9aabb 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/domain/pojo/AuctionBidRecord.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/domain/pojo/AuctionBidRecord.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.enums.BidStatusEnum;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
@@ -58,7 +59,7 @@
private BigDecimal lastBidAmount;
@ApiModelProperty(value = "开始状态 0=淘汰 1=领先")
- private Integer status;
+ private BidStatusEnum status;
@ApiModelProperty(value = "创建者")
@TableField(value = "create_by", fill = FieldFill.INSERT)
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/domain/pojo/AuctionGoods.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/domain/pojo/AuctionGoods.java
index 2a2c2bb..109840b 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/domain/pojo/AuctionGoods.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/domain/pojo/AuctionGoods.java
@@ -6,6 +6,9 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.enums.AuctionStartStatusEnum;
+import com.ruoyi.common.core.enums.AuthenticationEnum;
+import com.ruoyi.common.core.enums.ListingStatusEnum;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
@@ -61,16 +64,16 @@
private BigDecimal bond;
@ApiModelProperty(value = "实名认证 0=不需实名 1=需要实名")
- private Integer authentication;
+ private AuthenticationEnum authentication;
@ApiModelProperty(value = "拍品说明")
private String description;
@ApiModelProperty(value = "上架状态 0=上架中 1=已下架")
- private Integer listingStatus;
+ private ListingStatusEnum listingStatus;
@ApiModelProperty(value = "开始状态 0=预展中 1=拍卖中 2=已结束")
- private Integer startStatus;
+ private AuctionStartStatusEnum startStatus;
@ApiModelProperty(value = "创建者")
@TableField(value = "create_by", fill = FieldFill.INSERT)
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/domain/pojo/AuctionSalesroom.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/domain/pojo/AuctionSalesroom.java
index b02cf42..2b3d7fa 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/domain/pojo/AuctionSalesroom.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/domain/pojo/AuctionSalesroom.java
@@ -6,6 +6,9 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.enums.AuctionStartStatusEnum;
+import com.ruoyi.common.core.enums.AuctionTypeEnum;
+import com.ruoyi.common.core.enums.AuthenticationEnum;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
@@ -42,13 +45,13 @@
private LocalDateTime startTime;
@ApiModelProperty(value = "拍卖时间 0=线下拍卖 1=线上线下结合")
- private Integer type;
+ private AuctionTypeEnum type;
@ApiModelProperty(value = "保证金")
private BigDecimal bound;
@ApiModelProperty(value = "实名认证 0=不需认证 1=需要实名")
- private Integer authentication;
+ private AuthenticationEnum authentication;
@ApiModelProperty(value = "拍卖场说明")
private String description;
@@ -63,7 +66,7 @@
private String sharePic;
@ApiModelProperty(value = "拍卖状态 0=预展中 1=拍卖中 2=已结束")
- private Integer status;
+ private AuctionStartStatusEnum status;
@ApiModelProperty(value = "拍卖场二维码")
private String auctionSalesroomQrcode;
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/domain/pojo/AuctionSalesroomGoods.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/domain/pojo/AuctionSalesroomGoods.java
index 740230d..a1e4033 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/domain/pojo/AuctionSalesroomGoods.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/domain/pojo/AuctionSalesroomGoods.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.enums.AuctionStartStatusEnum;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
@@ -64,7 +65,7 @@
private Boolean backupStatus;
@ApiModelProperty(value = "状态 0=预展中 1=拍卖中 2=已结束")
- private Integer status;
+ private AuctionStartStatusEnum status;
@ApiModelProperty(value = "创建者")
@TableField(value = "create_by", fill = FieldFill.INSERT)
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/domain/pojo/AuctionVideo.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/domain/pojo/AuctionVideo.java
index f3308dc..45ed34f 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/domain/pojo/AuctionVideo.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/domain/pojo/AuctionVideo.java
@@ -1,12 +1,12 @@
package com.ruoyi.auction.domain.pojo;
-import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
-import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.time.LocalDateTime;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
@@ -29,7 +29,7 @@
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "拍卖会视频id")
- @TableId(value = "id", type = IdType.ID_WORKER)
+ @TableId(value = "id", type = IdType.ASSIGN_ID)
private Long id;
@ApiModelProperty(value = "视频id")
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/pojo/GoodsGroupPurchase.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/pojo/GoodsGroupPurchase.java
index 6a933d5..cb80e97 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/pojo/GoodsGroupPurchase.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/pojo/GoodsGroupPurchase.java
@@ -6,6 +6,9 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.enums.GroupStatusEnum;
+import com.ruoyi.common.core.enums.ListingStatusEnum;
+import com.ruoyi.common.core.enums.StartStatusEnum;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
@@ -78,15 +81,15 @@
@ApiModelProperty(value = "开始状态 0=未开始 1=已开始 2=已结束 ")
@TableField("start_status")
- private Integer startStatus;
+ private StartStatusEnum startStatus;
@ApiModelProperty(value = "上架状态 0=已上架 1=已下架")
@TableField("listing_status")
- private Integer listingStatus;
+ private ListingStatusEnum listingStatus;
@ApiModelProperty(value = "成团状态 0=待成团 1=已成团 2=成团失败")
@TableField("group_status")
- private Integer groupStatus;
+ private GroupStatusEnum groupStatus;
@ApiModelProperty(value = "创建者")
@TableField(value = "create_by", fill = FieldFill.INSERT)
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/pojo/GoodsSeckill.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/pojo/GoodsSeckill.java
index ffdb897..0cae2f2 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/pojo/GoodsSeckill.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/pojo/GoodsSeckill.java
@@ -6,6 +6,8 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.enums.ListingStatusEnum;
+import com.ruoyi.common.core.enums.StartStatusEnum;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
@@ -70,10 +72,10 @@
private LocalDateTime endTime;
@ApiModelProperty(value = "开始状态 0=未开始 1= 已开始 2=已结束")
- private Integer startStatus;
+ private StartStatusEnum startStatus;
@ApiModelProperty(value = "上架状态 0=已上架 1=已下架")
- private Integer listingStatus;
+ private ListingStatusEnum listingStatus;
@ApiModelProperty(value = "创建者")
@TableField(value = "create_by", fill = FieldFill.INSERT)
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/pojo/GoodsSku.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/pojo/GoodsSku.java
index ad85471..ba046c9 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/pojo/GoodsSku.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/pojo/GoodsSku.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.enums.ListingStatusEnum;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
@@ -91,7 +92,7 @@
private Integer sortNum;
@ApiModelProperty(value = "上架状态 0=上架中 1= 已下架")
- private Integer listingStatus;
+ private ListingStatusEnum listingStatus;
@ApiModelProperty(value = "创建者")
@TableField(value = "create_by", fill = FieldFill.INSERT)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/Member.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/Member.java
index b605bdc..b713f54 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/Member.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/Member.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.enums.GenderEnum;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
@@ -32,7 +33,7 @@
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "会员id")
- @TableId(value = "id", type = IdType.INPUT)
+ @TableId(value = "id", type = IdType.ASSIGN_ID)
private Long id;
@ApiModelProperty(value = "会员昵称")
@@ -51,7 +52,7 @@
private String phone;
@ApiModelProperty(value = "性别 0=女,1=男,2=未知")
- private Integer gender;
+ private GenderEnum gender;
@ApiModelProperty(value = "等级")
private Integer level;
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/MemberCollection.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/MemberCollection.java
index 18d064c..5e2578b 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/MemberCollection.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/MemberCollection.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.enums.CollectionTypeEnum;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
@@ -35,7 +36,7 @@
private Long id;
@ApiModelProperty(value = "收藏类型1=商城商品 2=资讯文章 3=普通拍品")
- private Integer collectionType;
+ private CollectionTypeEnum collectionType;
@ApiModelProperty(value = "收藏目标id")
private Long targetId;
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/InvoicingApplication.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/InvoicingApplication.java
index 53582e4..28bf1b7 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/InvoicingApplication.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/InvoicingApplication.java
@@ -6,6 +6,9 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.enums.AuditStatusEnum;
+import com.ruoyi.common.core.enums.InvoiceTypeEnum;
+import com.ruoyi.common.core.enums.TitleTypeEnum;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
@@ -46,13 +49,13 @@
private LocalDateTime applyTime;
@ApiModelProperty(value = "状态 1=待审核 2=审核通过 3=已拒绝")
- private Integer status;
+ private AuditStatusEnum status;
@ApiModelProperty(value = "发票类型 1=普票 2=专票")
- private Integer invoiceType;
+ private InvoiceTypeEnum invoiceType;
@ApiModelProperty(value = "抬头类型 1=企业单位 2=个人/非企业单位")
- private Integer titleType;
+ private TitleTypeEnum titleType;
@ApiModelProperty(value = "公司名称")
private String companyName;
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/Order.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/Order.java
index 63e459a..20af828 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/Order.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/Order.java
@@ -6,6 +6,9 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.enums.OrderFromEnum;
+import com.ruoyi.common.core.enums.OrderStatusEnum;
+import com.ruoyi.common.core.enums.PaymentMethodEnum;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
@@ -43,7 +46,7 @@
private LocalDateTime orderTime;
@ApiModelProperty(value = "订单来源 1=商品订单 2=秒杀订单 3=团购订单 4=保证金 5=拍卖订单")
- private Integer orderFrom;
+ private OrderFromEnum orderFrom;
@ApiModelProperty(value = "会员id")
private Long memberId;
@@ -55,13 +58,13 @@
private String phoneNumber;
@ApiModelProperty(value = "支付方式 1=微信 2=支付宝")
- private Integer paymentMethod;
+ private PaymentMethodEnum paymentMethod;
@ApiModelProperty(value = "支付合计")
private BigDecimal totalAmount;
@ApiModelProperty(value = "订单状态 1=待发货 2=待收货 3=已完成 4=已取消")
- private Integer orderStatus;
+ private OrderStatusEnum orderStatus;
@ApiModelProperty(value = "支付时间")
private LocalDateTime payTime;
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/OrderReturnRequest.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/OrderReturnRequest.java
index 8aa07b2..a2a0864 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/OrderReturnRequest.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/OrderReturnRequest.java
@@ -6,6 +6,9 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.enums.AuditStatusEnum;
+import com.ruoyi.common.core.enums.RequestTypeEnum;
+import com.ruoyi.common.core.enums.ReturnRequestStatusEnum;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
@@ -42,16 +45,16 @@
private LocalDateTime requestTime;
@ApiModelProperty(value = "售后类型 1=退款 2=退款退货")
- private Integer requestType;
+ private RequestTypeEnum requestType;
@ApiModelProperty(value = "申请原因")
private String requestReason;
@ApiModelProperty(value = "售后状态 1=待审核 2=待退货 3=待平台收货 4=已完成 5=已拒绝")
- private Integer status;
+ private ReturnRequestStatusEnum status;
@ApiModelProperty(value = "审核状态 1=待审核 2=已通过 3=已拒绝")
- private Integer auditStatus;
+ private AuditStatusEnum auditStatus;
@ApiModelProperty(value = "拒绝理由")
private String refuseReason;
diff --git a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/domain/pojo/Coupon.java b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/domain/pojo/Coupon.java
index fb3e690..2ff1c78 100644
--- a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/domain/pojo/Coupon.java
+++ b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/domain/pojo/Coupon.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.enums.CouponTypeEnum;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
@@ -39,7 +40,7 @@
private String couponName;
@ApiModelProperty(value = "优惠券类型 1=满减券 2=代金券 3=折扣券")
- private Integer couponType;
+ private CouponTypeEnum couponType;
@ApiModelProperty(value = "状态 0=已上架 1=已下架")
private Integer couponStatus;
diff --git a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/domain/pojo/CouponMember.java b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/domain/pojo/CouponMember.java
index 2ad8c02..e34ae32 100644
--- a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/domain/pojo/CouponMember.java
+++ b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/domain/pojo/CouponMember.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.enums.CouponTypeEnum;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
@@ -43,7 +44,7 @@
private Long memberId;
@ApiModelProperty(value = "优惠券类型 1=满减券 2=代金券 3=折扣券")
- private Integer couponType;
+ private CouponTypeEnum couponType;
@ApiModelProperty(value = "优惠券状态-1删除0已过期1已领取2已使用")
private Integer couponStatus;
diff --git a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/domain/pojo/PromotionBanner.java b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/domain/pojo/PromotionBanner.java
index 01ecde4..bd4e6b7 100644
--- a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/domain/pojo/PromotionBanner.java
+++ b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/domain/pojo/PromotionBanner.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.enums.BannerTypeEnum;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
@@ -39,7 +40,7 @@
private String bannerName;
@ApiModelProperty(value = "轮播图类型 1=商城首页 2=资讯首页")
- private Integer bannerType;
+ private BannerTypeEnum bannerType;
@ApiModelProperty(value = "图片")
private String picUrl;
--
Gitblit v1.7.1