diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
index 3464de09..ec8d3797 100644
--- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
@@ -41,6 +41,7 @@ import com.ghy.worker.domain.WorkerCertification;
 import com.ghy.worker.service.IWorkerCertificationService;
 import com.ghy.worker.service.WorkerService;
 import com.huifu.adapay.core.exception.BaseAdaPayException;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -128,11 +129,14 @@ public class OrderMasterController extends BaseController {
             CustomerAddress customerAddress = addressService.selectByCustomerAddressId(master.getAddressId());
 
             // 查询是否超时
+            List<OrderTimeoutRecord> timeoutRecords = new ArrayList<>();
             List<OrderDetail> detailOrderList = orderDetailService.selectByOrderMasterId(master.getId());
-            List<Long> detailOrderIds = detailOrderList.stream().map(OrderDetail::getId).collect(Collectors.toList());
-            OrderTimeoutRecord params = new OrderTimeoutRecord();
-            params.setOrderDetailIds(detailOrderIds);
-            List<OrderTimeoutRecord> timeoutRecords = orderFineRecordService.selectList(params);
+            detailOrderList.stream().forEach(detail -> {
+                OrderTimeoutRecord timeoutRecord = orderFineRecordService.selectByDetailIdAndStatus(detail.getId(), detail.getOrderStatus());
+                if (timeoutRecord != null) {
+                    timeoutRecords.add(timeoutRecord);
+                }
+            });
 
             for (OrderGoods orderGoods : orderStandardList) {
                 OrderStandard orderStandard = new OrderStandard();