From 1e676b408c8c7e1ccca08b151619d89fdc2bc9bf Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期二, 10 十月 2023 14:40:31 +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 | 62 +++++++++++++++++++++++++++++++ 1 files changed, 62 insertions(+), 0 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 7549ff2..4777737 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 @@ -58,6 +58,7 @@ public interface transactionsType{ int deposit =0; int consumption =1; + int refund =2; int platformRefund = 3; } @@ -94,6 +95,18 @@ public static final String RENT_DEPOSIT = "RENT_DEPOSIT"; //娓╅Θ鎻愮ず public static final String TIPS = "TIPS"; + //灏忕▼搴忓仠姝㈡湇鍔℃彁绀� + public static final String STOP_SERVE_TIPS = "STOP_SERVE_TIPS"; + //灏忕▼搴忔槸鍚﹀仠姝㈡湇鍔� 0鍚� 1鏄� + public static final String IS_STOP_SERVE = "IS_STOP_SERVE"; + //灏忕▼搴忓仠姝㈠紑濮嬫椂闂� + public static final String STOP_SERVE_STARTTIME = "STOP_SERVE_STARTTIME"; + //灏忕▼搴忓仠姝㈢粨鏉熸椂闂� + public static final String STOP_SERVE_ENDTIME = "STOP_SERVE_ENDTIME"; + //灏忕▼搴忔瘡鏃ユ湇鍔″紑濮嬫椂闂� + public static final String BUSINESS_STARTTIME = "BUSINESS_STARTTIME"; + //灏忕▼搴忔瘡鏃ユ湇鍔$粨鏉熸椂闂� + public static final String BUSINESS_ENDTIME = "BUSINESS_ENDTIME"; public static final String FILES_DIR = "FILES_DIR"; @@ -174,6 +187,55 @@ 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 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,"璇锋眰寮�閿佷腑"), -- Gitblit v1.9.3