From bd57081dc1bcd94e1e4043a9e0a7c6953d4bb9d4 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期一, 01 四月 2024 19:19:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
server/service/src/main/java/com/doumee/core/utils/Constants.java | 93 ++++++++++++++++++++++++++++++++--------------
1 files changed, 64 insertions(+), 29 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 07d73d9..cce057f 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
@@ -158,11 +158,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;
+
}
@@ -443,13 +448,14 @@
HBD_BD_APPLY_PDF(15, "鍚堝苟鍗�-淇濆崟鐢宠琛≒DF ", "鍚堝苟鍗�-淇濆崟鐢宠琛≒DF "),
HBD_BD_SIGNED_PDF(16, "鍚堝苟鍗�-绛剧讲鍚庝繚鍗曠敵璇疯〃PDF", "鍚堝苟鍗�-绛剧讲鍚庝繚鍗曠敵璇疯〃PDF"),
COMPANY_TBD_SIGNED(17, "鍚堝苟鍗�-鎶曚繚鍗�-鍟嗘埛鎻愪氦", "鍚堝苟鍗�-鎶曚繚鍗�-鍟嗘埛鎻愪氦"),
- SOLUTIONS_CONFIRMATION_LATTER(18, "濮旀墭淇� - 鎶曚繚鏂规纭涔�", "濮旀墭淇� - 鏂规纭涔�"),
- MEMBER_LIST_LATTER(19, "濮旀墭淇� - 鎶曚繚浜哄憳鍚嶅崟", "濮旀墭淇� - 鏂规纭涔�"),
- CHANGE_MEMBER_LIST_LATTER(20, "濮旀墭淇� - 鍔犲噺淇濅汉鍛樺悕鍗�", "濮旀墭淇� - 鏂规纭涔�"),
- WTB_BD_DONE_PDF(21, "濮旀墭鎶曚繚鍗� - 鍚堝苟鍗曟渶缁堜繚鍗�", "濮旀墭淇� - 鍚堝苟鍗曚繚鍗�"),
+ SOLUTIONS_CONFIRMATION_LATTER(18, "鎶曚繚鏂规纭涔�", "鎶曚繚鏂规纭涔�"),
+ MEMBER_LIST_LATTER(19, "濮旀墭淇� - 鎶曚繚浜哄憳鍚嶅崟", "濮旀墭淇� - 鎶曚繚浜哄憳鍚嶅崟"),
+ CHANGE_MEMBER_LIST_LATTER(20, "濮旀墭淇� - 鍔犲噺淇濅汉鍛樺悕鍗�", "濮旀墭淇� - 鍔犲噺淇濅汉鍛樺悕鍗�"),
+ WTB_BD_DONE_PDF(21, "濮旀墭鎶曚繚鍗� - 鍚堝苟鍗曟渶缁堜繚鍗�", "濮旀墭鎶曚繚鍗� - 鍚堝苟鍗曟渶缁堜繚鍗�"),
COMPANY_TBD_SIGNED_PDF(22, "鍚堝苟鍗�-鎶曚繚鍗�-鍟嗘埛鎻愪氦锛堜紒涓氱缃诧級PDF", "鍚堝苟鍗�-鎶曚繚鍗�-鍟嗘埛鎻愪氦锛堜紒涓氱缃诧級PDF"),
-
-
+ WTB_CA_DONE_PDF(23, "濮旀墭鍔犲噺淇�/鎹㈠巶涓氬姟 - 鍚堝苟鍗曟渶缁堜繚鍗�", "濮旀墭鍔犲噺淇�/鎹㈠巶涓氬姟 - 鍚堝苟鍗曟渶缁堜繚鍗�"),
+ WTB_CONFIRMATION_LATTER(24, "濮旀墭淇� - 鎶曚繚鏂规纭涔�", "濮旀墭淇� - 鎶曚繚鏂规纭涔�"),
+ WTB_CA_TBD_PDF(25, "濮旀墭鍔犲噺淇�/鎹㈠巶涓氬姟 -鎶曚繚鍗曪紙浼佷笟绛剧讲鍚嶱DF锛�", "濮旀墭鍔犲噺淇�/鎹㈠巶涓氬姟 -鎶曚繚鍗曪紙浼佷笟绛剧讲鍚嶱DF锛�"),
;
// 鎴愬憳鍙橀噺
private String name;
@@ -709,12 +715,12 @@
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;
@@ -769,9 +775,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),
@@ -786,6 +789,38 @@
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),
+
+
+
+ /**
+ * 濮旀墭淇� 鍔犲噺淇�/鎹㈠巶 鍚堝苟鍗�
+ */
+ 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;
@@ -865,11 +900,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;
@@ -960,10 +995,10 @@
public enum UnionChangeStatus {
- MERGE(0, "寰呯缃茬敵璇峰崟",""),
- UPLOAD_INSURANCE_POLICY(1, "寰呬笂浼犱繚鍗�",""),
+ MERGE(0, "寰呯缃�",""),
+ UPLOAD_INSURANCE_POLICY(1, "寰呭嚭鍗�",""),
FINISH(2, "淇濋殰涓�",""),
- CLOSE(3, "鍏抽棴",""),
+ CLOSE(3, "宸查��鍥�",""),
;
// 鎴愬憳鍙橀噺
private String name;
@@ -1039,8 +1074,8 @@
WTB_UPLOAD(20, "鎻愪氦鎶曚繚","",28),
- WTB_COMPANY_APPLY_SIGNATURE(21, "濮旀墭淇�-浼佷笟宸茬缃叉姇淇濈‘璁や功","鎻愪氦鎰忚锛�${param}",28),
- WTB_COMPANY_MEMBER_LIST_SIGNATURE(22, "濮旀墭淇�-浼佷笟宸茬缃蹭汉鍛樺悕鍗�","鎻愪氦鎰忚锛�${param}",22),
+ 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),
--
Gitblit v1.9.3