处理待支付的订单
This commit is contained in:
@ -630,6 +630,9 @@ public class OrderServiceImpl implements OrderService {
|
|||||||
LambdaQueryWrapper<OrderMainPO> queryWrapper = new LambdaQueryWrapper<>();
|
LambdaQueryWrapper<OrderMainPO> queryWrapper = new LambdaQueryWrapper<>();
|
||||||
queryWrapper.eq(OrderMainPO::getOrderNo, orderNo);
|
queryWrapper.eq(OrderMainPO::getOrderNo, orderNo);
|
||||||
OrderMainPO orderMainPO = orderMainRepo.getOne(queryWrapper);
|
OrderMainPO orderMainPO = orderMainRepo.getOne(queryWrapper);
|
||||||
|
if(orderMainPO==null){
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
//获取租电子订单
|
//获取租电子订单
|
||||||
LambdaQueryWrapper<OrderSubPO> querySubWrapper = new LambdaQueryWrapper<>();
|
LambdaQueryWrapper<OrderSubPO> querySubWrapper = new LambdaQueryWrapper<>();
|
||||||
@ -776,6 +779,16 @@ public class OrderServiceImpl implements OrderService {
|
|||||||
if(orderMainPO==null){
|
if(orderMainPO==null){
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
//如果是待支付状态的订单,则取消订单
|
||||||
|
if(orderMainPO.getOrderStatus().equals(OrderStatusEnum.WAIT_PAY.getCode())){
|
||||||
|
PayOrderReq payOrderReq = new PayOrderReq();
|
||||||
|
payOrderReq.setOrderNo(orderMainPO.getOrderNo());
|
||||||
|
cancelOrder(payOrderReq);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
if(orderMainPO.getOrderStatus().equals(OrderStatusEnum.RERENT_WAIT_PAY.getCode())){
|
||||||
|
cancelRerentOrOverDueOrder(orderMainPO);
|
||||||
|
}
|
||||||
return getOrderDetailByOrderNo(orderMainPO.getOrderNo());
|
return getOrderDetailByOrderNo(orderMainPO.getOrderNo());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user