diff --git a/ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderServiceImpl.java b/ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderServiceImpl.java
index 5c601d55..968a89d8 100644
--- a/ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderServiceImpl.java
+++ b/ghy-quartz/src/main/java/com/ghy/quartz/service/impl/OrderServiceImpl.java
@@ -329,10 +329,12 @@ public class OrderServiceImpl implements OrderService {
         List<AfterServiceRecord> afterServiceRecord = afterServiceRecordService.selectAfterServiceRecordList(afterParam);
         if (CollectionUtil.isNotEmpty(afterServiceRecord) && (afterServiceRecord.get(0).getCustomerFinalCheck() == null || afterServiceRecord.get(0).getCustomerFinalCheck() != 1L)) {
             log.info("售后订单更新时间{},售后订单是否超时{}", afterServiceRecord.get(0).getUpdateTime(), afterTimeout);
-            log.info("师傅操作{},所有记录{}",afterServiceRecord.get(0).getWorkerFeedbackResult(),afterServiceRecord);
             // 查询一下售后单时间
             Date afterTime = getOverTime(afterServiceRecord.get(0).getUpdateTime(), 30 * 60 * 1000);
-            if (afterTime.before(now) && !afterTimeout) {
+            //师傅没有操作 则正常进行售后超时计算
+            boolean WorkerFeedback=afterServiceRecord.get(0).getWorkerFeedbackResult()==null;
+            log.info("师傅操作{},所有记录{},师傅是否进行操作{}",afterServiceRecord.get(0).getWorkerFeedbackResult(),afterServiceRecord,WorkerFeedback);
+            if (afterTime.before(now) && !afterTimeout&&WorkerFeedback) {
                 log.info("售后订单[{}]超时30分钟", order.getId());
                 orderDetailService.updateAfterTimeout(order.getId(), 1, 0);
                 // 售后超时通知