From d1c6020dc36ce118ce9f13ba81caa70d7117d94c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 12 十月 2023 12:14:33 +0800
Subject: [PATCH] Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/parkBike into dev
---
server/services/src/main/java/com/doumee/core/constants/Constants.java | 181 ++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 176 insertions(+), 5 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 dd9844b..fceeb10 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
@@ -23,10 +23,13 @@
public static final String FALSE = "f";
public static final String TOKEN ="TOKEN" ;
public static final String SYSTEM ="SYSTEM" ;
+ 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 IMG_DIR = "IMG_DIR";
public static final String FILE_DIR ="FILE_DIR" ;
public static final String PRIVATE_KEY = "PRIVATE_KEY";
+ public static final String PROJECT_FILE = "PROJECT_FILE";
public static String REDIS_DEBUG_STR="test_";
public interface MqttTopic{
//寮�閿�
@@ -55,13 +58,63 @@
int waitPay =0;
int pay =1;
}
- public interface transactionsType{
- int deposit =0;
- int consumption =1;
+ public enum TRANSACTIONS_TYPE{
+ //浜ゆ槗绫诲瀷 0绉熻溅鎶奸噾 1缁撶畻瀹為檯娑堣垂 2缁撶畻閫�娆� 3骞冲彴閫�娆�"
+ DEPOSIT(0,"绉熻溅鎶奸噾", "绉熻溅鎶奸噾"),
- int refund =2;
- int platformRefund = 3;
+ CONSUMPTION(1,"缁撶畻瀹為檯娑堣垂", "缁撶畻瀹為檯娑堣垂"),
+
+ REFUND(2,"缁撶畻閫�娆�", "缁撶畻閫�娆�"),
+
+ PLATFORMREFUND(3,"骞冲彴閫�娆�", "骞冲彴閫�娆�")
+
+ ;
+ String name;
+
+ Integer key;
+
+ String info;
+
+ TRANSACTIONS_TYPE(Integer key, String name, String info) {
+ this.name = name;
+ this.key = key;
+ this.info = info;
+ }
+ public static TRANSACTIONS_TYPE get(int key) {
+ TRANSACTIONS_TYPE[] values = TRANSACTIONS_TYPE.values();
+ for (TRANSACTIONS_TYPE object : values) {
+ if (object.key == key) {
+ return object;
+ }
+ }
+ return null;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public Integer getKey() {
+ return key;
+ }
+
+ public void setKey(Integer key) {
+ this.key = key;
+ }
+
+ public String getInfo() {
+ return info;
+ }
+
+ public void setInfo(String info) {
+ this.info = info;
+ }
}
+
public static String getUUID(){
return UUID.randomUUID().toString().replace("-","");
@@ -108,6 +161,16 @@
//灏忕▼搴忔瘡鏃ユ湇鍔＄粨鏉熸椂闂�
public static final String BUSINESS_ENDTIME = "BUSINESS_ENDTIME";
+ //閽夐拤閫氱煡鍦板潃
+ public static final String DINGDING_URL = "DINGDING_URL";
+ //閽夐拤绛惧悕
+ public static final String DINGDING_SECRET = "DINGDING_SECRET";
+
+ //灏忕▼搴忔弧杞介璀�(%)鏈�澶у��
+ public static final String WARN_MAX = "WARN_MAX";
+ //灏忕▼搴忔弧杞介璀�(%)鏈�灏忓��
+ public static final String WARN_MIN = "WARN_MIN";
+
public static final String FILES_DIR = "FILES_DIR";
public static final String SCRATCH_REDIRECT_URL = "SCRATCH_REDIRECT_URL";
@@ -139,6 +202,52 @@
String rent = "RENT";
}
+ public interface ActionLogObjType {
+ int memberrides =0;//楠戣璁板綍
+
+ }
+
+ public enum ACTIONLOG_TYPE{
+ // 0楠戣璁板綍
+ FORCE_BACK(0,"寮哄埗杩樿溅","鍚庡彴寮哄埗杩樿溅"),
+ UPDATE_DURATION(1,"淇敼楠戣鏃堕暱","鍚庡彴淇敼楠戣鏃堕暱")
+ ;
+ String name;
+
+ Integer key;
+
+ String info;
+
+ ACTIONLOG_TYPE(Integer key,String name, String info) {
+ this.name = name;
+ this.key = key;
+ this.info = info;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public Integer getKey() {
+ return key;
+ }
+
+ public void setKey(Integer key) {
+ this.key = key;
+ }
+
+ public String getInfo() {
+ return info;
+ }
+
+ public void setInfo(String info) {
+ this.info = info;
+ }
+ }
public enum GOODSORDER_STATUS{
// 0寰呮敮浠� 1宸叉敮浠� 2宸插彇娑� 3鏀粯澶辫触 4宸茬粨绠�
UN_PAY("寰呮敮浠�", 0,"寰呮敮浠�"),
@@ -187,6 +296,64 @@
this.info = info;
}
}
+
+ public enum REFUND_TYPE{
+ // '閫�娆剧被鍨� 0鐢ㄦ埛缁撶畻閫�娆� 1骞冲彴鑷姩缁撶畻閫�娆� 2寮哄埗缁撶畻閫�娆� 3缁撶畻鍚庨��娆�'
+ NORMAL( 0,"鐢ㄦ埛缁撶畻閫�娆�",""),
+
+ PLAT_AUTO( 1,"骞冲彴鑷姩缁撶畻閫�娆�",""),
+
+ PLAT_FORCE( 2,"寮哄埗缁撶畻閫�娆�",""),
+
+ BACK( 3,"缁撶畻鍚庨��娆�",""),
+
+ ;
+ String name;
+
+ Integer key;
+
+ String info;
+
+
+ REFUND_TYPE(Integer key,String name, String info) {
+ this.name = name;
+ this.key = key;
+ this.info = info;
+ }
+
+ public static REFUND_TYPE get(int key) {
+ REFUND_TYPE[] values = REFUND_TYPE.values();
+ for (REFUND_TYPE object : values) {
+ if (object.key == key) {
+ return object;
+ }
+ }
+ return null;
+ }
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public Integer getKey() {
+ return key;
+ }
+
+ public void setKey(Integer key) {
+ this.key = key;
+ }
+
+ public String getInfo() {
+ return info;
+ }
+
+ public void setInfo(String info) {
+ this.info = info;
+ }
+ }
public enum MEMBER_RIDES_STATUS{
// 0璇锋眰寮�閿佷腑 1楠戣涓� 2宸茶繕杞� 3寮�閿佸け璐�
LOCKING("璇锋眰寮�閿佷腑", 0,"璇锋眰寮�閿佷腑"),
@@ -374,4 +541,8 @@
}
+ public static BigDecimal translateMoney(BigDecimal money){
+ return Constants.formatDecimalNum(money).divide(new BigDecimal(100), 2, BigDecimal.ROUND_UP);
+
+ }
}
--
Gitblit v1.9.3