From 6e8501e2ebc00deec415088a1cbd98db8a55a6b1 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 29 一月 2024 20:12:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/service/src/main/java/com/doumee/core/utils/Constants.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 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 624e0a1..b2a5e09 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;
@@ -665,8 +665,9 @@
BZZ(2, "淇濋殰涓�"),
YGQ(3, "宸茶繃鏈�"),
YTH(4, "宸查��鍥�"),
- THSQZ(5, "閫�鍥炵敵璇蜂腑"),
+ THSQZ(5, "鐢宠閫�鍥�"),
YGB(6, "宸插叧闂�"),
+ DQYQZ(7, "寰呯缃�"),
;
// 鎴愬憳鍙橀噺
private String name;
@@ -795,9 +796,9 @@
public enum InsuranceApplyStatus {
UPLOAD(0, "鎻愪氦鎶曚繚","",0),
PLATFORM_RETURN(1, "瀹℃牳涓嶉�氳繃","鎻愪氦鎰忚锛�${param}",4),
- WAIT_SIGNATURE(2, "宸蹭笂浼犱唬绛剧敵璇疯〃寰呬紒涓氱绔�","",1),
+ WAIT_SIGNATURE(2, "宸蹭笂浼犱唬绛剧敵璇疯〃寰呬紒涓氱绔�","",7),
SIGNATURE(3, "宸茬绔犲緟涓婁紶淇濋櫓鍗�","",1),
- FAIL_RETURN(4, "淇濆崟鍑哄叿澶辫触閫�鍥�","",0),
+ FAIL_RETURN(4, "淇濆崟鍑哄叿澶辫触閫�鍥�","",4),
UPLOAD_INSURANCE(5, "淇濆崟瀹屾垚","淇濋櫓鐢熸晥璧锋湡锛�${param}鍙樻洿涓�${param1}",2),
COMPANY_BACK_APPLY_UPLOAD(6, "浼佷笟鐢宠閫�鍥�(鎻愪氦鎶曚繚)","鎻愪氦鎰忚锛�${param}",5),
COMPANY_BACK_APPLY_WAIT_SIGNATURE(7, "浼佷笟鐢宠閫�鍥�(寰呯绔�)","鎻愪氦鎰忚锛�${param}",5),
@@ -899,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);
--
Gitblit v1.9.3