mirror of
http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git
synced 2026-08-14 21:52:07 +08:00
首次创建延期记录时如果已过期从当前日期开始计算延期修复
This commit is contained in:
+5
-1
@@ -72,7 +72,7 @@ public class ProductDelayServiceImpl implements ProductDelayService {
|
|||||||
/**
|
/**
|
||||||
* 查询是否有前序的延期记录:
|
* 查询是否有前序的延期记录:
|
||||||
* 1、如果有记录,延期有效期在其记录上叠加
|
* 1、如果有记录,延期有效期在其记录上叠加
|
||||||
* 2、如果没有记录,取购买记录的结束时间作为延期的开始时间
|
* 2、如果没有记录,取购买记录的结束时间作为延期的开始时间,如果结束时间已经过期了,那么从今天开始算
|
||||||
*/
|
*/
|
||||||
ProductDelayRecordDO lastDelayRecordDO = productDelayRecordMapper.selectOne(new LambdaQueryWrapper<ProductDelayRecordDO>()
|
ProductDelayRecordDO lastDelayRecordDO = productDelayRecordMapper.selectOne(new LambdaQueryWrapper<ProductDelayRecordDO>()
|
||||||
.eq(ProductDelayRecordDO::getOrganId, organId)
|
.eq(ProductDelayRecordDO::getOrganId, organId)
|
||||||
@@ -82,10 +82,14 @@ public class ProductDelayServiceImpl implements ProductDelayService {
|
|||||||
Integer delayDuration = productDelaySaveReqVO.getDelayDuration();
|
Integer delayDuration = productDelaySaveReqVO.getDelayDuration();
|
||||||
Integer delayDurationUnit = productDelaySaveReqVO.getDelayDurationUnit();
|
Integer delayDurationUnit = productDelaySaveReqVO.getDelayDurationUnit();
|
||||||
LocalDate endTime;
|
LocalDate endTime;
|
||||||
|
LocalDate now = LocalDate.now();
|
||||||
if(ObjectUtil.isNotNull(lastDelayRecordDO)) {
|
if(ObjectUtil.isNotNull(lastDelayRecordDO)) {
|
||||||
endTime = lastDelayRecordDO.getDelayTime();
|
endTime = lastDelayRecordDO.getDelayTime();
|
||||||
} else {
|
} else {
|
||||||
endTime = purchaseRecordDO.getEndTime();
|
endTime = purchaseRecordDO.getEndTime();
|
||||||
|
if (endTime.isBefore(now)) {
|
||||||
|
endTime = now;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 计算延期后有效时间
|
// 计算延期后有效时间
|
||||||
|
|||||||
Reference in New Issue
Block a user