diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbOrderInfoServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbOrderInfoServiceImpl.java
index b0b1a3f5..73569f7e 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbOrderInfoServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbOrderInfoServiceImpl.java
@@ -653,6 +653,7 @@ public class TbOrderInfoServiceImpl implements TbOrderInfoService {
                 return;
             }
             TbOrderInfo returnOrder = orderInfoMapper.selectOne(new LambdaQueryWrapper<TbOrderInfo>()
+                            .eq(TbOrderInfo::getStatus,  "refunding")
                     .eq(TbOrderInfo::getSource, orderInfo.getId()));
             if (returnOrder == null) {
                 log.warn("订单信息不存在: {}", payOrderId);
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
index b7cb82a0..9d3087a1 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
@@ -2609,7 +2609,8 @@ public class TbShopTableServiceImpl implements TbShopTableService {
                     .add(returnPackFee));
             orderDetail.setPackAmount(returnPackFee);
             orderDetail.setRefundNumber(returnNum);
-            orderDetail.setStatus(isOnline ? "refunding" : "refund");
+//            orderDetail.setStatus(isOnline ? "refunding" : "refund");
+            orderDetail.setStatus("refund");
         }
 
         if (returnAmount.compareTo(BigDecimal.ZERO) <= 0) {
@@ -2621,7 +2622,8 @@ public class TbShopTableServiceImpl implements TbShopTableService {
             mpOrderDetailService.saveBatch(remainOrderDetailList);
         }
 
-        TbOrderInfo returnOrder = mpOrderInfoService.selectReturnOrderByOrderId(returnOrderDTO.getOrderId());
+//        TbOrderInfo returnOrder = mpOrderInfoService.selectReturnOrderByOrderId(returnOrderDTO.getOrderId());
+        TbOrderInfo returnOrder = null;
         if (returnOrder == null) {
             String orderNo = generateOrderNumber(isOnline ? "OLRO" : "RO");
             returnOrder = BeanUtil.copyProperties(oldOrderInfo, TbOrderInfo.class);