diff --git a/src/main/java/com/sczx/order/service/impl/OrderDistribServiceImpl.java b/src/main/java/com/sczx/order/service/impl/OrderDistribServiceImpl.java
index 3a9ae79..cf7694b 100644
--- a/src/main/java/com/sczx/order/service/impl/OrderDistribServiceImpl.java
+++ b/src/main/java/com/sczx/order/service/impl/OrderDistribServiceImpl.java
@@ -99,7 +99,7 @@ public class OrderDistribServiceImpl implements OrderDistribService {
             //判断奖励是否过期
             if(awardDeadline.isAfter(LocalDate.now())){
                 String invitationRate = String.valueOf(configList.stream().filter(config -> "sczx.invitation.rate".equals(config.getConfigKey())).findFirst().orElse(null));
-                referralDistribPO = getOrderDistribPO(orderMainPO.getOrderId(),orderMainPO.getOrderNo(),DistribTypeEnum.REFERRAL.getCode(),invitationRate,orderMainPO.getOrderAmount(),null,null,baseUserReferralPO.getReferralUserId());
+                referralDistribPO = getOrderDistribPO(orderMainPO.getOrderId(),orderMainPO.getOrderNo(),DistribTypeEnum.REFERRAL.getCode(),invitationRate,orderMainPO.getOrderAmount(),Integer.valueOf(orderMainPO.getOperatorId().toString()),Integer.valueOf(orderMainPO.getStoreId().toString()),baseUserReferralPO.getReferralUserId());
                 addOrderDistribPOList.add(referralDistribPO);
             }
         }
@@ -160,14 +160,11 @@ public class OrderDistribServiceImpl implements OrderDistribService {
     private static OrderDistribPO getOrderDistribPO(Long orderId,String orderNo,String distribType,String invitationRate, BigDecimal orderAmount,Integer companyId,Integer storeId,Long referralUserId) {
         BigDecimal referralRate = new BigDecimal(invitationRate).multiply(new BigDecimal("0.01"));
         OrderDistribPO referralDistribPO = new OrderDistribPO();
-        if(DistribTypeEnum.COMPANY.getCode().equalsIgnoreCase(distribType)){
-            referralDistribPO.setCompanyId(companyId);
-        } else if(DistribTypeEnum.STORE.getCode().equalsIgnoreCase(distribType)){
-            referralDistribPO.setStoreId(storeId);
-        } else if(DistribTypeEnum.REFERRAL.getCode().equalsIgnoreCase(distribType)){
+        referralDistribPO.setCompanyId(companyId);
+        referralDistribPO.setStoreId(storeId);
+        if(DistribTypeEnum.REFERRAL.getCode().equalsIgnoreCase(distribType)){
             referralDistribPO.setReferralUserId(referralUserId);
         }
-        referralDistribPO.setReferralUserId(referralUserId);
         referralDistribPO.setOrderId(orderId);
         referralDistribPO.setOrderNo(orderNo);
         referralDistribPO.setDistribType(distribType);
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 7d1cf16..5046304 100644
--- a/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java
@@ -388,7 +388,7 @@ public class OrderServiceImpl implements OrderService {
     public RentCarOrderResultDTO depositFreePayRentCarOrder(RentCarOrderReq rentCarOrderReq) {
         SimpleUserInfoDTO userInfoDTO = jwtUtil.getUserInfoFromToken();
         OrderMainPO orderMainPO = queryOrderMainPoByOrderNo(rentCarOrderReq.getOrderNo(), "0");
-        if(orderMainPO == null || OrderStatusEnum.WAIT_PAY.getCode().equals(orderMainPO.getOrderStatus())){
+        if(orderMainPO == null || !OrderStatusEnum.WAIT_PAY.getCode().equals(orderMainPO.getOrderStatus())){
             throw new BizException("订单不存在或订单状态不正确");
         }
         LambdaQueryWrapper<OrderSubPO> queryWrapper = new LambdaQueryWrapper<>();
@@ -628,7 +628,9 @@ public class OrderServiceImpl implements OrderService {
                             alipayQueryFreezeRequest.setCompanyId(orderMainPO.getOperatorId().toString());
                             AlipayQueryFreezeResponse queryFreezeResponse = payInteg.queryFundFreeze(alipayQueryFreezeRequest);
                             if(queryFreezeResponse==null){
-                                closePayOrder = payService.cancelFreezeOrder(Long.valueOf(companyStoreDTO.getOperatingCompanyId()),noDepositOrder.getPaymentId());
+                                payService.cancelFreezeOrder(Long.valueOf(companyStoreDTO.getOperatingCompanyId()),noDepositOrder.getPaymentId());
+                                //不管取消是否成功，都要删除订单
+                                closePayOrder = true;
                             }else {
                                 closePayOrder = payService.finishFreezeOrder(Long.valueOf(companyStoreDTO.getOperatingCompanyId()),noDepositOrder.getPaymentId(),noDepositOrder.getTransactionId());
                             }