还车时间处理
This commit is contained in:
@ -199,6 +199,7 @@ public class OrderServiceImpl implements OrderService {
|
|||||||
rentOrder.setAmount(rentCarOrderAmount);
|
rentOrder.setAmount(rentCarOrderAmount);
|
||||||
rentOrder.setCreatedAt(LocalDateTime.now());
|
rentOrder.setCreatedAt(LocalDateTime.now());
|
||||||
rentOrder.setPaymentMethod(paymentType);
|
rentOrder.setPaymentMethod(paymentType);
|
||||||
|
rentOrder.setReturnTime(endRentTime);
|
||||||
orderSubPOList.add(rentOrder);
|
orderSubPOList.add(rentOrder);
|
||||||
|
|
||||||
BigDecimal orderAmount = orderSubPOList.stream().map(OrderSubPO::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
|
BigDecimal orderAmount = orderSubPOList.stream().map(OrderSubPO::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
|
||||||
@ -1221,7 +1222,7 @@ public class OrderServiceImpl implements OrderService {
|
|||||||
BigDecimal rentCarOrderAmount = orderSubList.stream().map(OrderSubPO::getAmount).reduce(BigDecimal.ZERO,BigDecimal::add);
|
BigDecimal rentCarOrderAmount = orderSubList.stream().map(OrderSubPO::getAmount).reduce(BigDecimal.ZERO,BigDecimal::add);
|
||||||
updateWrapper2.set(OrderMainPO::getOrderAmount, orderMainPO.getOrderAmount().add(rentCarOrderAmount));
|
updateWrapper2.set(OrderMainPO::getOrderAmount, orderMainPO.getOrderAmount().add(rentCarOrderAmount));
|
||||||
if(rentSubPO!=null){
|
if(rentSubPO!=null){
|
||||||
updateWrapper2.set(OrderMainPO::getEndRentTime, rentSubPO.getReturnTime());
|
updateWrapper2.set(rentSubPO.getReturnTime()!=null,OrderMainPO::getEndRentTime, rentSubPO.getReturnTime());
|
||||||
}
|
}
|
||||||
updateWrapper2.set(OrderMainPO::getOrderStatus, OrderStatusEnum.RENT_ING.getCode());
|
updateWrapper2.set(OrderMainPO::getOrderStatus, OrderStatusEnum.RENT_ING.getCode());
|
||||||
if(orderMainPO.getOverdueDays()>0){
|
if(orderMainPO.getOverdueDays()>0){
|
||||||
|
|||||||
Reference in New Issue
Block a user