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 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
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()
--
Gitblit v1.9.3