From 2b773dd14058d4eeacb38b0813edecc86170fd0c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 26 六月 2024 15:37:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 45 ++++++++++++++++++++++++++++++---------------
1 files changed, 30 insertions(+), 15 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 ad89ff4..4e99ce8 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
@@ -348,20 +348,24 @@
" and ad.member_id = t.id ");
}
List<Member> memberList = memberJoinMapper.selectJoinList(Member.class,lambdaWrapper);
- if(!Objects.isNull(memberQueryDTO.getInsuranceApplyId())&&Objects.isNull(memberQueryDTO.getValidTime())){
+ 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());
+// memberList = memberList.stream().filter(member->member.getDetailStartTime().getTime()<=reduceEndTime.getTime()
+// &&member.getDetailEndTime().getTime()>=reduceEndTime.getTime()).collect(Collectors.toList());
for (Member member:memberList) {
//鍑忎繚涓氬姟 浣跨敤 閫夋嫨浜哄憳 鏍规嵁鏃ユ湡瀹炴椂鏌ヨ
- member.setFee(
- Constants.reduceFee(solutions,
- Objects.isNull(member.getDetailServerCost())?
- solutions.getPrice():solutions.getPrice().add(member.getDetailServerCost()),member.getStartTime(),member.getEndTime(),member.getDetailStartTime(),
- reduceEndTime).subtract(member.getFee()));
+ if(reduceEndTime.getTime()<=member.getStartTime().getTime()){
+ member.setFee(solutions.getPrice().multiply(new BigDecimal(-1)));
+ }else{
+ member.setFee(
+ Constants.reduceFee(solutions,
+ Objects.isNull(member.getDetailServerCost())?
+ solutions.getPrice():solutions.getPrice().add(member.getDetailServerCost()),member.getStartTime(),member.getEndTime(),member.getDetailStartTime(),
+ reduceEndTime).subtract(member.getFee()));
+ }
}
}
@@ -408,6 +412,8 @@
if(Objects.isNull(solutions)){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌淇濋櫓鏂规");
}
+ Date reduceEndTime = DateUtil.getMontageDate(
+ DateUtil.afterDateByType(new Date(),0,solutions.getDelValidDays()),3);
int index = Constants.TWO;
Map<String,String> idCardMap = new HashMap<>();
for(MemberReduceImport model : dataList){
@@ -421,8 +427,8 @@
.selectAll(ApplyDetail.class)
.selectAs(Worktype::getName,ApplyDetail::getWorkTypeName)
.selectAs(DispatchUnit::getName,ApplyDetail::getDuName)
- .selectAs(InsuranceApply::getStartTime,ApplyDetail::getStartTime)
- .selectAs(InsuranceApply::getFinalEndTime,ApplyDetail::getEndTime)
+// .selectAs(InsuranceApply::getStartTime,ApplyDetail::getStartTime)
+// .selectAs(InsuranceApply::getEndTime,ApplyDetail::getEndTime)
.selectAs(InsuranceApply::getServerCost,ApplyDetail::getDetailServerCost)
.leftJoin(Worktype.class,Worktype::getId,ApplyDetail::getWorktypeId)
.leftJoin(DispatchUnit.class,DispatchUnit::getId,ApplyDetail::getDuId)
@@ -444,12 +450,21 @@
model.setDuId(detail.getDuId());
model.setDuName(detail.getDuName());
model.setWorktypeId(detail.getWorktypeId());
+ model.setMemberId(detail.getMemberId());
model.setWorkTypeName(detail.getWorkTypeName());
- model.setFee(
- Constants.reduceFee(solutions,
- Objects.isNull(detail.getDetailServerCost())?
- solutions.getPrice():solutions.getPrice().add(detail.getDetailServerCost()),detail.getParentStartTime(),detail.getParentEndTime(),detail.getStartTime(),
- detail.getEndTime()).subtract(detail.getFee()));
+ if(reduceEndTime.getTime()<=detail.getStartTime().getTime()){
+ model.setFee(solutions.getPrice().multiply(new BigDecimal(-1)));
+ }else{
+ 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())
+ );
+ }
index += 1;
}
return dataList;
--
Gitblit v1.9.3