From d5d7a8461c6fd350806fbfbd738917b14f70c9e9 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 02 四月 2024 11:47:44 +0800
Subject: [PATCH] git ch
---
server/service/src/main/java/com/doumee/service/business/impl/UnionApplyServiceImpl.java | 12 +++---------
1 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/UnionApplyServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/UnionApplyServiceImpl.java
index 357d200..160729b 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/UnionApplyServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/UnionApplyServiceImpl.java
@@ -694,6 +694,8 @@
|| Objects.isNull(unionApplyBXDDTO.getStartTime())
|| Objects.isNull(unionApplyBXDDTO.getEndTime())
|| StringUtils.isBlank(unionApplyBXDDTO.getCode())
+ || StringUtils.isBlank(unionApplyBXDDTO.getFileUrl())
+ || StringUtils.isBlank(unionApplyBXDDTO.getFileName())
){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
@@ -752,7 +754,7 @@
insuranceApply.setUnionApplyTbdStatus(Constants.ZERO);
}
}
- //瀹為檯宸蹭骇鐢熻垂鐢�
+ //瀹為檯宸蹭骇鐢熻垂鐢紙鍗曚汉锛�
BigDecimal currentFee = BigDecimal.ZERO;
if(useDays==-1){
currentFee = new BigDecimal(maxDays).multiply(price);
@@ -763,17 +765,11 @@
List<ApplyDetail> applyDetails = applyDetailList.stream().filter(m->m.getApplyId().equals(insuranceApply.getId())).collect(Collectors.toList());
//鏇存柊鎶曚繚鐢宠鍗�
insuranceApplyJoinMapper.update(null,new UpdateWrapper<InsuranceApply>().lambda()
- .set(InsuranceApply::getFee,
- new BigDecimal(applyDetails.size())
- .multiply(price)
- )
.set(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.WTB_DONE.getKey())
- .set(InsuranceApply::getUnionApplyTbdStatus,3)
.set(InsuranceApply::getFee,price.multiply(new BigDecimal(applyDetails.size())).multiply(new BigDecimal(maxDays)))
.set(InsuranceApply::getCurrentFee,currentFee.multiply(new BigDecimal(applyDetails.size())))
.set(InsuranceApply::getStartTime,unionApplyBXDDTO.getStartTime())
.set(InsuranceApply::getEndTime,unionApplyBXDDTO.getEndTime())
- .set(InsuranceApply::getUnionApplyTbdStatus,insuranceApply.getUnionApplyTbdStatus())
.set(InsuranceApply::getEditDate,new Date())
.set(InsuranceApply::getEditor,user.getId())
.eq(InsuranceApply::getId,insuranceApply.getId()));
@@ -788,10 +784,8 @@
.set(ApplyDetail::getEndTime,unionApplyBXDDTO.getEndTime())
.in(ApplyDetail::getId,applyDetails.stream().map(m->m.getId()).collect(Collectors.toList()))
);
-
sumFee = sumFee.add(price.multiply(new BigDecimal(applyDetails.size())).multiply(new BigDecimal(maxDays)));
sumCurrFee = sumCurrFee.add(currentFee.multiply(new BigDecimal(applyDetails.size())));
-
}
unionApplyMapper.update(null,new UpdateWrapper<UnionApply>()
--
Gitblit v1.9.3