From 0cfbaf9a439dc75824c52a6e58b6849064afbc80 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期六, 19 七月 2025 10:32:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/services/src/main/java/com/doumee/core/constants/Constants.java | 27 +++++++++++++++++++++++----
1 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/core/constants/Constants.java b/server/services/src/main/java/com/doumee/core/constants/Constants.java
index e54f6f7..c2f64ee 100644
--- a/server/services/src/main/java/com/doumee/core/constants/Constants.java
+++ b/server/services/src/main/java/com/doumee/core/constants/Constants.java
@@ -44,6 +44,9 @@
public static final String SERVER_INTRODUCE ="SERVER_INTRODUCE" ;
public static final String FEE_STANDARDS ="FEE_STANDARDS" ;
public static final String ABOUT_US ="ABOUT_US" ;
+ public static final String SERVER_PHONE ="SERVER_PHONE" ;
+ public static final String USER_AGREEMENT ="USER_AGREEMENT" ;
+ public static final String PRIVACY_AGREEMENT ="PRIVACY_AGREEMENT" ;
public static final String RELEASE_CANCEL_TIMES ="RELEASE_CANCEL_TIMES" ;
@@ -356,9 +359,9 @@
@Getter
public enum RevenueType {
- YGD_INCOME( 0, "鐢ㄥ伐鍗曟敹鍏�","鐢ㄥ伐鍗曟敹鍏�" ,0),
- HYD_INCOME( 1, "璐ц繍鍗曟敹鍏�","璐ц繍鍗曟敹鍏�" ,0),
- GCD_INCOME(2, "渚涢鍗曟敹鍏�","渚涢鍗曟敹鍏�" ,0),
+ YGD_INCOME( 0, "鐢ㄥ伐鍗曟敹鍏�","鐢ㄥ伐鍗�" ,0),
+ HYD_INCOME( 1, "璐ц繍鍗曟敹鍏�","璐ц繍鍗�" ,0),
+ GCD_INCOME(2, "渚涢鍗曟敹鍏�","渚涢鍗�" ,0),
WITHDRAW_APPLY(3, "鎻愮幇鐢宠","鎻愮幇鐢宠" ,0),
REFUND( 4, "鎻愮幇鐢宠閫�鍥�","鎻愮幇鐢宠閫�鍥�" ,0)
;
@@ -378,6 +381,22 @@
for (RevenueType c : RevenueType.values()) {
if (c.getKey() == index) {
return c;
+ }
+ }
+ return null;
+ }
+ public static String getName(int index) {
+ for (RevenueType c : RevenueType.values()) {
+ if (c.getKey() == index) {
+ return c.getName();
+ }
+ }
+ return null;
+ }
+ public static String getInfo(int index) {
+ for (RevenueType c : RevenueType.values()) {
+ if (c.getKey() == index) {
+ return c.getInfo();
}
}
return null;
@@ -500,7 +519,7 @@
// 鏅�氭柟娉�
public static String getName(int index) {
- for (OrdersLog c : OrdersLog.values()) {
+ for (workType c : workType.values()) {
if (c.getKey() == index) {
return c.name;
}
--
Gitblit v1.9.3