From 84f1e606d3cdd3733b0e92927bd46bf60ad93063 Mon Sep 17 00:00:00 2001
From: gongzuming <gongzuming>
Date: 星期五, 30 八月 2024 11:00:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2
---
src/main/java/com/mzl/flower/constant/Constants.java | 126 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 125 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/mzl/flower/constant/Constants.java b/src/main/java/com/mzl/flower/constant/Constants.java
index 7834f25..7f297c5 100644
--- a/src/main/java/com/mzl/flower/constant/Constants.java
+++ b/src/main/java/com/mzl/flower/constant/Constants.java
@@ -296,7 +296,9 @@
public enum SETTLEMENT_STATUS {
PENDING("待结算"),
- COMPLETED("已结算"),
+ PROCESSING("结算中"),
+ COMPLETED("结算成功"),
+ FAILED("结算失败"),
;
SETTLEMENT_STATUS(String desc) {
@@ -428,4 +430,126 @@
}
}
+ public enum POINT_GOODS_STATUS {
+ A("上架"),
+ I("下架");
+
+ POINT_GOODS_STATUS(String desc) {
+ this.desc = desc;
+ }
+
+ private String desc;
+
+ public String getDesc() {
+ return desc;
+ }
+ }
+
+ public enum POINT_GOOD_STATUS {
+ up("上架"),
+ off("下架");
+
+ POINT_GOOD_STATUS(String desc) {
+ this.desc = desc;
+ }
+
+ private String desc;
+
+ public String getDesc() {
+ return desc;
+ }
+ }
+
+ public enum POINT_CHANGE_TYPE {
+ add("增加"),
+ reduce("减少");
+
+ POINT_CHANGE_TYPE(String desc) {
+ this.desc = desc;
+ }
+
+ private String desc;
+
+ public String getDesc() {
+ return desc;
+ }
+ }
+
+
+ public enum POINT_TYPE {
+ consume("消费获取"),
+ activity("活动获取"),
+ giveaway("积分赠送"),
+ deduction("积分扣减"),
+ exchange("积分兑换");
+
+ POINT_TYPE(String desc) {
+ this.desc = desc;
+ }
+
+ private String desc;
+
+ public String getDesc() {
+ return desc;
+ }
+ }
+
+ public enum POINT_GOODS_RECORD_STATUS {
+ A("未使用"),
+ U("已使用"),
+ E("已过期");
+
+ POINT_GOODS_RECORD_STATUS(String desc) {
+ this.desc = desc;
+ }
+
+ private String desc;
+
+ public String getDesc() {
+ return desc;
+ }
+ }
+
+ public enum DISCOUNT_TYPE {
+ ratio("百分比"),
+ amount("固定金额");
+
+ DISCOUNT_TYPE(String desc) {
+ this.desc = desc;
+ }
+
+ private String desc;
+
+ public String getDesc() {
+ return desc;
+ }
+ }
+
+ public enum GROWTH_SOURCE {
+ sign("签到"), consume("消费");
+
+ GROWTH_SOURCE(String desc) {
+ this.desc = desc;
+ }
+
+ private String desc;
+
+ public String getDesc() {
+ return desc;
+ }
+ }
+
+ public enum GROWTH_TYPE {
+ add("新增"), reduce("扣除");
+
+ GROWTH_TYPE(String desc) {
+ this.desc = desc;
+ }
+
+ private String desc;
+
+ public String getDesc() {
+ return desc;
+ }
+ }
}
--
Gitblit v1.9.3