From b4aa242d1b818a8ad3a285166caedb699bbcb460 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期三, 23 十月 2024 10:51:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v4' into master-v4
---
src/main/java/com/mzl/flower/constant/Constants.java | 81 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 79 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/mzl/flower/constant/Constants.java b/src/main/java/com/mzl/flower/constant/Constants.java
index c25d452..49fe759 100644
--- a/src/main/java/com/mzl/flower/constant/Constants.java
+++ b/src/main/java/com/mzl/flower/constant/Constants.java
@@ -482,8 +482,10 @@
consume("消费获取"),
activity("活动获取"),
giveaway("积分赠送"),
+ sign("签到"),
deduction("积分扣减"),
- exchange("积分兑换");
+ exchange("积分兑换"),
+ expired("积分过期");
POINT_TYPE(String desc) {
this.desc = desc;
@@ -528,7 +530,7 @@
}
public enum GROWTH_SOURCE {
- sign("签到"), consume("消费");
+ sign("签到"), consume("消费"), downgrading("降级");
GROWTH_SOURCE(String desc) {
this.desc = desc;
@@ -554,4 +556,79 @@
return desc;
}
}
+ public enum after_sale_type {
+ quality("1.质量问题"),
+ stockout("2.缺货问题"),
+ broken("3.断头问题"),
+ category("4.品类不符"),
+ grade("5.等级不符"),
+ ;
+
+ after_sale_type(String desc) {
+ this.desc = desc;
+ }
+
+ private String desc;
+
+ public String getDesc() {
+ return desc;
+ }
+ }
+
+
+ public enum BILL_CHANGE_TYPE {
+ withdraw("提现"), settlement("结算");
+
+ BILL_CHANGE_TYPE(String desc) {
+ this.desc = desc;
+ }
+
+ private String desc;
+
+ public String getDesc() {
+ return desc;
+ }
+ }
+ public enum BILL_CHANGE_METHOD {
+ add("增加"), reduce("减少");
+
+ BILL_CHANGE_METHOD(String desc) {
+ this.desc = desc;
+ }
+
+ private String desc;
+
+ public String getDesc() {
+ return desc;
+ }
+ }
+
+ public enum WALLET_WITHDRAW_STATE {
+ WAITING("待审核"), APPROVE("已通过"),REJECT("已拒绝");
+
+ WALLET_WITHDRAW_STATE(String desc) {
+ this.desc = desc;
+ }
+
+ private String desc;
+
+ public String getDesc() {
+ return desc;
+ }
+ }
+
+ public enum WALLET_WITHDRAW_METHOD {
+ WEIXIN("微信");
+
+ WALLET_WITHDRAW_METHOD(String desc) {
+ this.desc = desc;
+ }
+
+ private String desc;
+
+ public String getDesc() {
+ return desc;
+ }
+ }
+
}
--
Gitblit v1.9.3