From 22603b2519b8dcb7f9a7c7d9ba636d9aba240a59 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 18 七月 2025 09:15:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/services/src/main/java/com/doumee/core/constants/Constants.java | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 52 insertions(+), 1 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 df01084..7e8743b 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" ;
@@ -411,6 +414,8 @@
COMMENT(10, "鍙戝崟鏂�-璇勪环瀹屾垚","{userName}瀹屾垚璇勪环",0),
SYSTEM_CANCEL(11, "绯荤粺-璁㈠崟鍙栨秷","绯荤粺鍙栨秷",2),
RELEASE_CANCEL(12, "鍙戝崟鏂�-璁㈠崟鍙栨秷","{userName}宸叉墜鍔ㄥ彇娑堣鍗�",0),
+ AUTO_COMMENT(13, "绯荤粺-鑷姩璇勪环","瓒呭嚭7鏃ユ湭璇勪环锛岀郴缁熷凡鑷姩璇勪环",2),
+ AUTO_AGREE(14, "绯荤粺-鑷姩鍚屾剰","鎺ュ崟鏂硅秴鏃舵湭澶勭悊锛屽凡鑷姩鍚屾剰",2),
;
// 鎴愬憳鍙橀噺
@@ -498,7 +503,7 @@
// 鏅�氭柟娉�
public static String getName(int index) {
- for (OrdersLog c : OrdersLog.values()) {
+ for (workType c : workType.values()) {
if (c.getKey() == index) {
return c.name;
}
@@ -525,4 +530,50 @@
}
+ public enum ordersStatus {
+ waitPay(0, "寰呮敮浠�"),
+ wait(1, "寰呮帴鍗�"),
+ accept(2, "宸叉帴鍗�"),
+ doing(3, "杩涜涓�"),
+ done(4, "宸插畬鎴�"),
+ cancel(99, "宸插彇娑�"),
+ ;
+ // 鎴愬憳鍙橀噺
+ private int key;
+ private String name;
+
+ // 鏋勯�犳柟娉�
+ ordersStatus(int key, String name) {
+ this.name = name;
+ this.key = key;
+ }
+
+ // 鏅�氭柟娉�
+ public static String getName(int index) {
+ for (ordersStatus c : ordersStatus.values()) {
+ if (c.getKey() == index) {
+ return c.name;
+ }
+ }
+ return null;
+ }
+ // get set 鏂规硶
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public int getKey() {
+ return key;
+ }
+
+ public void setKey(int key) {
+ this.key = key;
+ }
+
+ }
+
}
--
Gitblit v1.9.3