From 02bc3bfe47e3d5311a0bb041c94e70a34b1ca73c Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 09 四月 2024 09:03:01 +0800
Subject: [PATCH] git ch
---
server/service/src/main/java/com/doumee/core/utils/Constants.java | 155 ++++++++++++++++++++++++++++-----------------------
1 files changed, 85 insertions(+), 70 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 546c231..ada7385 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
@@ -85,6 +85,7 @@
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";
+ public static final int FOUR = 4;
/**
* 浼佷笟鏁版嵁鏉ユ簮 0骞冲彴娉ㄥ唽 1鍚庡彴瀵煎叆
@@ -158,11 +159,16 @@
int birthYear = Integer.parseInt(idCard.substring(6, 10));
int birthMonth = Integer.parseInt(idCard.substring(10, 12));
int birthDay = Integer.parseInt(idCard.substring(12, 14));
+ try{
+ LocalDate birthDate = LocalDate.of(birthYear, birthMonth, birthDay);
+ LocalDate currentDate = LocalDate.now();
+ long age = ChronoUnit.YEARS.between(birthDate, currentDate);
+ return age;
+ }catch (Exception e){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"韬唤璇佸彿鐮侀敊璇細"+idCard);
+ }
- LocalDate birthDate = LocalDate.of(birthYear, birthMonth, birthDay);
- LocalDate currentDate = LocalDate.now();
- long age = ChronoUnit.YEARS.between(birthDate, currentDate);
- return age;
+
}
@@ -192,6 +198,9 @@
}
public static Integer getSexByIdCard(String idCard){
+ if(StringUtils.isBlank(idCard)){
+ return 2;
+ }
Pattern pattern = Pattern.compile("\\d{17}[\\d|x]"); // 瀹氫箟韬唤璇佸彿鐮佹牸寮忕殑姝ｅ垯琛ㄨ揪寮�
Matcher matcher = pattern.matcher(idCard);
Integer sex = 0;
@@ -203,7 +212,7 @@
sex = 1;
}
} else {
- sex = -1;
+ sex = 2;
}
return sex;
}
@@ -442,17 +451,13 @@
HBD_BD_APPLY_PDF(15, "鍚堝苟鍗�-淇濆崟鐢宠琛≒DF ", "鍚堝苟鍗�-淇濆崟鐢宠琛≒DF "),
HBD_BD_SIGNED_PDF(16, "鍚堝苟鍗�-绛剧讲鍚庝繚鍗曠敵璇疯〃PDF", "鍚堝苟鍗�-绛剧讲鍚庝繚鍗曠敵璇疯〃PDF"),
- COMPANY_TBD_SIGNED_PDF(17, "鍚堝苟鍗�-鎶曚繚鍗�-鍟嗘埛鎻愪氦锛堜紒涓氱缃诧級", "鍚堝苟鍗�-绛剧讲鍚庝繚鍗曠敵璇疯〃PDF"),
- SOLUTIONS_CONFIRMATION_LATTER(18, "濮旀墭淇� - 鎶曚繚鏂规纭涔�", "濮旀墭淇� - 鏂规纭涔�"),
- MEMBER_LIST_LATTER(19, "濮旀墭淇� - 鎶曚繚浜哄憳鍚嶅崟", "濮旀墭淇� - 鏂规纭涔�"),
- CHANGE_MEMBER_LIST_LATTER(20, "濮旀墭淇� - 鍔犲噺淇濅汉鍛樺悕鍗�", "濮旀墭淇� - 鏂规纭涔�"),
-
-
-
-
-
-
-
+ SOLUTIONS_CONFIRMATION_LATTER(18, "鎶曚繚鏂规纭涔�", "鎶曚繚鏂规纭涔�"),
+ MEMBER_LIST_LATTER(19, "濮旀墭淇� - 鎶曚繚浜哄憳鍚嶅崟", "濮旀墭淇� - 鎶曚繚浜哄憳鍚嶅崟"),
+// CHANGE_MEMBER_LIST_LATTER(20, "濮旀墭淇� - 鍔犲噺淇濅汉鍛樺悕鍗�", "濮旀墭淇� - 鍔犲噺淇濅汉鍛樺悕鍗�"),
+ WTB_BD_DONE_PDF(21, "濮旀墭鎶曚繚鍗� - 鍚堝苟鍗曟渶缁堜繚鍗�", "濮旀墭鎶曚繚鍗� - 鍚堝苟鍗曟渶缁堜繚鍗�"),
+ WTB_CA_DONE_PDF(23, "濮旀墭鍔犲噺淇�/鎹㈠巶涓氬姟 - 鍚堝苟鍗曟渶缁堜繚鍗�", "濮旀墭鍔犲噺淇�/鎹㈠巶涓氬姟 - 鍚堝苟鍗曟渶缁堜繚鍗�"),
+ WTB_CONFIRMATION_LATTER(24, "濮旀墭淇� - 鎶曚繚鏂规纭涔�", "濮旀墭淇� - 鎶曚繚鏂规纭涔�"),
+ WTB_CA_TBD_PDF(25, "濮旀墭鍔犲噺淇�/鎹㈠巶涓氬姟 -鐢宠鍗曪紙鍟嗘埛绛剧讲鍚嶱DF锛�", "濮旀墭鍔犲噺淇�/鎹㈠巶涓氬姟 -鐢宠鍗曪紙鍟嗘埛绛剧讲鍚嶱DF锛�"),
;
// 鎴愬憳鍙橀噺
private String name;
@@ -710,13 +715,14 @@
THSQZ(5, "鐢宠閫�鍥�"),
YGB(6, "宸插叧闂�"),
DQYQZ(7, "寰呯缃�"),
+
WTBDQS(28, "寰呯缃�"),
- WTBDSH(21, "寰呭鏍�"),
- WTBDCD(22, "寰呭嚭鍗�"),
- WTBYTH(23, "宸查��鍥�"),
- WTBYGB(24, "宸插叧闂�"),
- WTBTBZ(25, "鎶曚繚涓�"),
- WTBBZZ(26, "淇濋殰涓�"),
+ WTBDSH(22, "寰呭鏍�"),
+ WTBDCD(23, "寰呭嚭鍗�"),
+ WTBYTH(24, "宸查��鍥�"),
+ WTBYGB(25, "宸插叧闂�"),
+ WTBTBZ(26, "鎶曚繚涓�"),
+ WTBBZZ(27, "淇濋殰涓�"),
;
// 鎴愬憳鍙橀噺
private String name;
@@ -771,9 +777,6 @@
PLATFORM_UN_AGREE_BACK(9, "椹冲洖閫�鍥炵敵璇�","鎻愪氦鎰忚锛�${param}",0),
COMPANY_EDIT(10, "淇濆崟淇敼","鎻愪氦鎰忚锛�${param1}\n${param2}",0),
PLATFORM_CHECK_PASS(11, "鎶曚繚瀹℃牳閫氳繃","鎻愪氦鎰忚锛�${param}",0),
- UPLOAD_AGAIN(26, "鍐嶆鎶曚繚","",0),
- PALTFORM_EDIT_BD(22, "淇敼淇濆崟","淇敼鍘熷洜锛�${param}",0),
-
CA_PLATFORM_CHECK_PASS_NO(12, "閫�鍥炴姇淇�","鎻愪氦鎰忚锛�${param}",1),
CA_PLATFORM_AGREE_BACK_APPLY(13, "鍚屾剰閫�鍥炵敵璇�","鎻愪氦鎰忚锛�${param}",1),
@@ -788,6 +791,39 @@
CA_JIAJIAN_APPLY_SIGN(23, "鍔犲噺淇濈敵璇蜂紒涓氱绔�","",1),
CA_CHANGUNIT_APPLY_SIGN(24, "鎹㈠巶鐢宠浼佷笟绛剧珷","",1),
CA_UPLOAD_AGAIN(25, "鍐嶆鎶曚繚","",1),
+
+ WTB_FINISH_FAQRS(26, "濮旀墭淇� - 浼佷笟瀹屾垚绛剧讲鏂规纭涔�","",0),
+ WTB_FINISH_MEMBER_LIST(27, "濮旀墭淇� - 浼佷笟瀹屾垚绛剧讲浜哄憳鍚嶅崟","",0),
+ CA_WTB_FINISH_MEMBER_LIST(28, "濮旀墭淇� - 鍔犲噺淇濈缃蹭汉鍛樺悕鍗�","",1),
+ UPLOAD_AGAIN(29, "鍐嶆鎶曚繚","",0),
+ PALTFORM_EDIT_BD(30, "淇敼淇濆崟","淇敼鍘熷洜锛�${param}",0),
+ SHOP_CLOSE_WTB_APPLY(31, "鍏抽棴鐢宠","鍘熷洜锛�${param}",0),
+
+
+ /**
+ * 濮旀墭淇� 鎶曚繚鍗曞悎骞跺崟鏃ュ織
+ */
+ IA_HBD_UPLOAD(32, "鎻愪氦鐢宠","",3),
+ IA_HBD_UPLOAD_TBD(33, "涓婁紶鎶曚繚鍗�","",3),
+ IA_HBD_SIGNATURE_TBD(34, "鍟嗘埛绛剧珷","",3),
+ IA_HBD_UPLOAD_INSURANCE(35, "鎶曚繚瀹屾垚","淇濋櫓鐢熸晥璧锋湡锛�${param1}鍙樻洿涓�${param2}",3),
+ IA_HBD_CLOSE(36, "閫�鍥炵敵璇�","鍘熷洜锛�${param}",3),
+ IA_HBD_UPLOAD_BXD(41, "涓婁紶淇濋櫓鍗�","",3),
+
+
+
+ /**
+ * 濮旀墭淇� 鍔犲噺淇�/鎹㈠巶 鍚堝苟鍗�
+ */
+ CA_HBD_UPLOAD(37, "鎻愪氦鐢宠","",4),
+ CA_HBD_SIGNATURE_TBD(38, "鍟嗘埛绛剧珷","",4),
+ CA_HBD_UPLOAD_INSURANCE(39, "鎶曚繚瀹屾垚","",4),
+ CA_HBD_CLOSE(40, "閫�鍥炵敵璇�","鍘熷洜锛�${param}",4),
+
+
+
+
+
;
// 鎴愬憳鍙橀噺
private String name;
@@ -867,11 +903,11 @@
}
public enum UnionApplyStatus {
- MERGE(1, "寰呬笂浼犱繚鍗�","",0),
- WAIT_SIGNATURE(2, "寰呯缃�","",0),
- UPLOAD_INSURANCE_POLICY(3, "寰呬笂浼犱繚鍗�","",0),
- FINISH(4, "淇濋殰涓�","",0),
- CLOSE(5, "鍏抽棴","",0),
+ MERGE(0, "寰呭鏍�","",0),
+ WAIT_SIGNATURE(1, "寰呯缃�","",0),
+ UPLOAD_INSURANCE_POLICY(2, "寰呭嚭鍗�","",0),
+ FINISH(3, "淇濋殰涓�","",0),
+ CLOSE(4, "宸查��鍥�","",0),
;
// 鎴愬憳鍙橀噺
private String name;
@@ -962,24 +998,22 @@
public enum UnionChangeStatus {
- MERGE(0, "寰呯缃茬敵璇峰崟","",0),
- UPLOAD_INSURANCE_POLICY(1, "寰呬笂浼犱繚鍗�","",0),
- FINISH(2, "淇濋殰涓�","",0),
- CLOSE(3, "鍏抽棴","",0),
+ MERGE(0, "寰呯缃�",""),
+ UPLOAD_INSURANCE_POLICY(1, "寰呭嚭鍗�",""),
+ FINISH(2, "淇濋殰涓�",""),
+ CLOSE(3, "宸查��鍥�",""),
;
// 鎴愬憳鍙橀噺
private String name;
private String info;
private int key;
- private int collectStatus;
// 鏋勯�犳柟娉�
- UnionChangeStatus(int key, String name,String info,int collectStatus) {
+ UnionChangeStatus(int key, String name,String info) {
this.name = name;
this.key = key;
this.info = info;
- this.collectStatus = collectStatus;
}
// 鏅�氭柟娉�
@@ -987,25 +1021,6 @@
for (UnionChangeStatus c : UnionChangeStatus.values()) {
if (c.getKey() == index) {
return c.name;
- }
- }
- return null;
- }
- public static List<Integer> getKesByStatus(Integer collectStatus) {
- List<Integer> list = new ArrayList<>();
- if(collectStatus!=null){
- for (UnionChangeStatus c : UnionChangeStatus.values()) {
- if (Constants.equalsInteger(c.getCollectStatus() ,collectStatus)) {
- list.add(c.getKey());
- }
- }
- }
- return list;
- }
- public static Integer getCollectStatus(Integer index) {
- for (UnionChangeStatus c : UnionChangeStatus.values()) {
- if (Constants.equalsInteger(c.getKey() , index)) {
- return c.collectStatus;
}
}
return null;
@@ -1043,14 +1058,6 @@
public void setInfo(String info) {
this.info = info;
}
-
- public int getCollectStatus() {
- return collectStatus;
- }
-
- public void setCollectStatus(int collectStatus) {
- this.collectStatus = collectStatus;
- }
}
public enum InsuranceApplyStatus {
@@ -1065,11 +1072,14 @@
COMPANY_BACK_APPLY_SIGNATURE(8, "浼佷笟鐢宠閫�鍥�(宸茬绔�)","鎻愪氦鎰忚锛�${param}",5),
CLOSE(9, "璁㈠崟鍏抽棴","",6),
PLATFORM_CHECK_PASS(10,"骞冲彴鎶曚繚瀹℃牳閫氳繃","鎻愪氦鎰忚锛�${param}",0),
+ COMPANY_BACK_APPLY_PASS(11, "浼佷笟鐢宠閫�鍥�(骞冲彴鎶曚繚瀹℃牳閫氳繃)","鎻愪氦鎰忚锛�${param}",5),
+
+
WTB_UPLOAD(20, "鎻愪氦鎶曚繚","",28),
- WTB_COMPANY_APPLY_SIGNATURE(21, "濮旀墭淇�-浼佷笟宸茬缃叉姇淇濈‘璁や功","鎻愪氦鎰忚锛�${param}",28),
- WTB_COMPANY_MEMBER_LIST_SIGNATURE(22, "濮旀墭淇�-浼佷笟宸茬缃蹭汉鍛樺悕鍗�","鎻愪氦鎰忚锛�${param}",22),
- WTB_PCHECK_PASS(23,"骞冲彴鎶曚繚瀹℃牳閫氳繃","鎻愪氦鎰忚锛�${param}",23),
+ WTB_COMPANY_APPLY_SIGNATURE(21, "浼佷笟宸茬缃叉姇淇濈‘璁や功","鎻愪氦鎰忚锛�${param}",28),
+ WTB_COMPANY_MEMBER_LIST_SIGNATURE(22, "浼佷笟宸茬缃蹭汉鍛樺悕鍗�","鎻愪氦鎰忚锛�${param}",22),
+ WTB_BUSINESS_CHECK_PASS(23,"鍟嗘埛鎶曚繚瀹℃牳閫氳繃","鎻愪氦鎰忚锛�${param}",23),
WTB_RETURN(24, "宸查��鍥�","鎻愪氦鎰忚锛�${param}",24),
WTB_CLOSED(25, "宸插叧闂�","鎻愪氦鎰忚锛�${param}",25),
WTB_TOUBAOING(26, "鎶曚繚涓�","鎻愪氦鎰忚锛�${param}",26),
@@ -1230,7 +1240,12 @@
THREE(3, "鐢宠閫�鍥�","鐢宠閫�鍥�","鐢宠閫�鍥�","","",""),
FOUR(4, "宸查��鍥�","宸查��鍥�","宸查��鍥�","","","宸叉挙閿�"),
FIVE(5, "鐢宠椹冲洖","鐢宠椹冲洖","鐢宠椹冲洖","","",""),
- SIX(6, "","","","","","")
+ //缁繚閫氱煡
+ SIX(6, "","","","","",""),
+ //鍟嗘埛绔� 濮旀墭淇� - 鎶曚繚寰呭鏍� 鍔犲噺淇� 鎹㈠巶 寰呭鏍�
+ SEVEN(7, "寰呭鏍�","寰呭鏍�","寰呭鏍�","","",""),
+ EIGHT(8, "","","","","",""),
+ NINE(9, "","","","","",""),
;
// 鎴愬憳鍙橀噺
@@ -1365,9 +1380,9 @@
RETURN_APPLY_SIGNATURE(4, "鍙戣捣閫�鍥炵敵璇凤紙宸茬绔狅級"),
PLATFORM_AGREE(5, "骞冲彴鍚屾剰锛堝凡閫�鍥烇級"),
CLOSE(6, "宸插叧闂�"),
- PALTFORM_CHECK_PASS(7, "瀹℃牳閫氳繃"),
+ CHECHED_PASSED(7, "瀹℃牳閫氳繃"),
PALTFORM_CHECK_PASS_NO(8, "瀹℃牳涓嶉�氳繃"),
- COMPANY_SIGN(9, "浼佷笟绛剧讲浜哄憳鍚嶅崟 - 濮旀墭淇�"),
+ WTB_TOUBAOING(9, "鎶曚繚涓�"),
;
// 鎴愬憳鍙橀噺
private String name;
--
Gitblit v1.9.3