From 1b0cf0db5c82ea8308d2f338973a91555787c34d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 18 三月 2025 11:17:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/services/src/main/java/com/doumee/core/constants/Constants.java | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 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 d2c5bba..cacca62 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
@@ -27,6 +27,7 @@
public static final String DINGDING ="DINGDING" ;
public static final String MINI_PROGRAMME ="MINI_PROGRAMME" ;
public static final String FREE_RENT_TIME ="FREE_RENT_TIME" ;
+ public static final String ACCESS_TOKEN ="ACCESS_TOKEN" ;
public static final String IMG_DIR = "IMG_DIR";
public static final String FILE_DIR ="FILE_DIR" ;
public static final String PRIVATE_KEY = "PRIVATE_KEY";
@@ -35,7 +36,7 @@
public static final String FORCE_BACK_LOCK = "FORCE_BACK_LOCK";
public static final String FORCE_BACK_SITE = "FORCE_BACK_SITE";
//杞﹁締绫诲瀷鏁版嵁
- public static final String BIKE_TYPE ="1,2,3,4,5,6,7,8" ;
+ public static final String BIKE_TYPE ="0,1,2,3,4,5,6,7,8" ;
public static String REDIS_DEBUG_STR="test_";
public static final String AD = "AD";
public static String REPAIR = "REPAIR";
@@ -88,11 +89,11 @@
//浜ゆ槗绫诲瀷 0绉熻溅鎶奸噾 1缁撶畻瀹為檯娑堣垂 2缁撶畻閫�娆� 3骞冲彴閫�娆�"
DEPOSIT(0,"绉熻溅鎶奸噾", "绉熻溅鎶奸噾"),
- CONSUMPTION(1,"缁撶畻瀹為檯娑堣垂", "缁撶畻瀹為檯娑堣垂"),
+ CONSUMPTION(1,"璁㈠崟娑堣垂缁撶畻", "璁㈠崟娑堣垂缁撶畻"),
- REFUND(2,"缁撶畻閫�娆�", "缁撶畻閫�娆�"),
+ REFUND(2,"缁撶畻閫�鎶奸噾", "缁撶畻閫�鎶奸噾"),
- PLATFORMREFUND(3,"骞冲彴閫�娆�", "骞冲彴閫�娆�")
+ PLATFORMREFUND(3,"骞冲彴閫�鎶奸噾", "骞冲彴閫�鎶奸噾")
;
String name;
@@ -174,6 +175,8 @@
public static final String RENT_DEPOSIT = "RENT_DEPOSIT";
//娓╅Θ鎻愮ず
public static final String TIPS = "TIPS";
+ //娓╅Θ鎻愮ず
+ public static final String RENT_NOTICE = "RENT_NOTICE";
//灏忕▼搴忓仠姝㈡湇鍔℃彁绀�
public static final String STOP_SERVE_TIPS = "STOP_SERVE_TIPS";
//灏忕▼搴忔槸鍚﹀仠姝㈡湇鍔� 0鍚� 1鏄�
@@ -210,6 +213,14 @@
return 0;
}
return num;
+ }
+ public static Integer formatIntegerFromStr(String num) {
+ try {
+ return Integer.parseInt(num);
+ }catch (Exception e){
+
+ }
+ return null;
}
public interface UserActionsType {
@@ -325,13 +336,13 @@
public enum REFUND_TYPE{
// '閫�娆剧被鍨� 0鐢ㄦ埛缁撶畻閫�娆� 1骞冲彴鑷姩缁撶畻閫�娆� 2寮哄埗缁撶畻閫�娆� 3缁撶畻鍚庨��娆�'
- NORMAL( 0,"鐢ㄦ埛缁撶畻閫�娆�",""),
+ NORMAL( 0,"鐢ㄦ埛缁撶畻閫�娆�","缁撶畻閫�鎶奸噾"),
- PLAT_AUTO( 1,"骞冲彴鑷姩缁撶畻閫�娆�",""),
+ PLAT_AUTO( 1,"骞冲彴鑷姩缁撶畻閫�娆�","骞冲彴閫�鎶奸噾"),
- PLAT_FORCE( 2,"寮哄埗缁撶畻閫�娆�",""),
+ PLAT_FORCE( 2,"寮哄埗缁撶畻閫�娆�","骞冲彴閫�鎶奸噾"),
- BACK( 3,"缁撶畻鍚庨��娆�",""),
+ BACK( 3,"缁撶畻鍚庨��娆�","骞冲彴閫�娆�"),
;
String name;
--
Gitblit v1.9.3