From a68bf12a2975405f57f9a9d51b91c13a93c026f0 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 31 一月 2024 21:01:36 +0800
Subject: [PATCH] Mr.Shi
---
server/service/src/main/java/com/doumee/core/utils/Constants.java | 43 +++++++++++++++++++++++++++++++------------
1 files changed, 31 insertions(+), 12 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/core/utils/Constants.java b/server/service/src/main/java/com/doumee/core/utils/Constants.java
index 2b41ebe..f2b834f 100644
--- a/server/service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/service/src/main/java/com/doumee/core/utils/Constants.java
@@ -79,6 +79,7 @@
public static final String TAXES_FILE = "TAXES_FILE";
public static final String APPLY_FILE ="APPLY_FILE" ;
public static final String SETTLE_FILE ="SETTLE_FILE" ;
+ public static final String DU_FILE ="DU_FILE" ;
public static final String SIGN_DONE_NOTIFY_URL = "SIGN_DONE_NOTIFY_URL";
/**
@@ -166,8 +167,7 @@
Integer sex = 1;
if (matcher.matches()) {
int genderCode = Integer.parseInt(idCard.substring(16, 17)); // 浠庣17浣嶅紑濮嬫彁鍙栨�у埆缂栫爜锛堝鏁颁负鐢锋�э紝鍋舵暟涓哄コ鎬э級
-
- if ((genderCode % 2 == 1)) {
+ if ((genderCode % 2 == 1) ) {
sex = 1;
} else {
sex = 2;
@@ -900,6 +900,7 @@
}
return solutions.getPrice().multiply(new BigDecimal(cycle));
}
+
public static BigDecimal countDetailFee(int timeUnit ,BigDecimal price,Date startDate, Date endDate){
//鏌ヨ淇濋櫓瀹為檯鍛ㄦ湡
Integer cycle = DateUtil.calculateBetween(endDate,startDate,timeUnit);
@@ -1011,12 +1012,12 @@
UPLOAD(0, "鎻愪氦鎶ユ","鎻愪氦鎰忚锛�${param}"),
PLATFORM_RETURN(1, "骞冲彴閫�鍥�","鎻愪氦鎰忚锛�${param}"),
PLATFORM_CONFIRM_INFORMATION(2, "骞冲彴纭璧勬枡",""),
- PLATFORM_FINISH(3, "骞冲彴瀹屾垚鍙楃悊","鎻愪氦鎰忚锛�${param}"),
+ PLATFORM_FINISH(3, "缁撴鎻愪氦","鎻愪氦鎰忚锛�${param}"),
UPDATE_DATA(4, "淇敼淇℃伅","鎻愪氦鎰忚锛�${param}"),
SUPPLEMENT(5, "琛ュ厖璇存槑","鎻愪氦鎰忚锛�${param}"),
PLATFORM_LP_DEAL(6, "骞冲彴鐞嗚禂澶勭悊","鎻愪氦鎰忚锛�${param}"),
- PLATFORM_REMARK(7, "骞冲彴澶囨敞鏍囩",""),
- PLATFORM_ADDCODE(8, "骞冲彴娣诲姞鎶ユ鍙�",""),
+ PLATFORM_REMARK(7, "骞冲彴澶囨敞鏍囩","${param}"),
+ PLATFORM_ADDCODE(8, "骞冲彴娣诲姞鎶ユ鍙�","澶囨鍙凤細${param}"),
PLATFORM_UN_AGREE_BACK(9, "浼佷笟涓嬭浇璧勬枡",""),
PLATFORM_DOWNLOAD(10, "骞冲彴涓嬭浇璧勬枡",""),
PLATFORM_CHECK_PASS(11, "骞冲彴涓婁紶璧勬枡",""),
@@ -1081,27 +1082,37 @@
public enum ApplyChangeLogStatus {
- UPLOAD(0, "鍙戣捣鐢宠"),
- RETURN_APPLY(3, "鍙戣捣閫�鍥炵敵璇�"),
- PLATFORM_AGREE(4, "骞冲彴瀹℃壒閫氳繃"),
- PLATFORM_UN_AGREE(0, "瀹℃壒椹冲洖"),
- CLOSE(5, "鍏抽棴"),
+ UPLOAD(0, "鍙戣捣鐢宠",""),
+ RETURN_APPLY(3, "鍙戣捣閫�鍥炵敵璇�","鎻愪氦鎰忚锛�${param}"),
+ PLATFORM_AGREE(4, "骞冲彴瀹℃壒閫氳繃" ,"鎻愪氦鎰忚锛�${param}"),
+ PLATFORM_UN_AGREE(0, "瀹℃壒椹冲洖","鎻愪氦鎰忚锛�${param}"),
+ CLOSE(5, "鍏抽棴",""),
;
// 鎴愬憳鍙橀噺
private String name;
+ private String info;
private int key;
// 鏋勯�犳柟娉�
- ApplyChangeLogStatus(int key, String name) {
+ ApplyChangeLogStatus(int key, String name,String info) {
this.name = name;
+ this.info = info;
this.key = key;
}
// 鏅�氭柟娉�
public static String getName(int index) {
- for (ApplyLogType c : ApplyLogType.values()) {
+ for (ApplyChangeLogStatus c : ApplyChangeLogStatus.values()) {
if (c.getKey() == index) {
return c.name;
+ }
+ }
+ return null;
+ }
+ public static String getInfo(int index) {
+ for (ApplyChangeLogStatus c : ApplyChangeLogStatus.values()) {
+ if (c.getKey() == index) {
+ return c.info;
}
}
return null;
@@ -1124,6 +1135,14 @@
this.key = key;
}
+ public String getInfo() {
+ return info;
+ }
+
+ public void setInfo(String info) {
+ this.info = info;
+ }
+
}
--
Gitblit v1.9.3