From f63e0073e96abe1e52d74749f408e3f542600a09 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期三, 03 四月 2024 13:27:12 +0800
Subject: [PATCH] 提交一把
---
server/service/src/main/java/com/doumee/service/business/impl/UnionApplyServiceImpl.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 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 7f6ff0e..3c60cbd 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
@@ -714,7 +714,8 @@
List<UnionApplyBXDDetailDTO> unionApplyBXDDetailDTOList = unionApplyBXDDTO.getUnionApplyBXDDDetailDTOList();
//鎵�鏈夋姇淇濈敵璇蜂繚鍗曟槑缁嗚
- List<ApplyDetail> applyDetailList = applyDetailJoinMapper.selectList(new QueryWrapper<ApplyDetail>().lambda().select(ApplyDetail::getPrice)
+ List<ApplyDetail> applyDetailList = applyDetailJoinMapper.selectList(new QueryWrapper<ApplyDetail>().lambda()
+ .select(ApplyDetail::getId,ApplyDetail::getApplyId,ApplyDetail::getPrice)
.in(ApplyDetail::getUnionApplyId,unionApply.getId()));
//鎬诲ぉ鏁�
Integer maxDays = DateUtil.calculateBetween(unionApplyBXDDTO.getStartTime(),unionApplyBXDDTO.getEndTime(),0);
@@ -732,11 +733,12 @@
List<InsuranceApply> insuranceApplyList = insuranceApplyJoinMapper.selectList(new QueryWrapper<InsuranceApply>()
.lambda().eq(InsuranceApply::getUnionApplyId,unionApply.getId()));
for (InsuranceApply insuranceApply:insuranceApplyList) {
- BigDecimal price = insuranceApply.getPrice();
- Optional<UnionApplyBXDDetailDTO> unionApplyBXDDDetailTO= unionApplyBXDDetailDTOList.stream().filter(m->m.getApplyId().equals(insuranceApply.getId())).findFirst();
+ BigDecimal price = Constants.formatBigdecimal(insuranceApply.getPrice());
+ Optional<UnionApplyBXDDetailDTO> unionApplyBXDDDetailTO= unionApplyBXDDetailDTOList.stream().filter(
+ m->m.getApplyId().equals(insuranceApply.getId())).findFirst();
if(unionApplyBXDDDetailTO.isPresent()){
UnionApplyBXDDetailDTO unionApplyBXDDetailDTO = unionApplyBXDDDetailTO.get();
- price = price.add(unionApplyBXDDetailDTO.getServerMoney());
+ price = Constants.formatBigdecimal(price).add(Constants.formatBigdecimal(unionApplyBXDDetailDTO.getServerMoney()));
//涓婁紶淇濆崟淇℃伅
if(StringUtils.isNotBlank(unionApplyBXDDetailDTO.getFileUrl())){
Multifile multifile = new Multifile();
@@ -762,9 +764,11 @@
currentFee = new BigDecimal(useDays).multiply(price);
}
- List<ApplyDetail> applyDetails = applyDetailList.stream().filter(m->m.getApplyId().equals(insuranceApply.getId())).collect(Collectors.toList());
+ List<ApplyDetail> applyDetails = applyDetailList.stream()
+ .filter(m->Constants.equalsInteger(m.getApplyId(),(insuranceApply.getId()))).collect(Collectors.toList());
//鏇存柊鎶曚繚鐢宠鍗�
insuranceApplyJoinMapper.update(null,new UpdateWrapper<InsuranceApply>().lambda()
+ .set(InsuranceApply::getUnionApplyTbdStatus,Constants.THREE)
.set(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.WTB_DONE.getKey())
.set(InsuranceApply::getFee,price.multiply(new BigDecimal(applyDetails.size())).multiply(new BigDecimal(maxDays)))
.set(InsuranceApply::getCurrentFee,currentFee.multiply(new BigDecimal(applyDetails.size())))
@@ -772,6 +776,7 @@
.set(InsuranceApply::getEndTime,unionApplyBXDDTO.getEndTime())
.set(InsuranceApply::getEditDate,new Date())
.set(InsuranceApply::getEditor,user.getId())
+ .set(InsuranceApply::getCode,unionApplyBXDDTO.getCode())
.eq(InsuranceApply::getId,insuranceApply.getId()));
//鏇存柊鎶曚繚鍗曟槑缁嗛噾棰�
applyDetailJoinMapper.update(null,new UpdateWrapper<ApplyDetail>().lambda()
@@ -790,11 +795,12 @@
unionApplyMapper.update(null,new UpdateWrapper<UnionApply>()
.lambda()
- .set(UnionApply::getStatus,Constants.UnionApplyStatus.FINISH)
+ .set(UnionApply::getStatus,Constants.UnionApplyStatus.FINISH.getKey())
.set(UnionApply::getEditDate,new Date())
.set(UnionApply::getEditor,user.getId())
.set(UnionApply::getStartTime,unionApplyBXDDTO.getStartTime())
.set(UnionApply::getEndTime,unionApplyBXDDTO.getEndTime())
+ .set(UnionApply::getCode,unionApplyBXDDTO.getCode())
.set(UnionApply::getFee,sumFee)
.set(UnionApply::getCurrentFee,sumCurrFee)
.eq(UnionApply::getId,unionApply.getId())
--
Gitblit v1.9.3