From 5506edbe54883b31db3cc8e4a1d9d0795a18a3c9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 27 十二月 2024 14:37:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/service/src/main/java/com/doumee/core/utils/Constants.java | 167 +++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 129 insertions(+), 38 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 ca292c1..c7d899f 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
@@ -35,6 +35,8 @@
public static final int TWO = 2 ;
public static final int
THREE = 3 ;
+ public static final int FIVE = 5 ;
+ public static final int SIX = 6 ;
public static final int SEVEN = 7 ;
public static final String ACCESS_ID="ACCESS_ID";
public static final String BUCKETNAME = "BUCKETNAME";
@@ -54,6 +56,9 @@
public static final String WX_MIN_APPID = "WX_MIN_APPID";
public static final String WX_MIN_SECRET = "WX_MIN_SECRET";
+ public static final String PLAT_COMPANY_NAME ="PLAT_COMPANY_NAME";
+ public static final String PLAT_CREDIT_CODE ="PLAT_CREDIT_CODE";
+ public static final String PLAT_EMAIL ="PLAT_EMAIL";
public static final String SYSTEM ="SYSTEM";
public static final String PROTOCOL ="PROTOCOL";
public static final String PRIVACY ="PRIVACY";
@@ -91,6 +96,10 @@
public static final String SMS_COMNAME = "SMS_COMNAME";
public static final String TAXES_FILE = "TAXES_FILE";
public static final String APPLY_FILE ="APPLY_FILE" ;
+ public static final String COMPANY_USER_APPLY ="COMPANY_USER_APPLY" ;
+ public static final String INSURANCE ="INSURANCE" ;
+ public static final String CONTRACT ="CONTRACT" ;
+
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";
@@ -717,6 +726,12 @@
WTB_CA_DONE_PDF(23, "濮旀墭鍔犲噺淇�/鎹㈠巶涓氬姟 - 鍚堝苟鍗曟渶缁堜繚鍗�", "濮旀墭鍔犲噺淇�/鎹㈠巶涓氬姟 - 鍚堝苟鍗曟渶缁堜繚鍗�"),
WTB_CONFIRMATION_LATTER(24, "濮旀墭淇� - 鎶曚繚鏂规纭涔�", "濮旀墭淇� - 鎶曚繚鏂规纭涔�"),
WTB_CA_TBD_PDF(25, "濮旀墭鍔犲噺淇�/鎹㈠巶涓氬姟 -鐢宠鍗曪紙鍟嗘埛绛剧讲鍚嶱DF锛�", "濮旀墭鍔犲噺淇�/鎹㈠巶涓氬姟 -鐢宠鍗曪紙鍟嗘埛绛剧讲鍚嶱DF锛�"),
+
+ CONTRACT_PDF(26, "鍚堝悓闄勪欢", "鍚堝悓闄勪欢"),
+ CONTRACT_FIRST_PDF(27, "鍚堝悓绛剧讲闄勪欢", "鍚堝悓绛剧讲闄勪欢"),
+ CONTRACT_DONE_PDF(28, "鍚堝悓绛剧讲闄勪欢", "鍚堝悓绛剧讲闄勪欢"),
+ COMPANY_SOLUTION_SIGN_PDF(29, "浼佷笟绛剧讲鍚庢柟妗堢‘璁や功", "浼佷笟绛剧讲鍚庢柟妗堢‘璁や功"),
+ COMPANY_USER_APPLY(30, "浼佷笟鐢宠闆嗗洟鐢ㄦ埛闄勪欢", "浼佷笟鐢宠闆嗗洟鐢ㄦ埛闄勪欢"),
;
// 鎴愬憳鍙橀噺
private String name;
@@ -833,10 +848,8 @@
}
public static void main(String[] args) {
- System.out.println(IdcardUtil.isValidCard("342623199201150101"));
- System.out.println(IdcardUtil.isValidCard("342623199201150102"));
- System.out.println(IdcardUtil.isValidCard("342623199201150103"));
- System.out.println(IdcardUtil.isValidCard("342623199201150104"));
+ System.out.println(BigDecimal.valueOf(3.45678).setScale(2,BigDecimal.ROUND_HALF_UP));
+ System.out.println(BigDecimal.valueOf(3.45678).setScale(2,BigDecimal.ROUND_DOWN));
// System.out.println(IdcardUtil.isValidCard("340621199310134818"));
// System.out.println(IdcardUtil.isValidCard("341621199310134818"));
@@ -1077,6 +1090,7 @@
IA_HBD_UPLOAD_INSURANCE(35, "鎶曚繚瀹屾垚","淇濋櫓鐢熸晥璧锋湡锛�${param1}鍙樻洿涓�${param2}",3),
IA_HBD_CLOSE(36, "閫�鍥炵敵璇�","鍘熷洜锛�${param}",3),
IA_HBD_UPLOAD_BXD(41, "涓婁紶淇濋櫓鍗�","",3),
+ IA_HBD_REEXAMINE_PASS(42, "澶嶅閫氳繃","",3),
@@ -1176,6 +1190,7 @@
UPLOAD_INSURANCE_POLICY(2, "寰呭嚭鍗�","",0),
FINISH(3, "淇濋殰涓�","",0),
CLOSE(4, "宸查��鍥�","",0),
+ RETRIAL(5, "寰呭鏍�","",0),
;
// 鎴愬憳鍙橀噺
private String name;
@@ -1463,7 +1478,7 @@
CLOSE(9, "璁㈠崟鍏抽棴","",6),
PLATFORM_CHECK_PASS(10,"骞冲彴鎶曚繚瀹℃牳閫氳繃","鎻愪氦鎰忚锛�${param}",0),
COMPANY_BACK_APPLY_PASS(11, "浼佷笟鐢宠閫�鍥�(骞冲彴鎶曚繚瀹℃牳閫氳繃)","鎻愪氦鎰忚锛�${param}",5),
-
+ REEXAMINE(12, "鍟嗘埛鎴栧钩鍙板瀹�","澶嶅鎰忚锛�${param}",0),
WTB_UPLOAD(20, "鎻愪氦鎶曚繚","",28),
@@ -1472,7 +1487,7 @@
WTB_BUSINESS_CHECK_PASS(23,"鍟嗘埛鎶曚繚瀹℃牳閫氳繃","鎻愪氦鎰忚锛�${param}",23),
WTB_RETURN(24, "宸查��鍥�","鎻愪氦鎰忚锛�${param}",24),
WTB_CLOSED(25, "宸插叧闂�","鎻愪氦鎰忚锛�${param}",25),
- WTB_TOUBAOING(26, "鎶曚繚涓�","鎻愪氦鎰忚锛�${param}",26),
+ WTB_TOUBAOING(26, "寰呭嚭鍗�","鎻愪氦鎰忚锛�${param}",26),
WTB_DONE(27, "淇濋殰涓�","鎻愪氦鎰忚锛�${param}",27),
;
@@ -1569,7 +1584,10 @@
CHANGE_FACTORY(2, "鍛樺伐鎹㈠巶鐢宠","淇濋櫓鏂规"),
DISPATCH_UNIT(3, "娲鹃仯鍗曚綅鐢宠","娲鹃仯鍗曚綅"),
TAXES(4, "寮�绁ㄧ敵璇�","寮�绁ㄩ噾棰�"),
- SETTLE_CLAIMS(5, "鎶ユ鐞嗚禂","鎶ユ浜�")
+ SETTLE_CLAIMS(5, "鎶ユ鐞嗚禂","鎶ユ浜�"),
+ CONTRACT(6, "鍚堝悓绛剧讲","鍚堝悓绛剧讲"),
+ SOLUTIONS(7, "鏂规绛剧讲","鏂规绛剧讲"),
+ COMPANY_USER_APPLY(8, "闆嗗洟鐢宠","闆嗗洟鐢宠"),
;
// 鎴愬憳鍙橀噺
private int key;
@@ -1624,18 +1642,19 @@
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, "","","","","",""),
+ SIX(6, "","","","","","","",""),
//鍟嗘埛绔� 濮旀墭淇� - 鎶曚繚寰呭鏍� 鍔犲噺淇� 鎹㈠巶 寰呭鏍�
- SEVEN(7, "寰呭鏍�","寰呭鏍�","寰呭鏍�","","",""),
- EIGHT(8, "","","","","",""),
- NINE(9, "","","","","",""),
+ SEVEN(7, "寰呭鏍�","寰呭鏍�","寰呭鏍�","","","","",""),
+ //寰呭瀹�
+ EIGHT(8, "寰呭鏍�","","","","","","",""),
+ NINE(9, "","","","","","","",""),
;
// 鎴愬憳鍙橀噺
@@ -1646,11 +1665,13 @@
private String dispatchUnitDetail;
private String taxesDetail;
private String settleClaimsDetail;
+ private String contract;
+ private String solutions;
// 鏋勯�犳柟娉�
NoticeType(int status, String insuranceApplyDetail,String applyChangeDetail
, String changeFactoryDetail,String dispatchUnitDetail
- , String taxesDetail,String settleClaimsDetail) {
+ , String taxesDetail,String settleClaimsDetail,String contract,String solutions) {
this.status = status;
this.insuranceApplyDetail = insuranceApplyDetail;
this.applyChangeDetail = applyChangeDetail;
@@ -1658,6 +1679,8 @@
this.dispatchUnitDetail = dispatchUnitDetail;
this.taxesDetail = taxesDetail;
this.settleClaimsDetail = settleClaimsDetail;
+ this.contract = contract;
+ this.solutions = solutions;
}
// 鏅�氭柟娉�
@@ -1676,6 +1699,10 @@
return c.getTaxesDetail();
}else if(type == NoticeObjectType.SETTLE_CLAIMS.getKey()){
return c.getSettleClaimsDetail();
+ }else if(type == NoticeObjectType.CONTRACT.getKey()){
+ return c.getContract();
+ }else if(type == NoticeObjectType.SOLUTIONS.getKey()){
+ return c.getContract();
}
}
}
@@ -1739,6 +1766,13 @@
this.settleClaimsDetail = settleClaimsDetail;
}
+ public String getContract() {
+ return contract;
+ }
+
+ public void setContract(String info) {
+ this.contract = contract;
+ }
}
@@ -1813,6 +1847,52 @@
}
+ public enum CONTRACT_STATUS{
+ WAIT(0, "寰呯缃�"),
+ OUT_SIGN(1, "鎴戞柟宸茬缃�"),
+ COMPANY_SIGN(2, "浼佷笟/鍟嗘埛宸茬缃�"),
+ FINISH(3, "宸插畬鎴�"),
+ CANCEL(4, "宸插彇娑�"),
+ CLOSE(5, "宸插叧闂�"),
+ ;
+ // 鎴愬憳鍙橀噺
+ private String name;
+ private int key;
+
+ // 鏋勯�犳柟娉�
+ CONTRACT_STATUS(int key, String name) {
+ this.name = name;
+ this.key = key;
+ }
+ // 鏅�氭柟娉�
+ public static String getName(int index) {
+ for (CONTRACT_STATUS c : CONTRACT_STATUS.values()) {
+ if (c.getKey() == index) {
+ return c.name;
+ }
+ }
+ return null;
+ }
+ // get set 鏂规硶
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public int getKey() {
+ return key;
+ }
+
+ public void setKey(int key) {
+ this.key = key;
+ }
+
+
+
+ }
public enum SettleClaimsStatus {
@@ -2306,18 +2386,18 @@
}else{
if(solutions.getInsureCycleUnit().equals(Constants.InsureCycleUnit.DAY.getValue())){
//澶╀负鎵规敼鍗曚綅
- return fee.multiply(new BigDecimal(days)).divide(new BigDecimal(countDays),2, RoundingMode.HALF_UP);
+ return fee.multiply(new BigDecimal(days)).divide(new BigDecimal(countDays),6, RoundingMode.HALF_UP);
}else if(solutions.getInsureCycleUnit().equals(Constants.InsureCycleUnit.HALF_MONTH.getValue())) {
//鍗婃湀涓烘壒鏀瑰崟浣�
BigDecimal cycle = new BigDecimal(days).divide(insureCycleUnit.getDays(),0,RoundingMode.CEILING);
//鏍规嵁鎶曚繚鍛ㄦ湡 瀹氫箟鐨� 姣忎釜鍛ㄦ湡 = X涓� 鍗婃湀鍛ㄦ湡 杩涜璁＄畻
// 鎬婚噾棰� * 浜х敓璐圭敤鐨勫懆鏈� / 鎶曚繚鍛ㄦ湡瀹氫箟鐨� 鍗婃湀鍛ㄦ湡鏁�
- return fee.multiply(cycle).divide(new BigDecimal(timeUnit.getCoefficient()),2, RoundingMode.HALF_UP);
+ return fee.multiply(cycle).divide(new BigDecimal(timeUnit.getCoefficient()),6, RoundingMode.HALF_UP);
}else if(solutions.getInsureCycleUnit().equals(Constants.InsureCycleUnit.MONTH.getValue())) {
//鏈堜唤涓烘壒鏀瑰崟浣�
BigDecimal cycle = new BigDecimal(DateUtil.getDifferenceMonths(reduceEndTime,reduceStartTime));
// 鎬婚噾棰� * 浜х敓璐圭敤鐨勫懆鏈� / 鎶曚繚鍛ㄦ湡瀹氫箟鐨� 鍗婃湀鍛ㄦ湡鏁� * 2
- return fee.multiply(cycle).multiply(new BigDecimal(2)).divide(new BigDecimal(timeUnit.getCoefficient()),2, RoundingMode.HALF_UP);
+ return fee.multiply(cycle).multiply(new BigDecimal(2)).divide(new BigDecimal(timeUnit.getCoefficient()),6, RoundingMode.HALF_UP);
}else if(solutions.getInsureCycleUnit().equals(Constants.InsureCycleUnit.QUARTER.getValue())) {
//瀛ｅ害涓烘壒鏀瑰崟浣�
@@ -2326,7 +2406,7 @@
//杞崲涓� 鎬诲搴�
cycle = cycle.divide(new BigDecimal(3),0,RoundingMode.CEILING);
// 鎬婚噾棰� * 浜х敓璐圭敤鐨勫懆鏈� / 鎶曚繚鍛ㄦ湡瀹氫箟鐨� 鍗婃湀鍛ㄦ湡鏁� * 6
- return fee.multiply(cycle).multiply(new BigDecimal(6)).divide(new BigDecimal(timeUnit.getCoefficient()),2, RoundingMode.HALF_UP);
+ return fee.multiply(cycle).multiply(new BigDecimal(6)).divide(new BigDecimal(timeUnit.getCoefficient()),6, RoundingMode.HALF_UP);
}else if(solutions.getInsureCycleUnit().equals(Constants.InsureCycleUnit.HALF_YEAR.getValue())) {
//鍗婂勾涓烘壒鏀瑰崟浣�
//鏌ヨ浜х敓璐圭敤鎬绘湀浠�
@@ -2334,7 +2414,7 @@
//杞崲涓� 鍗婂勾
cycle = cycle.divide(new BigDecimal(6),0,RoundingMode.CEILING);
// 鎬婚噾棰� * 浜х敓璐圭敤鐨勫懆鏈� / 鎶曚繚鍛ㄦ湡瀹氫箟鐨� 鍗婃湀鍛ㄦ湡鏁� * 6
- return fee.multiply(cycle).multiply(new BigDecimal(12)).divide(new BigDecimal(timeUnit.getCoefficient()),2, RoundingMode.HALF_UP);
+ return fee.multiply(cycle).multiply(new BigDecimal(12)).divide(new BigDecimal(timeUnit.getCoefficient()),6, RoundingMode.HALF_UP);
}else {
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏂规閰嶇疆閿欒");
}
@@ -2359,18 +2439,18 @@
}else{
if(solutions.getInsureCycleUnit().equals(Constants.InsureCycleUnit.DAY.getValue())){
//澶╀负鎵规敼鍗曚綅
- return fee.multiply(new BigDecimal(days)).divide(new BigDecimal(countDays),2, RoundingMode.HALF_UP);
+ return fee.multiply(new BigDecimal(days)).divide(new BigDecimal(countDays),6, RoundingMode.HALF_UP);
}else if(solutions.getInsureCycleUnit().equals(Constants.InsureCycleUnit.HALF_MONTH.getValue())) {
//鍗婃湀涓烘壒鏀瑰崟浣�
BigDecimal cycle = new BigDecimal(days).divide(insureCycleUnit.getDays(),0,RoundingMode.CEILING);
//鏍规嵁鎶曚繚鍛ㄦ湡 瀹氫箟鐨� 姣忎釜鍛ㄦ湡 = X涓� 鍗婃湀鍛ㄦ湡 杩涜璁＄畻
// 鎬婚噾棰� * 浜х敓璐圭敤鐨勫懆鏈� / 鎶曚繚鍛ㄦ湡瀹氫箟鐨� 鍗婃湀鍛ㄦ湡鏁�
- return fee.multiply(cycle).divide(new BigDecimal(timeUnit.getCoefficient()),2, RoundingMode.HALF_UP);
+ return fee.multiply(cycle).divide(new BigDecimal(timeUnit.getCoefficient()),6, RoundingMode.HALF_UP);
}else if(solutions.getInsureCycleUnit().equals(Constants.InsureCycleUnit.MONTH.getValue())) {
//鏈堜唤涓烘壒鏀瑰崟浣�
BigDecimal cycle = new BigDecimal(DateUtil.getDifferenceMonths(newEndTime,newStartTime));
// 鎬婚噾棰� * 浜х敓璐圭敤鐨勫懆鏈� / 鎶曚繚鍛ㄦ湡瀹氫箟鐨� 鍗婃湀鍛ㄦ湡鏁� * 2
- return fee.multiply(cycle).multiply(new BigDecimal(2)).divide(new BigDecimal(timeUnit.getCoefficient()),2, RoundingMode.HALF_UP);
+ return fee.multiply(cycle).multiply(new BigDecimal(2)).divide(new BigDecimal(timeUnit.getCoefficient()),6, RoundingMode.HALF_UP);
}else if(solutions.getInsureCycleUnit().equals(Constants.InsureCycleUnit.QUARTER.getValue())) {
//瀛ｅ害涓烘壒鏀瑰崟浣�
@@ -2379,7 +2459,7 @@
//杞崲涓� 鎬诲搴�
cycle = cycle.divide(new BigDecimal(3),0,RoundingMode.CEILING);
// 鎬婚噾棰� * 浜х敓璐圭敤鐨勫懆鏈� / 鎶曚繚鍛ㄦ湡瀹氫箟鐨� 鍗婃湀鍛ㄦ湡鏁� * 6
- return fee.multiply(cycle).multiply(new BigDecimal(6)).divide(new BigDecimal(timeUnit.getCoefficient()),2, RoundingMode.HALF_UP);
+ return fee.multiply(cycle).multiply(new BigDecimal(6)).divide(new BigDecimal(timeUnit.getCoefficient()),6, RoundingMode.HALF_UP);
}else if(solutions.getInsureCycleUnit().equals(Constants.InsureCycleUnit.HALF_YEAR.getValue())) {
//鍗婂勾涓烘壒鏀瑰崟浣�
//鏌ヨ浜х敓璐圭敤鎬绘湀浠�
@@ -2387,7 +2467,7 @@
//杞崲涓� 鍗婂勾
cycle = cycle.divide(new BigDecimal(6),0,RoundingMode.CEILING);
// 鎬婚噾棰� * 浜х敓璐圭敤鐨勫懆鏈� / 鎶曚繚鍛ㄦ湡瀹氫箟鐨� 鍗婃湀鍛ㄦ湡鏁� * 6
- return fee.multiply(cycle).multiply(new BigDecimal(12)).divide(new BigDecimal(timeUnit.getCoefficient()),2, RoundingMode.HALF_UP);
+ return fee.multiply(cycle).multiply(new BigDecimal(12)).divide(new BigDecimal(timeUnit.getCoefficient()),6, RoundingMode.HALF_UP);
}else {
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏂规閰嶇疆閿欒");
}
@@ -2415,18 +2495,18 @@
}else{
if(solutions.getInsureCycleUnit().equals(Constants.InsureCycleUnit.DAY.getValue())){
//澶╀负鎵规敼鍗曚綅
- return fee.multiply(new BigDecimal(days)).divide(new BigDecimal(countDays),2, RoundingMode.HALF_UP);
+ return fee.multiply(new BigDecimal(days)).divide(new BigDecimal(countDays),6, RoundingMode.HALF_UP);
}else if(solutions.getInsureCycleUnit().equals(Constants.InsureCycleUnit.HALF_MONTH.getValue())) {
//鍗婃湀涓烘壒鏀瑰崟浣�
BigDecimal cycle = new BigDecimal(days).divide(insureCycleUnit.getDays(),0,RoundingMode.CEILING);
//鏍规嵁鎶曚繚鍛ㄦ湡 瀹氫箟鐨� 姣忎釜鍛ㄦ湡 = X涓� 鍗婃湀鍛ㄦ湡 杩涜璁＄畻
// 鎬婚噾棰� * 浜х敓璐圭敤鐨勫懆鏈� / 鎶曚繚鍛ㄦ湡瀹氫箟鐨� 鍗婃湀鍛ㄦ湡鏁�
- return fee.multiply(cycle).divide(new BigDecimal(timeUnit.getCoefficient()),2, RoundingMode.HALF_UP);
+ return fee.multiply(cycle).divide(new BigDecimal(timeUnit.getCoefficient()),6, RoundingMode.HALF_UP);
}else if(solutions.getInsureCycleUnit().equals(Constants.InsureCycleUnit.MONTH.getValue())) {
//鏈堜唤涓烘壒鏀瑰崟浣�
BigDecimal cycle = new BigDecimal(DateUtil.getDifferenceMonths(new Date(),startTime));
// 鎬婚噾棰� * 浜х敓璐圭敤鐨勫懆鏈� / 鎶曚繚鍛ㄦ湡瀹氫箟鐨� 鍗婃湀鍛ㄦ湡鏁� * 2
- return fee.multiply(cycle).multiply(new BigDecimal(2)).divide(new BigDecimal(timeUnit.getCoefficient()),2, RoundingMode.HALF_UP);
+ return fee.multiply(cycle).multiply(new BigDecimal(2)).divide(new BigDecimal(timeUnit.getCoefficient()),6, RoundingMode.HALF_UP);
}else if(solutions.getInsureCycleUnit().equals(Constants.InsureCycleUnit.QUARTER.getValue())) {
//瀛ｅ害涓烘壒鏀瑰崟浣�
@@ -2435,7 +2515,7 @@
//杞崲涓� 鎬诲搴�
cycle = cycle.divide(new BigDecimal(3),0,RoundingMode.CEILING);
// 鎬婚噾棰� * 浜х敓璐圭敤鐨勫懆鏈� / 鎶曚繚鍛ㄦ湡瀹氫箟鐨� 鍗婃湀鍛ㄦ湡鏁� * 6
- return fee.multiply(cycle).multiply(new BigDecimal(6)).divide(new BigDecimal(timeUnit.getCoefficient()),2, RoundingMode.HALF_UP);
+ return fee.multiply(cycle).multiply(new BigDecimal(6)).divide(new BigDecimal(timeUnit.getCoefficient()),6, RoundingMode.HALF_UP);
}else if(solutions.getInsureCycleUnit().equals(Constants.InsureCycleUnit.HALF_YEAR.getValue())) {
//鍗婂勾涓烘壒鏀瑰崟浣�
//鏌ヨ浜х敓璐圭敤鎬绘湀浠�
@@ -2443,7 +2523,7 @@
//杞崲涓� 鍗婂勾
cycle = cycle.divide(new BigDecimal(6),0,RoundingMode.CEILING);
// 鎬婚噾棰� * 浜х敓璐圭敤鐨勫懆鏈� / 鎶曚繚鍛ㄦ湡瀹氫箟鐨� 鍗婃湀鍛ㄦ湡鏁� * 6
- return fee.multiply(cycle).multiply(new BigDecimal(12)).divide(new BigDecimal(timeUnit.getCoefficient()),2, RoundingMode.HALF_UP);
+ return fee.multiply(cycle).multiply(new BigDecimal(12)).divide(new BigDecimal(timeUnit.getCoefficient()),6, RoundingMode.HALF_UP);
}else {
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏂规閰嶇疆閿欒");
}
@@ -2459,27 +2539,38 @@
}else{
if(solutions.getInsureCycleUnit().equals(Constants.InsureCycleUnit.DAY.getValue())){
//澶╀负鎵规敼鍗曚綅
- return fee.divide(new BigDecimal(countDays),2, RoundingMode.HALF_UP);
+ return fee.divide(new BigDecimal(countDays),6, RoundingMode.HALF_UP);
}else if(solutions.getInsureCycleUnit().equals(Constants.InsureCycleUnit.HALF_MONTH.getValue())) {
//鏍规嵁鎶曚繚鍛ㄦ湡 瀹氫箟鐨� 姣忎釜鍛ㄦ湡 = X涓� 鍗婃湀鍛ㄦ湡 杩涜璁＄畻
// 鎬婚噾棰� / 鎶曚繚鍛ㄦ湡瀹氫箟鐨� 鍗婃湀鍛ㄦ湡鏁�
- return fee.divide(new BigDecimal(timeUnit.getCoefficient()),2, RoundingMode.HALF_UP);
+ return fee.divide(new BigDecimal(timeUnit.getCoefficient()),6, RoundingMode.HALF_UP);
}else if(solutions.getInsureCycleUnit().equals(Constants.InsureCycleUnit.MONTH.getValue())) {
// 鎬婚噾棰� / 鎶曚繚鍛ㄦ湡瀹氫箟鐨� 鍗婃湀鍛ㄦ湡鏁� * 2
- return fee.multiply(new BigDecimal(2)).divide(new BigDecimal(timeUnit.getCoefficient()),2, RoundingMode.HALF_UP);
+ return fee.multiply(new BigDecimal(2)).divide(new BigDecimal(timeUnit.getCoefficient()),6, RoundingMode.HALF_UP);
}else if(solutions.getInsureCycleUnit().equals(Constants.InsureCycleUnit.QUARTER.getValue())) {
//瀛ｅ害涓烘壒鏀瑰崟浣�
// 鎬婚噾棰� / 鎶曚繚鍛ㄦ湡瀹氫箟鐨� 鍗婃湀鍛ㄦ湡鏁� * 6
- return fee.multiply(new BigDecimal(6)).divide(new BigDecimal(timeUnit.getCoefficient()),2, RoundingMode.HALF_UP);
+ return fee.multiply(new BigDecimal(6)).divide(new BigDecimal(timeUnit.getCoefficient()),6, RoundingMode.HALF_UP);
}else if(solutions.getInsureCycleUnit().equals(Constants.InsureCycleUnit.HALF_YEAR.getValue())) {
//鍗婂勾涓烘壒鏀瑰崟浣�
// 鎬婚噾棰� * 浜х敓璐圭敤鐨勫懆鏈� / 鎶曚繚鍛ㄦ湡瀹氫箟鐨� 鍗婃湀鍛ㄦ湡鏁� * 6
- return fee.multiply(new BigDecimal(12)).divide(new BigDecimal(timeUnit.getCoefficient()),2, RoundingMode.HALF_UP);
+ return fee.multiply(new BigDecimal(12)).divide(new BigDecimal(timeUnit.getCoefficient()),6, RoundingMode.HALF_UP);
}else {
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏂规閰嶇疆閿欒");
}
}
}
+ public static BigDecimal getTwoPoint(BigDecimal bigDecimal){
+ if(Objects.isNull(bigDecimal)){
+ return BigDecimal.ZERO;
+ }
+ if(BigDecimal.ZERO.compareTo(bigDecimal) == 0){
+ return BigDecimal.ZERO;
+ }
+ return bigDecimal.setScale(2,BigDecimal.ROUND_DOWN);
+ }
+
+
}
--
Gitblit v1.9.3