sczx_group/sczx_order
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

预计还车时间修改

Browse Source
This commit is contained in:
zhangli
2025-08-11 00:47:39 +08:00
parent 091d7a6d3e
commit d460e648ec
2 changed files with 36 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java
View File

@ -103,17 +103,11 @@ public class OrderServiceImpl implements OrderService {
// orderMainPO.setOrderStatus(OrderStatusEnum.WAIT_PAY.getCode()); // orderMainPO.setOrderStatus(OrderStatusEnum.WAIT_PAY.getCode());
orderMainPO.setOrderStatus(OrderStatusEnum.WAIT_PICK.getCode()); orderMainPO.setOrderStatus(OrderStatusEnum.WAIT_PICK.getCode());
orderMainPO.setFirstOrderTime(LocalDateTime.now()); orderMainPO.setFirstOrderTime(LocalDateTime.now());
//设置预计还车时间 //设置预计还车时间
if(StringUtils.equalsIgnoreCase(RentCarTypeEnum.HOUR_RENTAL.getCode(), orderMainPO.getRentalType())){ LocalDateTime endRentTime = OrderUtil.getEndRentTime(orderMainPO.getFirstOrderTime(),rentCarRuleDTO.getRentalDays(), rentCarRuleDTO.getRentalType());
orderMainPO.setEndRentTime(LocalDateTime.now().plusHours(1)); orderMainPO.setEndRentTime(endRentTime);
}else if(StringUtils.equalsIgnoreCase(RentCarTypeEnum.DAILY_RENTAL.getCode(), rentCarRuleDTO.getRentalType())){
orderMainPO.setEndRentTime(LocalDateTime.now().plusDays(1));
} else if(StringUtils.equalsIgnoreCase(RentCarTypeEnum.DAYS_RENTAL.getCode(), rentCarRuleDTO.getRentalType())){
orderMainPO.setEndRentTime(LocalDateTime.now().plusDays(rentCarRuleDTO.getRentalDays()));
} else if(StringUtils.equalsIgnoreCase(RentCarTypeEnum.RENT_INSTEAD_SELL.getCode(), rentCarRuleDTO.getRentalType())){
//以租代售默认期限为30天
orderMainPO.setEndRentTime(LocalDateTime.now().plusDays(30));
}
//生成子表订单 //生成子表订单
String paymentType; String paymentType;
@ -259,17 +253,11 @@ public class OrderServiceImpl implements OrderService {
LocalDateTime nowTime = LocalDateTime.now(); LocalDateTime nowTime = LocalDateTime.now();
LocalDateTime oldEndRentTime = orderMainPO.getEndRentTime().isAfter(nowTime) ? orderMainPO.getEndRentTime() : nowTime; LocalDateTime oldEndRentTime = orderMainPO.getEndRentTime().isAfter(nowTime) ? orderMainPO.getEndRentTime() : nowTime;
LocalDateTime newEndRentTime = oldEndRentTime;
//刷新预计还车时间 //刷新预计还车时间
if(StringUtils.equalsIgnoreCase(RentCarTypeEnum.HOUR_RENTAL.getCode(), orderMainPO.getRentalType())){ LocalDateTime newEndRentTime = OrderUtil.getEndRentTime(oldEndRentTime, orderMainPO.getRentalDays(), orderMainPO.getRentalType());
newEndRentTime = oldEndRentTime.plusHours(1);
} else if(StringUtils.equalsIgnoreCase(RentCarTypeEnum.DAILY_RENTAL.getCode(), orderMainPO.getRentalType())){
newEndRentTime = oldEndRentTime.plusDays(1);
} else if(StringUtils.equalsIgnoreCase(RentCarTypeEnum.DAYS_RENTAL.getCode(), orderMainPO.getRentalType())){
newEndRentTime = oldEndRentTime.plusDays(orderMainPO.getRentalDays());
} else if(StringUtils.equalsIgnoreCase(RentCarTypeEnum.RENT_INSTEAD_SELL.getCode(), orderMainPO.getRentalType())){
newEndRentTime = oldEndRentTime.plusDays(30);
}
//更新订单状态及信息 //更新订单状态及信息
LambdaUpdateWrapper<OrderMainPO> updateWrapper = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<OrderMainPO> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.set(OrderMainPO::getRenewalTimes, orderMainPO.getRenewalTimes()+1); updateWrapper.set(OrderMainPO::getRenewalTimes, orderMainPO.getRenewalTimes()+1);
@ -555,13 +543,9 @@ public class OrderServiceImpl implements OrderService {
orderSubRepo.update(updateSubWrapper); orderSubRepo.update(updateSubWrapper);
//变更订单状态，记录租车时间 //变更订单状态，记录租车时间
LocalDateTime currentTime = LocalDateTime.now(); LocalDateTime currentTime = LocalDateTime.now();
LocalDateTime endRentTime = null;
//设置预计还车时间 //设置预计还车时间
if(StringUtils.equalsIgnoreCase(RentCarTypeEnum.DAILY_RENTAL.getCode(), orderMainPO.getRentalType())){ LocalDateTime endRentTime = OrderUtil.getEndRentTime(currentTime,orderMainPO.getRentalDays(), orderMainPO.getRentalType());
endRentTime = currentTime.plusDays(1);
} else if(StringUtils.equalsIgnoreCase(RentCarTypeEnum.DAYS_RENTAL.getCode(), orderMainPO.getRentalType())){
endRentTime = currentTime.plusDays(orderMainPO.getRentalDays());
}
LambdaUpdateWrapper<OrderMainPO> updateWrapper = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<OrderMainPO> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.set(OrderMainPO::getOrderStatus, OrderStatusEnum.RENT_ING.getCode()); updateWrapper.set(OrderMainPO::getOrderStatus, OrderStatusEnum.RENT_ING.getCode());
@ -666,4 +650,5 @@ public class OrderServiceImpl implements OrderService {
} }
return rentCarOrderAmount; return rentCarOrderAmount;
} }
} }

25
src/main/java/com/sczx/order/utils/OrderUtil.java
View File

@ -1,5 +1,8 @@
package com.sczx.order.utils; package com.sczx.order.utils;
import com.sczx.order.common.enums.RentCarTypeEnum;
import org.apache.commons.lang.StringUtils;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
@ -100,4 +103,26 @@ public class OrderUtil {
} }
return null; return null;
} }
/**
* 计算订单预计还车时间
* @param rentalDays 租期天数
* @param rentalType 租期类型
* @return 预计还车时间
*/
public static LocalDateTime getEndRentTime(LocalDateTime origTime,Integer rentalDays, String rentalType) {
LocalDateTime endRentTime = null;
//设置预计还车时间
if(StringUtils.equalsIgnoreCase(RentCarTypeEnum.HOUR_RENTAL.getCode(), rentalType)){
endRentTime = origTime.plusHours(1);
}else if(StringUtils.equalsIgnoreCase(RentCarTypeEnum.DAILY_RENTAL.getCode(), rentalType)){
endRentTime = origTime.plusDays(1);
} else if(StringUtils.equalsIgnoreCase(RentCarTypeEnum.DAYS_RENTAL.getCode(), rentalType)){
endRentTime = origTime.plusDays(rentalDays);
} else if(StringUtils.equalsIgnoreCase(RentCarTypeEnum.RENT_INSTEAD_SELL.getCode(), rentalType)){
//以租代售默认期限为30天
endRentTime = origTime.plusDays(30);
}
return endRentTime;
}
} }