From 5ecb8706b917aa86f43e44a412e86e3e50b636c0 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期一, 09 六月 2025 09:54:04 +0800 Subject: [PATCH] 提交一把订单 --- server/service/src/main/java/com/doumee/core/utils/Constants.java | 80 +++++++++++++++++++++++++++++++++------- 1 files changed, 66 insertions(+), 14 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 fbc5eea..be029a4 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 @@ -21,7 +21,10 @@ import java.math.RoundingMode; import java.net.URL; import java.net.URLDecoder; +import java.time.Instant; import java.time.LocalDate; +import java.time.Period; +import java.time.ZoneId; import java.time.temporal.ChronoUnit; import java.util.*; import java.util.Date; @@ -316,6 +319,38 @@ } return Constants.countPriceVO(countCyclePriceDTO.getStartDate(),countCyclePriceDTO.getSolutions()); } + + public static int calculateAge(String idCard,Date dateDate) { + try{ + Integer happenYear = Integer.valueOf(DateUtil.dateToString(dateDate,"yyyy")); + Integer birthYear = Integer.valueOf(idCard.substring(6,10)); + return happenYear - birthYear; + }catch (Exception e){ + throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"骞撮緞淇℃伅閿欒"); + } + + + + + +// if (idCard == null || idCard.length() != 18) { +// throw new IllegalArgumentException("韬唤璇佸彿鐮佸繀椤绘槸18浣�"); +// } +// +// // 鎻愬彇鍑虹敓鏃ユ湡 +// String birthDateStr = idCard.substring(6, 14); // 渚嬪锛�19900101 +// LocalDate birthDate = LocalDate.parse(birthDateStr); +// Instant instant = dateDate.toInstant(); +// // 鑾峰彇褰撳墠鏃ユ湡 +// LocalDate currentDate = instant.atZone(ZoneId.systemDefault()).toLocalDate(); // 杞崲涓� LocalDate +// +// // 璁$畻骞撮緞 +// Period period = Period.between(birthDate, currentDate); +// int age = period.getYears(); // 鐩存帴鑾峰彇骞翠唤宸嵆涓哄勾榫� + +// return age; + } + public static CountCyclePriceVO countPriceVO(Date startDate, Solutions solutions){ CountCyclePriceVO countCyclePriceVO = new CountCyclePriceVO(); @@ -1632,10 +1667,11 @@ CHANGE_FACTORY(2, "鍛樺伐鎹㈠巶鐢宠","淇濋櫓鏂规"), DISPATCH_UNIT(3, "娲鹃仯鍗曚綅鐢宠","娲鹃仯鍗曚綅"), TAXES(4, "寮�绁ㄧ敵璇�","寮�绁ㄩ噾棰�"), - SETTLE_CLAIMS(5, "鎶ユ鐞嗚禂","鎶ユ浜�"), + SETTLE_CLAIMS(5, "鐞嗚禂鎻愰啋","鎶ユ淇℃伅"), CONTRACT(6, "鍚堝悓绛剧讲","鍚堝悓绛剧讲"), SOLUTIONS(7, "鏂规绛剧讲","鏂规绛剧讲"), COMPANY_USER_APPLY(8, "闆嗗洟鐢宠","闆嗗洟鐢宠"), + SETTLE_CLAIMS_APPLY_ADMIN(9, "鎶ユ鐞嗚禂","寰呯珛妗�"), ; // 鎴愬憳鍙橀噺 private int key; @@ -1690,19 +1726,36 @@ public enum NoticeType { - ZERO(0, "寰呭鏍�","","","寰呭鏍�","寰呭鐞�","澶勭悊涓�","寰呯缃�","寰呯缃�"), - ONE(1, "浼佷笟寰呯缃�","","","宸ョ寰呭鏍�","","宸茬粨妗�","",""), - TWO(2, "寰呭嚭鍗�","寰呭鏍�","寰呭鏍�","","","","",""), - THREE(3, "鐢宠閫�鍥�","鐢宠閫�鍥�","鐢宠閫�鍥�","","","","",""), - FOUR(4, "宸查��鍥�","宸查��鍥�","宸查��鍥�","","","宸叉挙閿�","",""), - FIVE(5, "鐢宠椹冲洖","鐢宠椹冲洖","鐢宠椹冲洖","","","","",""), + ZERO(0, "寰呭鏍�","","","寰呭鏍�","寰呭鐞�","椋庨櫓妗堜欢寰呭鏍�","寰呯缃�","寰呯缃�"), + //鐞嗚禂閫氱煡浼佷笟锛堥潪寰呭姙锛� + ONE(1, "浼佷笟寰呯缃�","","","宸ョ寰呭鏍�","","椋庨櫓妗堜欢绔嬫閫�鍥�","",""), + TWO(2, "寰呭嚭鍗�","寰呭鏍�","寰呭鏍�","","","宸茬珛妗堝緟鍙楃悊","",""), + THREE(3, "鐢宠閫�鍥�","鐢宠閫�鍥�","鐢宠閫�鍥�","","","宸插彈鐞嗭紝闇�瑕佽ˉ鍏呮潗鏂�","",""), + //鐞嗚禂閫氱煡浼佷笟锛堥潪寰呭姙锛� + FOUR(4, "宸查��鍥�","宸查��鍥�","宸查��鍥�","","","宸叉嫆缁濆彈鐞�","",""), + FIVE(5, "鐢宠椹冲洖","鐢宠椹冲洖","鐢宠椹冲洖","","","鍟嗚寰呴瀵煎鎵�","",""), //缁繚閫氱煡 - SIX(6, "","","","","","","",""), - //鍟嗘埛绔� 濮旀墭淇� - 鎶曚繚寰呭鏍� 鍔犲噺淇� 鎹㈠巶 寰呭鏍� - SEVEN(7, "寰呭鏍�","寰呭鏍�","寰呭鏍�","","","","",""), + SIX(6, "","","","","","鍟嗚瀹℃壒鎷掔粷","",""), + //鍟嗘埛绔� 濮旀墭淇� - 鎶曚繚寰呭鏍� 鍔犲噺淇� 鎹㈠巶 寰呭鏍�, 鐞嗚禂閫氱煡浼佷笟锛堥潪寰呭姙锛� + SEVEN(7, "寰呭鏍�","寰呭鏍�","寰呭鏍�","","","鍟嗚瀹℃壒鎷掔粷閫氱煡","",""), //寰呭瀹� - EIGHT(8, "寰呭鏍�","","","","","","",""), - NINE(9, "","","","","","","",""), + EIGHT(8, "寰呭鏍�","","","","","寰呯悊绠�","",""), + NINE(9, "","","","","","寰呮牳璧�","",""), + TEN(10, "","","","","","寰呮牳璧旂‘璁�","",""), + ELEVEN(11, "","","","","","璧斾粯閲戦宸插彉鏇�","",""), + TWELVE(12, "","","","","","寰呯粨妗�","",""), + //鐞嗚禂閫氱煡骞冲彴锛堥潪浠e姙锛� + THIRTEEN(13, "","","","","","宸茬粨妗堬紝璧斾粯娆鹃」灏嗗湪1-3涓伐浣滄棩鍐呭埌璐�","",""), + //鐞嗚禂閫氱煡骞冲彴锛堥潪浠e姙锛� + FOURTEEN(14, "","","","","","宸叉挙妗�","",""), + //鐞嗚禂閫氱煡浼佷笟锛堥潪寰呭姙锛� + FIFTEEN(15, "","","","","","宸插彈鐞嗗緟鐞嗙畻","",""), + //鐞嗚禂閫氱煡浼佷笟(闈炲緟鍔烇級 + SIXTEEN(16, "","","","","","鍙楃悊瀹℃壒涓�","",""), + //鐞嗚禂閫氱煡浼佷笟(闈炲緟鍔烇級 + SEVENTEEN(17, "","","","","","宸茬悊绠楀緟鏍歌禂","",""), + //鐞嗚禂閫氱煡浼佷笟(闈炲緟鍔烇級 + EIGHTEEN(18, "","","","","","寰呯粨妗堬紝璧斾粯閲戦宸插彉鏇�","",""), ; // 鎴愬憳鍙橀噺 @@ -2016,7 +2069,7 @@ UPDATE_DATA(4, "淇敼淇℃伅","鎻愪氦鎰忚锛�${param}"), SUPPLEMENT(5, "琛ュ厖璇存槑","鎻愪氦鎰忚锛�${param}"), PLATFORM_LP_DEAL(6, "骞冲彴鐞嗚禂澶勭悊","宸插湪骞冲彴瀹屾垚鐞嗚禂"), - PLATFORM_REMARK(7, "骞冲彴澶囨敞鏍囩","${param}"), + PLATFORM_REMARK(7, "澶囨敞鏍囩","${param}"), PLATFORM_ADDCODE(8, "骞冲彴娣诲姞鎶ユ鍙�","澶囨鍙凤細${param}"), PLATFORM_UN_AGREE_BACK(9, "浼佷笟涓嬭浇璧勬枡",""), PLATFORM_DOWNLOAD(10, "骞冲彴涓嬭浇璧勬枡",""), @@ -2125,7 +2178,6 @@ } return null; } - // 鏅�氭柟娉� public static SettleClaimsLogParentStatus getAll(int index) { -- Gitblit v1.9.3