From 4cb17b2019008ea2df010ba022db7e93b438831f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 21 六月 2024 16:09:43 +0800
Subject: [PATCH] 提交一把
---
server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index 8963283..4cb0d82 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -32,6 +32,7 @@
import lombok.extern.java.Log;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
+import org.checkerframework.checker.units.qual.C;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
@@ -333,7 +334,7 @@
.eq(InsuranceApply::getId,memberQueryDTO.getInsuranceApplyId())
.and(StringUtils.isNotBlank(memberQueryDTO.getName()),i->i.like(Member::getName,memberQueryDTO.getName())
.or().like(Member::getIdcardNo,memberQueryDTO.getName()))
- .le(!Objects.isNull(memberQueryDTO.getValidTime()),ApplyDetail::getStartTime,memberQueryDTO.getValidTime())
+// .le(!Objects.isNull(memberQueryDTO.getValidTime()),ApplyDetail::getStartTime,memberQueryDTO.getValidTime())
.ge(!Objects.isNull(memberQueryDTO.getValidTime()),ApplyDetail::getEndTime,memberQueryDTO.getValidTime())
.in(CollectionUtils.isNotEmpty(memberQueryDTO.getSubtractMemberIds()),Member::getId,memberQueryDTO.getSubtractMemberIds())
.exists(!Objects.isNull(memberQueryDTO.getInsuranceApplyId())&&!Objects.isNull(memberQueryDTO.getValidTime()),
@@ -398,10 +399,6 @@
if (DateUtil.compareDate(insuranceApply.getEndTime(),new Date()) >= Constants.ZERO ) {
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "淇濆崟宸茶繃淇濓紝涓嶆敮鎸佽鎿嶄綔");
}
- if (DateUtil.compareDate(insuranceApply.getEndTime(),new Date()) >= Constants.ZERO ) {
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "淇濆崟宸茶繃淇濓紝涓嶆敮鎸佽鎿嶄綔");
- }
-
Solutions solutions = solutionsMapper.selectById(insuranceApply.getSolutionId());
if(Objects.isNull(solutions)){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌淇濋櫓鏂规");
@@ -410,7 +407,7 @@
Map<String,String> idCardMap = new HashMap<>();
for(MemberReduceImport model : dataList){
//鏍￠獙鍙傛暟鏄惁鍚堟硶
- validReduceImportParam(model,idCardMap,dataList,index);
+ validReduceImportParam(model,idCardMap,index);
index += 1;
}
index = Constants.TWO;
@@ -428,10 +425,16 @@
.eq(ApplyDetail::getApplyId,insuranceApply.getId())
.eq(ApplyDetail::getApplyId,insuranceApply.getId())
.eq(ApplyDetail::getIdcardNo,model.getIdCard())
- .le(ApplyDetail::getStartTime,DateUtil.getMontageDate(new Date(),1))
+ /* .le(ApplyDetail::getStartTime,DateUtil.getMontageDate(new Date(),1))*/
.ge(ApplyDetail::getEndTime,DateUtil.getMontageDate(new Date(),3)));
if(detail == null){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "褰撳墠淇濆崟涓嬶紝鍛樺伐銆�" + model.getName()+model.getIdCard() + "銆戦潪鍦ㄤ繚浜哄憳锛屽娉曡繘琛岃鎿嶄綔");
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "褰撳墠淇濆崟涓嬶紝鍛樺伐銆�" + model.getName()+model.getIdCard() + "銆戦潪鍦ㄤ繚浜哄憳锛屾棤娉曡繘琛岃鎿嶄綔");
+ }
+ if(!StringUtils.equals(model.getName(), detail.getMemberName())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "褰撳墠淇濆崟涓嬶紝鍛樺伐銆�" +model.getName()+ model.getIdCard() + "銆戜笌鍏剁櫥璁板湪淇濊褰曞鍚嶄笉涓�鑷达紝璇锋牳瀹炲～鍐欐纭啀鎿嶄綔");
+ }
+ if(!Constants.equalsInteger(Constants.ZERO, detail.getChangeStatus())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "褰撳墠淇濆崟涓嬶紝鍛樺伐銆�" +model.getName()+ model.getIdCard() + "銆戝凡杩涜杩囧噺淇濈敵璇凤紝涓嶈兘鍐嶆杩涜璇ユ搷浣�");
}
model.setDuId(detail.getDuId());
model.setDuName(detail.getDuName());
@@ -447,7 +450,7 @@
return dataList;
}
- private void validReduceImportParam(MemberReduceImport model, Map<String, String> idCardMap, List<MemberReduceImport> dataList, int index) {
+ private void validReduceImportParam(MemberReduceImport model, Map<String, String> idCardMap, int index) {
if(StringUtils.isBlank(model.getName())){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝绗�"+index+"琛屾暟鎹鍚嶄笉鑳戒负绌猴紒");
}
--
Gitblit v1.9.3