From be646da6a960105511e719e39deb9c52b3ff2b83 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期二, 03 九月 2024 10:03:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2
---
src/main/java/com/mzl/flower/constant/Constants.java | 48 +++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 47 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 a068578..eae0d70 100644
--- a/src/main/java/com/mzl/flower/constant/Constants.java
+++ b/src/main/java/com/mzl/flower/constant/Constants.java
@@ -10,6 +10,8 @@
public static final String DEFAULT_PASSWORD = "1234562";
+ public static final String DEFAULT_MEMBER_ID = "1"; //默认会员等级
+
/**
* 审核结果
@@ -481,7 +483,8 @@
activity("活动获取"),
giveaway("积分赠送"),
deduction("积分扣减"),
- exchange("积分兑换");
+ exchange("积分兑换"),
+ expired("积分过期");
POINT_TYPE(String desc) {
this.desc = desc;
@@ -509,4 +512,47 @@
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