From 70fc71340241c76a5d38e741d73425b75a70b856 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 26 六月 2024 15:02:58 +0800
Subject: [PATCH] git ch
---
server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java | 18 ++++----
server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java | 2
server/service/src/main/java/com/doumee/dao/business/dto/MemberReduceImport.java | 3 +
server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 45 +++++++++++++++-------
4 files changed, 43 insertions(+), 25 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/dao/business/dto/MemberReduceImport.java b/server/service/src/main/java/com/doumee/dao/business/dto/MemberReduceImport.java
index f123bef..dfaa676 100644
--- a/server/service/src/main/java/com/doumee/dao/business/dto/MemberReduceImport.java
+++ b/server/service/src/main/java/com/doumee/dao/business/dto/MemberReduceImport.java
@@ -46,6 +46,9 @@
@ApiModelProperty(value = "鎵�灞炲伐绉嶄富閿�")
private Integer worktypeId;
+ @ApiModelProperty(value = "鍛樺伐涓婚敭")
+ private Integer memberId;
+
@ApiModelProperty(value = "璐圭敤")
private BigDecimal fee;
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java
index ee90ea3..f21e82a 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/ApplyChangeServiceImpl.java
@@ -966,11 +966,6 @@
Constants.ApplyLogType applyLogType = Constants.ApplyLogType.CA_COMPANY_COMMIT;
ApplyLog log = new ApplyLog(applyChange,applyLogType.getName(),"",applyChange.getId(),applyLogType.getKey(), null, null);
applyLogMapper.insert(log);
-
-// if(1==1){
-// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "瀛樺湪杩涜涓殑鍔犲噺淇�/鎹㈠巶鐢宠");
-// }
-
return applyChange.getId();
}
@@ -2251,10 +2246,15 @@
// }
BigDecimal sumPrice = Objects.isNull(insuranceApply.getServerCost())?solutions.getPrice():solutions.getPrice().add(insuranceApply.getServerCost());
CountCyclePriceVO returnCountCyclePriceVO = new CountCyclePriceVO();
- returnCountCyclePriceVO.setCyclePrice(Constants.addFee(solutions,
- sumPrice
- ,insuranceApply.getStartTime(),insuranceApply.getFinalEndTime(),
- DateUtil.afterDateByType(applyChangeCyclePriceDTO.getValidTime(),0,solutions.getAddValidDays()),insuranceApply.getEndTime()));
+ Date addStartTime = DateUtil.afterDateByType(applyChangeCyclePriceDTO.getValidTime(),0,solutions.getAddValidDays());
+ if(addStartTime.getTime()<insuranceApply.getStartTime().getTime()){
+ returnCountCyclePriceVO.setCyclePrice(solutions.getPrice());
+ }else{
+ returnCountCyclePriceVO.setCyclePrice(Constants.addFee(solutions,
+ sumPrice
+ ,insuranceApply.getStartTime(),insuranceApply.getFinalEndTime(),addStartTime
+ ,insuranceApply.getEndTime()));
+ }
BigDecimal reducePrice = solutions.getPrice().subtract(Constants.reduceFee(solutions,
sumPrice
,insuranceApply.getStartTime(),insuranceApply.getFinalEndTime()
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java
index b5effcc..cb5f934 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java
@@ -2605,7 +2605,7 @@
.selectAs(Solutions::getType,InsuranceApply::getSolutionType)
.selectAs(Company::getName,InsuranceApply::getCompanyName)
.select(" ( select count(DISTINCT(ad.MEMBER_ID)) from apply_detail ad where ad.apply_id = t.id ) as insureNum")
- .select(" isnull(( select count(DISTINCT(ad.MEMBER_ID)) from apply_detail ad inner join insurance_apply a on ad.apply_id = a.id and a.status in ( 5 , 27 ) where ad.apply_id = t.id and ad.END_TIME > now() ),0) as guaranteeNum")
+ .select(" ifnull(( select count(DISTINCT(ad.MEMBER_ID)) from apply_detail ad inner join insurance_apply a on ad.apply_id = a.id and a.status in ( 5 , 27 ) where ad.apply_id = t.id and ad.END_TIME > now() ),0) as guaranteeNum")
.leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
.leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId)
.eq(InsuranceApply::getId,model.getId())
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