From 462a7c752afead89a100522aea8bbfadaea2aab9 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 13 十月 2025 09:42:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/services/src/main/java/com/doumee/core/constants/Constants.java | 388 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 377 insertions(+), 11 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 f579819..49726e0 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
@@ -1,5 +1,6 @@
package com.doumee.core.constants;
+import com.doumee.dao.business.model.Orders;
import lombok.AllArgsConstructor;
import lombok.Getter;
@@ -18,13 +19,7 @@
public static final String HWY_OBS_ACCESSKEY ="HWY_OBS_ACCESSKEY" ;
public static final String HWY_OBS_ENDPOINT ="HWY_OBS_ENDPOINT" ;
public static final String HWY_OBS_BUCKET ="HWY_OBS_BUCKET" ;
- public static final String FTP ="FTP" ;
- public static final String FTP_HOST ="FTP_HOST" ;
- public static final String FTP_PORT ="FTP_PORT" ;
- public static final String FTP_USERNAME ="FTP_USERNAME" ;
- public static final String FTP_PWD ="FTP_PWD" ;
- public static final String FTP_RESOURCE_PATH ="FTP_RESOURCE_PATH" ;
- public static final String FTP_LOCAL_RESOURCE_PATH ="FTP_LOCAL_RESOURCE_PATH" ;
+ public static final String RESOURCE_PATH ="RESOURCE_PATH" ;
public static final String QYWX_CORPID = "QYWX_CORPID";
public static final String QYWX_SECRET = "QYWX_SECRET";
public static final String QYWX_TOKEN = "QYWX_TOKEN";
@@ -50,8 +45,19 @@
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" ;
+ public static final String RECEIVE_CANCEL_TIMES ="RECEIVE_CANCEL_TIMES" ;
+ public static final String RELEASE_CANCEL_TIME ="RELEASE_CANCEL_TIME" ;
+ public static final String RECEIVE_CANCEL_TIME ="RECEIVE_CANCEL_TIME" ;
+ public static final String AUTO_DISPATCH ="AUTO_DISPATCH" ;
+ public static final String AUTO_DISPATCH_DISTANCE ="AUTO_DISPATCH_DISTANCE" ;
+ public static final String AUTO_CONFIRM ="AUTO_CONFIRM" ;
+ public static final String AUTO_CANCEL_WAIT_PAY ="AUTO_CANCEL_WAIT_PAY" ;
public static final String QYWX = "QYWX";
public static final Integer ONE = 1;
@@ -61,6 +67,10 @@
public static final Integer FOUR = 4;
public static final Integer SIX = 6;
public static final Integer FIVE = 5;
+ public static final String INENTITY_FILES = "INENTITY_FILES";
+ public static final String MEMBER_FILES = "MEMBER_FILES";
+ public static final String CATEGORY_FILES = "CATEGORY_FILES";
+ public static final String ORDERS_FILES = "ORDERS_FILES";
public static boolean WORKORDER_SHE_EMAIL_SENDING = false;
public static boolean DEALING_COMPANY_SYNC = false ;
public static boolean DEALING_MEMBER_SYNC = false ;
@@ -68,6 +78,12 @@
public static final String WORKORDER_LOG_FILE_PATH ="WORKORDER_LOG_FILE_PATH" ;
public static final String REDIS_TOKEN_KEY = "token_";
+
+ public static final String SUCCESS = "SUCCESS";
+ public static final String FAIL = "FAIL";
+ public static final String CANCELLED = "CANCELLED";
+
+
public interface uploadType{
String blob = "blob";
String ftp = "ftp";
@@ -79,7 +95,7 @@
interface CacheKey {
}
public interface RedisKeys {
- public static final String IMPORTING_CATEGORY = "IMPORTING_CATEGORY";
+ public static final String ORDER_CODE = "ORDER_CODE";
}
/**
* 鎿嶄綔绫诲瀷锛岀敤浜庡仛鎺ュ彛楠岃瘉鍒嗙粍
@@ -128,6 +144,12 @@
d = 0L;
}
return d.longValue();
+ }
+ public static BigDecimal formatBigDecimal(BigDecimal d) {
+ if (d == null) {
+ new BigDecimal(0);
+ }
+ return d;
}
/**
@@ -351,9 +373,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)
;
@@ -377,6 +399,22 @@
}
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;
+ }
public static String getObjName(int index) {
for (RevenueType c : RevenueType.values()) {
if (c.getKey() == index) {
@@ -388,4 +426,332 @@
}
+
+
+
+
+ public enum OrdersLog {
+ UPLOAD(0, "鍙戝崟鏂�-鍙戝竷璁㈠崟","{userName}鍙戝竷{param}",0),
+ RECEIVE(1, "鎺ュ崟鏂�-宸叉姠鍗�","{userName}宸叉姠鍗�",1),
+ UPD_ORDER(2, "鍙戝崟鏂�-淇敼璁㈠崟","{userName}淇敼浜嗙敤宸ユ椂闂�",0),
+ UPD_DISAGREE(3, "鎺ュ崟鏂�-涓嶅悓鎰忎慨鏀�,璁㈠崟鍙栨秷","{userName}涓嶅悓鎰忎慨鏀癸紝璁㈠崟鍙栨秷",1),
+ UPD_AGREE(4, "鎺ュ崟鏂�-鍚屾剰淇敼","{userName}鍚屾剰淇敼",1),
+ AUTO(5, "绯荤粺-鑷姩娲惧崟","鏃犱汉鎺ュ崟宸茶嚜鍔ㄦ淳鍗曠粰{userName}",1),
+ CANCEL(6, "鎺ュ崟鏂�-鍙栨秷鎺ュ崟","{userName}宸叉墜鍔ㄥ彇娑堟帴鍗�",1),
+ BEGIN(7, "鍙戝崟鏂�-寮�濮嬩綔涓�","{userName}宸插紑濮嬩綔涓�",0),
+ DONE(8, "鍙戝崟鏂�-瀹屾垚浣滀笟","{userName}宸茬‘璁ゅ畬鎴愪綔涓�",0),
+ PAY(9, "鍙戝崟鏂�-瀹屾垚鏀粯","{userName}宸叉敮浠樿垂鐢�",0),
+ COMMENT(10, "鍙戝崟鏂�-璇勪环瀹屾垚","{userName}瀹屾垚璇勪环",0),
+ SYSTEM_CANCEL(11, "绯荤粺-璁㈠崟鍙栨秷","绯荤粺鍙栨秷",2),
+ RELEASE_CANCEL(12, "鍙戝崟鏂�-璁㈠崟鍙栨秷","{userName}宸叉墜鍔ㄥ彇娑堣鍗�",0),
+ AUTO_COMMENT(13, "绯荤粺-鑷姩璇勪环","瓒呭嚭7鏃ユ湭璇勪环锛岀郴缁熷凡鑷姩璇勪环",2),
+ AUTO_AGREE(14, "绯荤粺-鑷姩鍚屾剰","鎺ュ崟鏂硅秴鏃舵湭澶勭悊锛屽凡鑷姩鍚屾剰",2),
+
+ FEE_CONFIRM(15, "鎺ュ崟鏂�-纭璐圭敤","{userName}宸茬‘璁よ垂鐢�",1),
+
+ ;
+ // 鎴愬憳鍙橀噺
+ private String name;
+ private String info;
+ private int key;
+ private int userType;
+
+ // 鏋勯�犳柟娉�
+ OrdersLog(int key, String name,String info,int userType) {
+ this.name = name;
+ this.info = info;
+ this.key = key;
+ this.userType = userType;
+ }
+
+ // 鏅�氭柟娉�
+ public static String getName(int index) {
+ for (OrdersLog c : OrdersLog.values()) {
+ if (c.getKey() == index) {
+ return c.name;
+ }
+ }
+ return null;
+ }
+ public static String getInfo(int index) {
+ for (OrdersLog c : OrdersLog.values()) {
+ if (c.getKey() == index) {
+ return c.info;
+ }
+ }
+ 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;
+ }
+
+ public int getUserType() {
+ return userType;
+ }
+
+ public void setUserType(int key) {
+ this.userType = userType;
+ }
+
+ public String getInfo() {
+ return info;
+ }
+
+ public void setInfo(String info) {
+ this.info = info;
+ }
+ }
+
+
+ public enum workType {
+ czg(0, "閲囨憳宸�"),
+ fjg(1, "鍒嗘嫞宸�"),
+ bzg(2, "鍖呰宸�"),
+
+ ;
+ // 鎴愬憳鍙橀噺
+ private int key;
+ private String name;
+
+ // 鏋勯�犳柟娉�
+ workType(int key, String name) {
+ this.name = name;
+ this.key = key;
+ }
+
+ // 鏅�氭柟娉�
+ public static String getName(int index) {
+ for (workType c : workType.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;
+ }
+
+ }
+
+
+ public enum ordersStatus {
+ waitPay(0, "寰呮敮浠�","寰呮敮浠�"),
+ wait(1, "寰呮帴鍗�","寰呮帴鍗�"),
+ accept(2, "宸叉帴鍗�","宸叉帴鍗�"),
+ doing(3, "杩涜涓�","杩涜涓�"),
+ done(4, "宸插畬鎴�","宸插畬鎴�"),
+ feeconfirm(5, "寰呮敮浠�","寰呭彂鍗曟柟鏀粯"),//閲戦宸茬‘璁�
+ cancel(99, "宸插彇娑�","宸插彇娑�"),
+ ;
+ // 鎴愬憳鍙橀噺
+ private int key;
+ private String name; //鎺ュ崟鏂规枃妗�
+ private String info; //鍙戝崟鏂规枃妗�
+ // 鏋勯�犳柟娉�
+ ordersStatus(int key, String name,String info) {
+ this.name = name;
+ this.key = key;
+ this.info = info;
+ }
+
+ // 鏅�氭柟娉�
+ public static String getName(int index) {
+ for (ordersStatus c : ordersStatus.values()) {
+ if (c.getKey() == index) {
+ return c.name;
+ }
+ }
+ return null;
+ }
+
+ public static String getInfo(int index) {
+ for (ordersStatus c : ordersStatus.values()) {
+ if (c.getKey() == index) {
+ return c.info;
+ }
+ }
+ 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;
+ }
+
+ public String getInfo() {
+ return info;
+ }
+
+ public void setInfo(String info) {
+ this.info = info;
+ }
+
+ }
+
+
+
+ public enum orderType {
+ ygd(0, "鐢ㄥ伐鍗�"),
+ hyd(1, "璐ц繍鍗�"),
+ scd(2, "閫侀鍗�"),
+
+ ;
+ // 鎴愬憳鍙橀噺
+ private int key;
+ private String name;
+
+ // 鏋勯�犳柟娉�
+ orderType(int key, String name) {
+ this.name = name;
+ this.key = key;
+ }
+
+ // 鏅�氭柟娉�
+ public static String getName(int index) {
+ for (orderType c : orderType.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;
+ }
+
+ }
+
+
+
+ public enum smsContent {
+ accept(0, "SMS_491325122","鎮ㄧ殑{order}璁㈠崟宸茶鎺ュ崟锛佹椂闂达細{time1}-{time2}锛屽彲杩涘叆灏忕▼搴忚仈绯绘帴鍗曟柟銆�"),
+ receiveCancel(1, "SMS_491055243","鎮ㄧ殑{order}璁㈠崟锛屾椂闂达細{time1}-{time2}锛屽凡琚帴鍗曟柟鍙栨秷锛岃鍗曞凡閲嶆柊杩涘叆鎺ュ崟澶у巺銆�"),
+ platformCancel(2, "SMS_491375152","鎮ㄧ殑{order}璁㈠崟锛屾椂闂达細{time1}-{time2},宸茬敱骞冲彴鍙栨秷銆傚鏈夌枒闂鑱旂郴瀹㈡湇銆�"),
+ agreeUpd(3, "SMS_491190259","鎺ュ崟鏂瑰凡鍚屾剰鎮ㄥ皢{order}鐨勮鍗曟椂闂翠慨鏀逛负{time1}鑷硔time2}銆�"),
+ disAgreeUpd(4, "SMS_491085252","鎺ュ崟鏂瑰凡鎷掔粷鎮ㄥ皢{order}鐨勮鍗曟椂闂翠慨鏀逛负{time1}-{time2}銆傜郴缁熷凡閲嶆柊灏嗚鍗曟斁鍏ユ帴鍗曞ぇ鍘呫��"),
+ orderUpd(5, "SMS_491010267","璇锋敞鎰忥紒鎮ㄦ壙鎺ョ殑{order}璁㈠崟锛屽鎴峰皢璁㈠崟鏃堕棿淇敼涓簕time1}-{time2}銆傝鍓嶅線纭鏄惁鎺ュ彈锛岃秴鏃朵笉澶勭悊灏嗚涓哄悓鎰忋��"),
+ releaseCancel(6, "SMS_491150253","鎮ㄦ壙鎺ョ殑{order}璁㈠崟锛屾椂闂达細{time1}-{time2}锛屽凡琚彂鍗曟柟鍙栨秷銆傛偍鍙墠寰�鎺ュ崟澶у巺閲嶆柊鎺ュ崟銆�"),
+ platformCancel2(7, "SMS_491420143","鎮ㄦ壙鎺ョ殑{order}璁㈠崟锛屾椂闂达細{time1}-{time2}锛屽凡鐢卞钩鍙板彇娑堛�傚鏈夌枒闂鑱旂郴瀹㈡湇銆�"),
+ dispatch(8, "SMS_491180276","宸蹭负鎮ㄦ櫤鑳藉尮閰嶈鍗曘�傝鍗曠被鍨嬶細{order}锛屾椂闂达細{time1}-{time2}锛岃窛绂伙細{distance}锛岄璁¤垂鐢▄money}銆傝鍓嶅線纭銆�"),
+ pay(9, "SMS_491180278","鎮ㄦ壙鎺ョ殑{order}璁㈠崟娆鹃」宸插埌璐︼紒鍒拌处閲戦锛歿money}銆傚彲鍦ㄥ皬绋嬪簭璐︽埛浣欓杩涜鏌ョ湅銆�"),
+ authentication(10, "SMS_491055290","鎮ㄧ敵璇风殑{authentication}鐨剓order}璁よ瘉{status}銆傝鍦ㄥ皬绋嬪簭鏌ョ湅璇︽儏銆�"),
+ ;
+ // 鎴愬憳鍙橀噺
+ private int key;
+ private String code;
+ private String name;
+
+ // 鏋勯�犳柟娉�
+ smsContent(int key,String code, String name) {
+ this.name = name;
+ this.code = code;
+ this.key = key;
+ }
+
+ // 鏅�氭柟娉�
+ public static Constants.smsContent getSmsContent(int index) {
+ for (smsContent c : smsContent.values()) {
+ if (c.getKey() == index) {
+ return c;
+ }
+ }
+ return null;
+ }
+ // get set 鏂规硶
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getCode() {
+ return code;
+ }
+
+ public void setCode(String code) {
+ this.code = code;
+ }
+
+ public int getKey() {
+ return key;
+ }
+
+ public void setKey(int key) {
+ this.key = key;
+ }
+
+ }
+
+
+ public static String getOrderInfo(Orders orders){
+ String orderTypeInfo = "鐢ㄥ伐鍗�";
+ if(!Constants.equalsInteger(orders.getType(),Constants.ZERO)){
+ orderTypeInfo = Constants.equalsInteger(orders.getType(),Constants.ONE)?"鐢ㄨ溅鍗�":"閫侀鍗�";
+ }else{
+ if(Constants.equalsInteger(orders.getWorkType(),Constants.ZERO)){
+ orderTypeInfo = orderTypeInfo + "-閲囨憳宸�";
+ }else{
+ orderTypeInfo = orderTypeInfo + (Constants.equalsInteger(orders.getWorkType(),Constants.ONE)?"-鍒嗘嫞宸�":"-鍖呰宸�");
+ }
+ }
+ return orderTypeInfo;
+
+ }
+
+
+
}
--
Gitblit v1.9.3