From c1eeb76a92b389301949dc8c184176beeb9cd7b4 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 01 四月 2024 19:52:38 +0800
Subject: [PATCH] git ch
---
server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
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 2c22a09..fe292ef 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
@@ -2330,11 +2330,12 @@
* 鏇存柊淇濆崟瀹為檯閲戦
*/
@Override
- @Transactional(rollbackFor = {Exception.class})
+ @Transactional(rollbackFor = {Exception.class,BusinessException.class})
public void updateApplyCurrentFee(Integer id){
- List<InsuranceApply> insuranceApplyList = insuranceApplyMapper.selectList(new QueryWrapper<InsuranceApply>().lambda()
+ List<InsuranceApply> insuranceApplyList = insuranceApplyJoinMapper.selectJoinList(InsuranceApply.class,new MPJLambdaWrapper<InsuranceApply>()
+ .selectAll(InsuranceApply.class)
.eq(InsuranceApply::getIsdeleted,Constants.ZERO)
- .eq(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey())
+ .in(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey(),Constants.InsuranceApplyStatus.WTB_TOUBAOING.getKey())
.eq(!Objects.isNull(id),InsuranceApply::getId,id)
.le(InsuranceApply::getStartTime,DateUtil.getDate(new Date(),"yyyy-MM-dd") + " 00:00:00")
.ge(InsuranceApply::getEndTime,DateUtil.getDate(new Date(),"yyyy-MM-dd") + " 23:59:59")
@@ -2342,20 +2343,23 @@
if(CollectionUtils.isNotEmpty(insuranceApplyList)){
for (InsuranceApply insuranceApply:insuranceApplyList) {
- Solutions solutions = solutionsMapper.selectById(insuranceApply.getSolutionId());
- if(Objects.isNull(solutions)){
- continue;
- }
+// Solutions solutions = solutionsMapper.selectById(insuranceApply.getSolutionId());
+// if(Objects.isNull(solutions)){
+// continue;
+// }
BigDecimal sumAmount = BigDecimal.ZERO;
- List<ApplyDetail> applyDetailList = applyDetailMapper.selectList(new QueryWrapper<ApplyDetail>().lambda().eq(ApplyDetail::getApplyId,insuranceApply.getId()));
+ List<ApplyDetail> applyDetailList = applyDetailMapper
+ .selectList(new QueryWrapper<ApplyDetail>().lambda()
+ .eq(ApplyDetail::getApplyId,insuranceApply.getId()));
if(CollectionUtils.isNotEmpty(applyDetailList)){
for (ApplyDetail applyDetail: applyDetailList) {
//2024-1-30 10:04:24 淇敼 鏍规嵁瀹為檯澶╂暟杩涜璁＄畻 褰撳墠璐圭敤 鎬婚噾棰�/鎬诲ぉ鏁�*瀹為檯澶╂暟
- Integer maxDays = DateUtil.calculateBetween(applyDetail.getStartTime(),applyDetail.getEndTime(),0);
+// Integer maxDays = DateUtil.calculateBetween(applyDetail.getStartTime(),applyDetail.getEndTime(),0);
BigDecimal fee = applyDetail.getFee();
if(applyDetail.getStartTime().compareTo(new Date()) <= 0 && applyDetail.getEndTime().compareTo(new Date()) >= 0 ){
Integer days = DateUtil.calculateBetween(applyDetail.getStartTime(),new Date(),0);
- applyDetail.setCurrentFee(fee.divide(BigDecimal.valueOf(maxDays),2, BigDecimal.ROUND_HALF_UP).multiply(BigDecimal.valueOf(days)));
+ applyDetail.setCurrentFee(new BigDecimal(days).multiply(applyDetail.getPrice()));
+ //applyDetail.setCurrentFee(fee.divide(BigDecimal.valueOf(maxDays),2, BigDecimal.ROUND_HALF_UP).multiply(BigDecimal.valueOf(days)));
applyDetailMapper.updateById(applyDetail);
}else if(applyDetail.getStartTime().compareTo(new Date()) <= 0&&applyDetail.getEndTime().compareTo(new Date()) <= 0){
applyDetail.setCurrentFee(fee);
@@ -2368,10 +2372,6 @@
insuranceApplyMapper.updateById(insuranceApply);
}
}
-// if(1==1){
-// throw new BusinessException(ResponseStatus.NOT_ALLOWED);
-// }
-
}
--
Gitblit v1.9.3