From a22fa65d1027f8500c0494e97ff2232f70e9ca93 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 28 十月 2024 19:27:06 +0800
Subject: [PATCH] 提交一把
---
server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 37 +++++++++++++++++++++----------------
1 files changed, 21 insertions(+), 16 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 4e99ce8..98e1346 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
@@ -351,15 +351,16 @@
if(!Objects.isNull(memberQueryDTO.getInsuranceApplyId())&&Objects.nonNull(memberQueryDTO.getValidTime())){
if(CollectionUtils.isNotEmpty(memberList)){
Solutions solutions = solutionsMapper.selectById(memberList.get(Constants.ZERO).getSolutionId());
- Date reduceEndTime = DateUtil.getMontageDate(
- DateUtil.afterDateByType(new Date(),0,solutions.getDelValidDays()),3);
-// memberList = memberList.stream().filter(member->member.getDetailStartTime().getTime()<=reduceEndTime.getTime()
-// &&member.getDetailEndTime().getTime()>=reduceEndTime.getTime()).collect(Collectors.toList());
+// Date reduceEndTime = DateUtil.getMontageDate(
+// DateUtil.afterDateByType(new Date(),0,solutions.getDelValidDays()),3);
+// Date reduceEndTime = DateUtil.getMontageDate(new Date(),3);
for (Member member:memberList) {
- //鍑忎繚涓氬姟 浣跨敤 閫夋嫨浜哄憳 鏍规嵁鏃ユ湡瀹炴椂鏌ヨ
- if(reduceEndTime.getTime()<=member.getStartTime().getTime()){
+ //濡傛灉褰撳墠鏃ユ湡 灏忎簬 浜哄憳淇濆崟鏄庣粏璁板綍鐨勫紑濮嬫椂闂� 鍒欎娇鐢ㄥ紑濮嬫棩鏈� 寮�濮嬫棩鏈� = 缁撴潫鏃ユ湡 涓� 璐圭敤鍏ㄩ儴閫�鍥�
+ if(System.currentTimeMillis()<=member.getStartTime().getTime()){
member.setFee(solutions.getPrice().multiply(new BigDecimal(-1)));
}else{
+ Date reduceEndTime = DateUtil.getMontageDate(
+ DateUtil.afterDateByType(new Date(),0,solutions.getDelValidDays()),3);
member.setFee(
Constants.reduceFee(solutions,
Objects.isNull(member.getDetailServerCost())?
@@ -412,8 +413,10 @@
if(Objects.isNull(solutions)){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌淇濋櫓鏂规");
}
- Date reduceEndTime = DateUtil.getMontageDate(
- DateUtil.afterDateByType(new Date(),0,solutions.getDelValidDays()),3);
+// Date reduceEndTime = DateUtil.getMontageDate(
+// DateUtil.afterDateByType(new Date(),0,solutions.getDelValidDays()),3);
+
+// Date reduceEndTime = DateUtil.getMontageDate(new Date(),3);
int index = Constants.TWO;
Map<String,String> idCardMap = new HashMap<>();
for(MemberReduceImport model : dataList){
@@ -452,18 +455,19 @@
model.setWorktypeId(detail.getWorktypeId());
model.setMemberId(detail.getMemberId());
model.setWorkTypeName(detail.getWorkTypeName());
- if(reduceEndTime.getTime()<=detail.getStartTime().getTime()){
+ //濡傛灉褰撳墠鏃ユ湡 灏忎簬 浜哄憳淇濆崟鏄庣粏璁板綍鐨勫紑濮嬫椂闂� 鍒欎娇鐢ㄥ紑濮嬫棩鏈� 寮�濮嬫棩鏈� = 缁撴潫鏃ユ湡 涓� 璐圭敤鍏ㄩ儴閫�鍥�
+ if(System.currentTimeMillis()<=detail.getStartTime().getTime()){
model.setFee(solutions.getPrice().multiply(new BigDecimal(-1)));
}else{
+ Date reduceEndTime = DateUtil.getMontageDate(
+ DateUtil.afterDateByType(new Date(),0,solutions.getDelValidDays()),3);
model.setFee(
Constants.reduceFee(solutions,
- Objects.isNull(detail.getDetailServerCost())?solutions.getPrice():solutions.getPrice().add(detail.getDetailServerCost()),
- insuranceApply.getStartTime(),
- insuranceApply.getEndTime(),
- detail.getStartTime(),
- reduceEndTime)
- .subtract(detail.getFee())
- );
+ Objects.isNull(detail.getDetailServerCost())?solutions.getPrice():solutions.getPrice().add(detail.getDetailServerCost()),
+ insuranceApply.getStartTime(),
+ insuranceApply.getEndTime(),
+ detail.getStartTime(),
+ reduceEndTime).subtract(detail.getFee()));
}
index += 1;
}
@@ -545,6 +549,7 @@
//妫�鏌ユ淳閬ｅ崟浣嶅拰宸ョ鏈夋晥鎬�
dealDuAndWorktype(model,index,dispatchUnitList);
index += 1;
+ model.setSex(Constants.getSexByIdCard(model.getIdCard()));
}
return dataList;
}
--
Gitblit v1.9.3