diff --git a/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java b/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java
index f695809..12cbbd1 100644
--- a/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java
@@ -630,6 +630,9 @@ public class OrderServiceImpl implements OrderService {
         LambdaQueryWrapper<OrderMainPO> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(OrderMainPO::getOrderNo, orderNo);
         OrderMainPO orderMainPO = orderMainRepo.getOne(queryWrapper);
+        if(orderMainPO==null){
+            return null;
+        }
 
         //获取租电子订单
         LambdaQueryWrapper<OrderSubPO> querySubWrapper = new LambdaQueryWrapper<>();
@@ -776,6 +779,16 @@ public class OrderServiceImpl implements OrderService {
         if(orderMainPO==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());
     }