From a01d637e9ff2bf26aa44c65a239413a38bd8b1fe Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 04 六月 2025 09:39:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/platform/src/main/java/com/doumee/api/business/SettleRiskController.java | 2 +-
server/service/src/main/java/com/doumee/core/utils/Constants.java | 36 ++++++++++++++++++++++++------------
server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java | 12 +++++++-----
server/service/src/main/java/com/doumee/dao/business/vo/dataBoard/SettleClaimsDataVO.java | 2 +-
4 files changed, 33 insertions(+), 19 deletions(-)
diff --git a/server/platform/src/main/java/com/doumee/api/business/SettleRiskController.java b/server/platform/src/main/java/com/doumee/api/business/SettleRiskController.java
index 33a98f7..caf4636 100644
--- a/server/platform/src/main/java/com/doumee/api/business/SettleRiskController.java
+++ b/server/platform/src/main/java/com/doumee/api/business/SettleRiskController.java
@@ -190,7 +190,7 @@
return ApiResponse.success(settleClaimsService.getSettleClaimsDataVO());
}
- @ApiOperation("鐞嗚禂鎶ユ鏁版嵁鎶ヨ〃")
+ @ApiOperation("淇濆崟鏁版嵁鎶ヨ〃")
@GetMapping("/getInsuranceDataVO")
public ApiResponse<InsuranceDataVO> getInsuranceDataVO() {
return ApiResponse.success(settleClaimsService.getInsuranceDataVO());
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 81902fb..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
@@ -321,22 +321,34 @@
}
public static int calculateAge(String idCard,Date dateDate) {
- if (idCard == null || idCard.length() != 18) {
- throw new IllegalArgumentException("韬唤璇佸彿鐮佸繀椤绘槸18浣�");
+ 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(),"骞撮緞淇℃伅閿欒");
}
- // 鎻愬彇鍑虹敓鏃ユ湡
- 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;
+
+
+// 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;
}
diff --git a/server/service/src/main/java/com/doumee/dao/business/vo/dataBoard/SettleClaimsDataVO.java b/server/service/src/main/java/com/doumee/dao/business/vo/dataBoard/SettleClaimsDataVO.java
index 69c20de..de8a41d 100644
--- a/server/service/src/main/java/com/doumee/dao/business/vo/dataBoard/SettleClaimsDataVO.java
+++ b/server/service/src/main/java/com/doumee/dao/business/vo/dataBoard/SettleClaimsDataVO.java
@@ -51,7 +51,7 @@
private BigDecimal riskRepeatRata;
@ApiModelProperty(value = "绱㈣禂娆℃暟杩囧娆℃暟")
private Integer riskTimesSpTotal;
- @ApiModelProperty(value = "鐤戜技閲嶅鎶ユ椋庨櫓娆℃暟鐜瘮")
+ @ApiModelProperty(value = "绱㈣禂娆℃暟杩囧娆℃暟鐜瘮")
private BigDecimal riskTimesSpRata;
@ApiModelProperty(value = "鏂板憳宸ュ嚭闄╅闄╂鏁�")
private Integer riskNewUserTotal;
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java
index e4d916d..cdc9618 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/SettleClaimsServiceImpl.java
@@ -1409,7 +1409,9 @@
if(Objects.isNull(model)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
- if(!(Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.WAIT_ACCEPTANCE.getKey())||Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.RETURN_ACCEPTANCE.getKey()))){
+ if(!(Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.WAIT_ACCEPTANCE.getKey())
+ ||Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.RETURN_ACCEPTANCE.getKey())
+ ||Constants.equalsInteger(model.getStatus(),Constants.SettleClaimsStatus.FINISH_ACCEPTANCE.getKey()))){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏁版嵁鐘舵�佸凡娴佽浆锛屾棤娉曡繘琛屼慨鏀�");
}
settleClaims.setEditDate(new Date());
@@ -1560,7 +1562,7 @@
.ne(Objects.nonNull(settleClaims.getId()),SettleClaims::getId,settleClaims.getId())
.apply(" HAPPEN_TIME > DATE_SUB(now(), INTERVAL 365 DAY) ")
);
- if(cxcs>Integer.valueOf(riskConfigVO.getRiskTimesReportTimes())){
+ if(cxcs>=Integer.valueOf(riskConfigVO.getRiskTimesReportTimes())){
Map<String,String> map = new HashMap<>();
map.put("title","鐤戜技澶氭鍑洪櫓");
map.put("info","鍑洪櫓浜轰竴骞村唴宸插嚭闄�"+cxcs+"娆�");
@@ -1576,10 +1578,10 @@
Long cxcs = settleClaimsMapper.selectCount(new QueryWrapper<SettleClaims>().lambda()
.eq(SettleClaims::getMemberId,settleClaimsDTO.getMemberId())
.ne(Objects.nonNull(settleClaims.getId()),SettleClaims::getId,settleClaims.getId())
- .apply(riskConfigVO.getRiskRepeatReportTimeUnit().equals("1")," HAPPEN_TIME > DATE_SUB(now(), INTERVAL "+riskConfigVO.getRiskRepeatReportTime()+" HOUR) ")
- .apply(riskConfigVO.getRiskRepeatReportTimeUnit().equals("2")," HAPPEN_TIME > DATE_SUB(now(), INTERVAL "+riskConfigVO.getRiskRepeatReportTime()+" DAY) ")
+ .apply(riskConfigVO.getRiskRepeatReportTimeUnit().equals("1")," CREATE_DATE > DATE_SUB(now(), INTERVAL "+riskConfigVO.getRiskRepeatReportTime()+" HOUR) ")
+ .apply(riskConfigVO.getRiskRepeatReportTimeUnit().equals("2")," CREATE_DATE > DATE_SUB(now(), INTERVAL "+riskConfigVO.getRiskRepeatReportTime()+" DAY) ")
);
- if(cxcs >= Constants.TWO){
+ if(cxcs >= Constants.ONE){
Map<String,String> map = new HashMap<>();
map.put("title","鐤戜技閲嶅鎶ユ");
map.put("info","璇ュ嚭闄╀汉鍦�"+riskConfigVO.getRiskRepeatReportTime()+(riskConfigVO.getRiskRepeatReportTimeUnit().equals("1")?"灏忔椂":"澶�")+"鍐呭凡鎶ユ"+cxcs+"娆�");
--
Gitblit v1.9.3