diff --git a/ghy-order/src/main/java/com/ghy/order/service/impl/AfterServiceRecordServiceImpl.java b/ghy-order/src/main/java/com/ghy/order/service/impl/AfterServiceRecordServiceImpl.java
index bf1bab63..644d2a6d 100644
--- a/ghy-order/src/main/java/com/ghy/order/service/impl/AfterServiceRecordServiceImpl.java
+++ b/ghy-order/src/main/java/com/ghy/order/service/impl/AfterServiceRecordServiceImpl.java
@@ -182,11 +182,16 @@ public class AfterServiceRecordServiceImpl implements IAfterServiceRecordService
         boolean drawCash = orderDetail.getDrawCashTime() != null;
         // 更新为售后未超时
         orderDetailService.updateAfterTimeout(afterServiceRecord.getOrderDetailId(), 0, 0);
-        log.info("客户是否同意{}，客户操作{}",param.getCustomerFinalCheck()!=null,param);
+        log.info("客户是否同意{}，客户操作{}",one.equals(param.getCustomerFinalCheck()),param);
         log.info("修改后的售后订单{}",orderDetail);
         if (param.getCustomerFinalCheck()!=null ) {
             // 师傅同意 且 客户同意退款
-            afterServiceRecord.setCustomerFinalCheck(1L);
+            //afterServiceRecord.setCustomerFinalCheck(1L);
+            if (one.equals(param.getCustomerFinalCheck())) {
+                afterServiceRecord.setCustomerFinalCheck(1L);
+            }else{
+                afterServiceRecord.setCustomerFinalCheck(0L);
+            }
             afterServiceRecord.setRefundApplyTime(new Date());
             // 售后客户回复通知
             // 通知师傅新订单
@@ -259,7 +264,7 @@ public class AfterServiceRecordServiceImpl implements IAfterServiceRecordService
         } else {
             refundMoney = afterServiceRecord.getRefund();
         }
-        log.info("AfterServiceRecord[{}].refundMoney: {}", afterServiceRecord.getId(), refundMoney);
+        log.info("AfterServiceRecord[{}].refundMoney: {},操作数据{}", afterServiceRecord.getId(), refundMoney,afterServiceRecord);
         // 是不是大师傅的子单
         boolean isMaster = orderMaster.getWorkerId().equals(orderDetail.getWorkerId());
         log.info("isMaster: {}", isMaster);
@@ -312,6 +317,7 @@ public class AfterServiceRecordServiceImpl implements IAfterServiceRecordService
             }
         } else {
             // 是子师傅的子单 退款金额最大可以等于子单的派单金额
+            log.info("financialDetail.getPayMoney()[{}].refundMoney: {}", financialDetail.getPayMoney(), refundMoney);
             if (refundMoney.compareTo(financialDetail.getPayMoney()) > -1) {
                 // 子单全额退款 直接走取消流程
                 orderDetailService.cancelAgree(orderDetail.getId(), 1);
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 a6c85014..fd356b61 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
@@ -399,7 +399,7 @@ public class OrderServiceImpl implements OrderService {
             } else if (timeoutOrderStatus.contains(order.getOrderStatus())) {
                 // 其它状态用update_time判断30min超时
                 Date overTime = getOverTime(order.getUpdateTime(), 30 * 60 * 1000);
-                if (overTime.before(now)&&order.getWorkerId()==null) {
+                if (overTime.before(now)&&order.getWorkerId()==null&&order.getOrderStatus()!=OrderStatus.GOING.code()) {
                     log.info("订单[{}]超时30分钟", order.getId());
                     orderDetailService.updateTimeout(order.getId(), 1, 0);
                     // 判断是否约单