From 22271e641e4505ba906c3770905b7e84e3ad8d85 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 02 四月 2024 17:05:57 +0800
Subject: [PATCH] mrshi
---
server/service/src/main/java/com/doumee/core/utils/Constants.java | 121 ++++++++++++++++++++++++++--------------
1 files changed, 79 insertions(+), 42 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 c6be2c9..8b22c7f 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
@@ -43,7 +43,9 @@
public static final String RANGE_SIZE = "RANGE_SIZE";
public static final String CATE_PARAM_OPEN = "_CATE_PARAM_OPEN";
public static final String OPEN_SYNC_SWITCH = "OPEN_SYNC_SWITCH";
-
+ public static final String WX_MIN_PROGRAM = "WX_MIN_PROGRAM";
+ public static final String WX_MIN_APPID = "WX_MIN_APPID";
+ public static final String WX_MIN_SECRET = "WX_MIN_SECRET";
public static final String SYSTEM ="SYSTEM";
public static final String GOODS_IMG_DIR ="GOODS_IMG_DIR";
@@ -166,14 +168,23 @@
public static CountCyclePriceVO countPriceVO(Date startDate, Solutions solutions){
CountCyclePriceVO countCyclePriceVO = new CountCyclePriceVO();
if(solutions.getInsureCycleUnit().equals(Constants.ZERO)){
- countCyclePriceVO.setEndDate(DateUtil.afterDateByType(startDate,0,solutions.getInsureCycle()));
+ countCyclePriceVO.setEndDate(
+ DateUtil.getMontageDate(
+ DateUtil.afterDateByType(startDate,0,solutions.getInsureCycle()-1)
+ ,2)
+ );
}else if(solutions.getInsureCycleUnit().equals(Constants.TWO)){
+ //鑾峰彇褰撴湀澶╂暟
Integer monthDays = DateUtil.monthDays(startDate);
+ //鑾峰彇澶╂暟鍚庣殑鏃ユ湡
Date afterDate = DateUtil.afterDateByType(startDate,0,monthDays);
- countCyclePriceVO.setEndDate(DateUtil.afterDateByType(afterDate,0,-1));
+ //璧嬪�� 姣忔棩缁撴潫鏃跺垎绉�
+ countCyclePriceVO.setEndDate(DateUtil.getMontageDate(afterDate,3));
}else if(solutions.getInsureCycleUnit().equals(Constants.THREE)){
+ //鑾峰彇X骞村悗鏃ユ湡 澶氫簡涓�澶�
Date afterDate = DateUtil.afterDateByType(startDate,2,solutions.getInsureCycle());
- countCyclePriceVO.setEndDate(DateUtil.afterDateByType(afterDate,0,-1));
+ //璧嬪�� 姣忔棩缁撴潫鏃跺垎绉� 鐒跺悗鍑忓皯涓�澶�
+ countCyclePriceVO.setEndDate(DateUtil.getMontageDate(afterDate,3));
}
countCyclePriceVO.setCyclePrice(Constants.countDetailFee(solutions,countCyclePriceVO.getEndDate(),startDate));
return countCyclePriceVO;
@@ -182,13 +193,13 @@
public static Integer getSexByIdCard(String idCard){
Pattern pattern = Pattern.compile("\\d{17}[\\d|x]"); // 瀹氫箟韬唤璇佸彿鐮佹牸寮忕殑姝ｅ垯琛ㄨ揪寮�
Matcher matcher = pattern.matcher(idCard);
- Integer sex = 1;
+ Integer sex = 0;
if (matcher.matches()) {
int genderCode = Integer.parseInt(idCard.substring(16, 17)); // 浠庣17浣嶅紑濮嬫彁鍙栨�у埆缂栫爜锛堝鏁颁负鐢锋�э紝鍋舵暟涓哄コ鎬э級
if ((genderCode % 2 == 1) ) {
- sex = 1;
+ sex = 0;
} else {
- sex = 2;
+ sex = 1;
}
} else {
sex = -1;
@@ -546,7 +557,7 @@
public static void main(String[] args) {
- System.out.println("hello&&devicenumber=22110002&&uuid=1e52008fb8ff\n".length());
+ System.out.println("{\"companyName\":\"搴斿疂绉戞妧\",\"endtime\":\"2024-03-01 17:19:00\",\"erpId\":\"4D40185D5BC74A13821BE46EAF8B4179\",\"erpWithVisitDTOList\":[],\"faceImg\":\"20240304/1709518170325_742.jpg\",\"idcardNo\":\"342501199609300535\",\"idcardType\":0,\"name\":\"榛勬檵\",\"phone\":\"17756328697\",\"reason\":\"鎺㈤櫓\",\"receptMemberId\":\"E7E514BD7DE3F27CE0530B630A0AEAE0\",\"starttime\":\"2024-03-01 13:18:00\"}");
}
/**
* 鐢ㄦ埛绫诲瀷 0绯荤粺鐢ㄦ埛 1浼佷笟鐢ㄦ埛 2鏈嶅姟鏈烘瀯绠＄悊鍛� 3鏈嶅姟鏈烘瀯瀛愯处鍙� 4缁煎悎鏈嶅姟鍗曚綅绠＄悊鍛� 5缁煎悎鏈嶅姟鍗曚綅瀛愯处鍙� 6涓撳 7鍘垮尯鐢ㄦ埛 8甯傚眬鐢ㄦ埛
@@ -728,43 +739,48 @@
public enum ApplyLogType {
- UPLOAD(0, "鎻愪氦鎶曚繚","鎻愪氦鎰忚锛�${param}"),
- PLATFORM_RETURN(1, "閫�鍥炴姇淇�","鎻愪氦鎰忚锛�${param}"),
- WAIT_SIGNATURE(2, "涓婁紶鎶曚繚鍗�","鎻愪氦鎰忚锛�${param}"),
- SIGNATURE(3, "浼佷笟绛剧珷",""),
- FAIL_RETURN(4, "淇濆崟鍑哄叿澶辫触閫�鍥�","鎻愪氦鎰忚锛�${param}"),
- UPLOAD_INSURANCE(5, "淇濆崟瀹屾垚","淇濋櫓鐢熸晥璧锋湡锛�${param1}鍙樻洿涓�${param2}"),
- COMPANY_APPLY_RETURN(6, "鐢宠閫�鍥�","鎻愪氦鎰忚锛�${param}"),
- COMPANY_APPLY_CLOSE(7, "鍏抽棴鐢宠",""),
- PLATFORM_AGREE_BACK(8, "鍚屾剰閫�鍥炵敵璇�",""),
- PLATFORM_UN_AGREE_BACK(9, "椹冲洖閫�鍥炵敵璇�","鎻愪氦鎰忚锛�${param}"),
- COMPANY_EDIT(10, "淇濆崟淇敼","鎻愪氦鎰忚锛�${param1}\n${param2}"),
- PLATFORM_CHECK_PASS(11, "鎶曚繚瀹℃牳閫氳繃",""),
- CA_PLATFORM_CHECK_PASS_NO(12, "閫�鍥炴姇淇�","鎻愪氦鎰忚锛�${param}"),
- CA_PLATFORM_AGREE_BACK_APPLY(13, "鍚屾剰閫�鍥炵敵璇�","鎻愪氦鎰忚锛�${param}"),
- CA_PLATFORM_APPROVE(14, "鎵瑰崟瀹屾垚","淇濋櫓鐢熸晥璧锋湡锛�${param1}鍙樻洿涓�${param2}"),
- CA_PLATFORM_CHECK_SIGNATURE(15, "浼佷笟绛剧珷",""),
- CA_COMPANY_EDIT(16, "鎵瑰崟淇敼","鎻愪氦鎰忚锛�${param1}\n${param2}"),
- CA_COMPANY_COMMIT(17, "鎻愪氦鎶曚繚","鎻愪氦鎰忚锛�${param}"),
- CA_COMPANY_BACK_APPLY(18, "鐢宠閫�鍥�","鎻愪氦鎰忚锛�${param}"),
- CA_COMPANY_CLOSE(19, "鍏抽棴璁㈠崟",""),
- CA_PALTFORM_REFUSE_APPLY(20, "椹冲洖閫�鍥炵敵璇�",""),
- CA_PALTFORM_EDIT_PIDAN(21, "淇敼鎵瑰崟","淇敼鍘熷洜锛�${param}"),
- PALTFORM_EDIT_BD(22, "淇敼淇濆崟","淇敼鍘熷洜锛�${param}"),
- CA_JIAJIAN_APPLY_SIGN(23, "鍔犲噺淇濈敵璇蜂紒涓氱绔�",""),
+ UPLOAD(0, "鎻愪氦鎶曚繚","鎻愪氦鎰忚锛�${param}",0),
+ PLATFORM_RETURN(1, "閫�鍥炴姇淇�","鎻愪氦鎰忚锛�${param}",0),
+ WAIT_SIGNATURE(2, "涓婁紶鎶曚繚鍗�","鎻愪氦鎰忚锛�${param}",0),
+ SIGNATURE(3, "浼佷笟绛剧珷","",0),
+ FAIL_RETURN(4, "淇濆崟鍑哄叿澶辫触閫�鍥�","鎻愪氦鎰忚锛�${param}",0),
+ UPLOAD_INSURANCE(5, "淇濆崟瀹屾垚","淇濋櫓鐢熸晥璧锋湡锛�${param1}鍙樻洿涓�${param2}",0),
+ COMPANY_APPLY_RETURN(6, "鐢宠閫�鍥�","鎻愪氦鎰忚锛�${param}",0),
+ COMPANY_APPLY_CLOSE(7, "鍏抽棴鐢宠","",0),
+ PLATFORM_AGREE_BACK(8, "鍚屾剰閫�鍥炵敵璇�","",0),
+ 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_CHANGUNIT_APPLY_SIGN(24, "鎹㈡垚鐢宠浼佷笟绛剧珷",""),
+
+ CA_PLATFORM_CHECK_PASS_NO(12, "閫�鍥炴姇淇�","鎻愪氦鎰忚锛�${param}",1),
+ CA_PLATFORM_AGREE_BACK_APPLY(13, "鍚屾剰閫�鍥炵敵璇�","鎻愪氦鎰忚锛�${param}",1),
+ CA_PLATFORM_APPROVE(14, "鎵瑰崟瀹屾垚","淇濋櫓鐢熸晥璧锋湡锛�${param1}鍙樻洿涓�${param2}",1),
+ CA_PLATFORM_CHECK_SIGNATURE(15, "浼佷笟绛剧珷","",1),
+ CA_COMPANY_EDIT(16, "鎵瑰崟淇敼","鎻愪氦鎰忚锛�${param1}\n${param2}",1),
+ CA_COMPANY_COMMIT(17, "鎻愪氦鎶曚繚","",1),
+ CA_COMPANY_BACK_APPLY(18, "鐢宠閫�鍥�","鎻愪氦鎰忚锛�${param}",1),
+ CA_COMPANY_CLOSE(19, "鍏抽棴璁㈠崟","",1),
+ CA_PALTFORM_REFUSE_APPLY(20, "椹冲洖閫�鍥炵敵璇�","",1),
+ CA_PALTFORM_EDIT_PIDAN(21, "淇敼鎵瑰崟","淇敼鍘熷洜锛�${param}",1),
+ CA_JIAJIAN_APPLY_SIGN(23, "鍔犲噺淇濈敵璇蜂紒涓氱绔�","",1),
+ CA_CHANGUNIT_APPLY_SIGN(24, "鎹㈠巶鐢宠浼佷笟绛剧珷","",1),
+ CA_UPLOAD_AGAIN(25, "鍐嶆鎶曚繚","",1),
;
// 鎴愬憳鍙橀噺
private String name;
private String info;
private int key;
+ private int type;
// 鏋勯�犳柟娉�
- ApplyLogType(int key, String name,String info) {
+ ApplyLogType(int key, String name,String info,int type) {
this.name = name;
this.info = info;
this.key = key;
+ this.type = type;
}
// 鏅�氭柟娉�
@@ -784,6 +800,16 @@
}
return null;
}
+ public static List<Integer> getTypeList(int type) {
+ List<Integer> list = new ArrayList<>();
+ for (ApplyLogType c : ApplyLogType.values()) {
+ if (c.getType() == type) {
+ list.add(c.getKey());
+ }
+ }
+ return list;
+ }
+
// get set 鏂规硶
public String getName() {
@@ -809,6 +835,15 @@
public void setInfo(String info) {
this.info = info;
}
+
+
+ public int getType() {
+ return type;
+ }
+
+ public void setType(int type) {
+ this.type = type;
+ }
}
public enum InsuranceApplyStatus {
@@ -822,7 +857,8 @@
COMPANY_BACK_APPLY_WAIT_SIGNATURE(7, "浼佷笟鐢宠閫�鍥�(寰呯绔�)","鎻愪氦鎰忚锛�${param}",5),
COMPANY_BACK_APPLY_SIGNATURE(8, "浼佷笟鐢宠閫�鍥�(宸茬绔�)","鎻愪氦鎰忚锛�${param}",5),
CLOSE(9, "璁㈠崟鍏抽棴","",6),
- PLATFORM_CHECK_PASS(10,"骞冲彴鎶曚繚瀹℃牳閫氳繃","鎻愪氦鎰忚锛�${param}",1),
+ PLATFORM_CHECK_PASS(10,"骞冲彴鎶曚繚瀹℃牳閫氳繃","鎻愪氦鎰忚锛�${param}",0),
+ COMPANY_BACK_APPLY_PASS(11, "浼佷笟鐢宠閫�鍥�(骞冲彴鎶曚繚瀹℃牳閫氳繃)","鎻愪氦鎰忚锛�${param}",5),
;
// 鎴愬憳鍙橀噺
private String name;
@@ -972,12 +1008,13 @@
public enum NoticeType {
- ZERO(0, "寰呭鎵�","","","寰呭鏍�","宸茬敵璇�","寰呭彈鐞�"),
- ONE(1, "浼佷笟寰呯缃�","","","宸ョ寰呭鏍�","","瀹屾垚鍙楃悊"),
+ ZERO(0, "寰呭鎵�","","","寰呭鏍�","寰呭鐞�","澶勭悊涓�"),
+ ONE(1, "浼佷笟寰呯缃�","","","宸ョ寰呭鏍�","","宸茬粨妗�"),
TWO(2, "寰呭嚭鍗�","寰呭鎵�","寰呭鎵�","","",""),
THREE(3, "鐢宠閫�鍥�","鐢宠閫�鍥�","鐢宠閫�鍥�","","",""),
- FOUR(4, "宸查��鍥�","宸查��鍥�","宸查��鍥�","","",""),
- FIVE(5, "鐢宠椹冲洖","鐢宠椹冲洖","鐢宠椹冲洖","","","")
+ FOUR(4, "宸查��鍥�","宸查��鍥�","宸查��鍥�","","","宸叉挙閿�"),
+ FIVE(5, "鐢宠椹冲洖","鐢宠椹冲洖","鐢宠椹冲洖","","",""),
+ SIX(6, "","","","","","")
;
// 鎴愬憳鍙橀噺
@@ -1107,7 +1144,7 @@
public enum ApplyChangeStatus {
UPLOAD(0, "鎻愪氦鍔犲噺淇�/鎹㈠巶鐢宠"),
SIGNATURE(1, "宸茬绔�"),
- APPROVE(2, "宸蹭笂浼犲鎵�"),
+ APPROVE(2, "宸蹭笂浼犲鏍�"),
RETURN_APPLY_UPLOAD(3, "鍙戣捣閫�鍥炵敵璇�(寰呭鏍�)"),
RETURN_APPLY_SIGNATURE(4, "鍙戣捣閫�鍥炵敵璇凤紙宸茬绔狅級"),
PLATFORM_AGREE(5, "骞冲彴鍚屾剰锛堝凡閫�鍥烇級"),
@@ -1277,8 +1314,8 @@
public enum ApplyChangeLogStatus {
UPLOAD(0, "鍙戣捣鐢宠",""),
RETURN_APPLY(3, "鍙戣捣閫�鍥炵敵璇�","鎻愪氦鎰忚锛�${param}"),
- PLATFORM_AGREE(4, "骞冲彴瀹℃壒閫氳繃" ,"鎻愪氦鎰忚锛�${param}"),
- PLATFORM_UN_AGREE(0, "瀹℃壒椹冲洖","鎻愪氦鎰忚锛�${param}"),
+ PLATFORM_AGREE(4, "骞冲彴瀹℃牳閫氳繃" ,"鎻愪氦鎰忚锛�${param}"),
+ PLATFORM_UN_AGREE(0, "瀹℃牳椹冲洖","鎻愪氦鎰忚锛�${param}"),
CLOSE(5, "鍏抽棴",""),
;
// 鎴愬憳鍙橀噺
--
Gitblit v1.9.3