From 96abc87da07408ef817d9086ea71ba4c287aa474 Mon Sep 17 00:00:00 2001 From: cloudroam <cloudroam> Date: 星期一, 09 十二月 2024 11:52:07 +0800 Subject: [PATCH] Merge branch 'master-v5' of http://47.96.225.205:8888/r/flowerbackend-v2 into master-v5 --- src/main/java/com/mzl/flower/constant/Constants.java | 77 ++++++++++++++++++++++++++++++++------ 1 files changed, 64 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/mzl/flower/constant/Constants.java b/src/main/java/com/mzl/flower/constant/Constants.java index 3419ef4..71b4fb4 100644 --- a/src/main/java/com/mzl/flower/constant/Constants.java +++ b/src/main/java/com/mzl/flower/constant/Constants.java @@ -589,6 +589,24 @@ return desc; } } + + public enum BILL_WITHDRAW_TYPE { + start("发起提现"), fail("提现失败"), success("提现成功") + ; + + BILL_WITHDRAW_TYPE(String desc) { + this.desc = desc; + } + + private String desc; + + public String getDesc() { + return desc; + } + } + + + public enum BILL_CHANGE_METHOD { add("增加"), reduce("减少"); @@ -617,19 +635,19 @@ } } - public enum WALLET_WITHDRAW_STATE { - WAITING("提现中"),SUCCESS("提现成功"),FAILURE("提现失败"); - - WALLET_WITHDRAW_STATE(String desc) { - this.desc = desc; - } - - private String desc; - - public String getDesc() { - return desc; - } - } +// public enum WALLET_WITHDRAW_STATE { +// WAITING("提现中"),SUCCESS("提现成功"),FAILURE("提现失败"); +// +// WALLET_WITHDRAW_STATE(String desc) { +// this.desc = desc; +// } +// +// private String desc; +// +// public String getDesc() { +// return desc; +// } +// } public enum WALLET_WITHDRAW_METHOD { WEIXIN("微信"); @@ -659,4 +677,37 @@ } } + public enum CUSTOM01 { + ZERO(0) + ,ONE(1) + ; + + CUSTOM01(Integer desc) { + this.desc = desc; + } + + private Integer desc; + + public Integer getDesc() { + return desc; + } + } + + public enum APP_MENU_TYPE { + SUPPLIER("supplier") + , PARTNER("partner") + ; + + APP_MENU_TYPE(String desc) { + this.desc = desc; + } + + private String desc; + + public String getDesc() { + return desc; + } + } + + } -- Gitblit v1.9.3