diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
index 29b50dad..34972fd6 100644
--- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
@@ -570,7 +570,7 @@ public class OrderController extends BaseController {
         orderMaster.setProvinceName(customerAddress.getProvinceName());
         orderMaster.setCityName(customerAddress.getCityName());
         orderMaster.setCountryName(customerAddress.getCountryName());
-        orderMaster.setStreetId(request.getStreetId());
+        orderMaster.setStreetId(customerAddress.getStreetId());
         orderMaster.setStreetName(customerAddress.getStreetName());
 
 
diff --git a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java
index d371cfe1..d12f08d9 100644
--- a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java
+++ b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java
@@ -589,6 +589,7 @@ public class OrderDetailServiceImpl implements OrderDetailService {
         BigDecimal changeMoney = BigDecimal.ZERO;
         // 查询子订单的加价记录
         List<FinancialChangeRecord> financialChangeRecords = financialChangeRecordService.selectByDetailIds(String.valueOf(orderDetailId));
+        logger.info("子订单加价记录{}",dtx);
         if (CollectionUtils.isNotEmpty(financialChangeRecords)) {
             // 改价记录只会有一条 直接取出
             FinancialChangeRecord fcRecord = financialChangeRecords.get(0);
@@ -607,7 +608,7 @@ public class OrderDetailServiceImpl implements OrderDetailService {
         OrderAttachmentRecord param = new OrderAttachmentRecord();
         param.setOrderDetailId(orderDetailId);
         List<OrderAttachmentRecord> orderAttachmentRecordList = orderAttachmentRecordService.selectOrderAttachmentRecordList(param);
-        logger.info("附件费分账金额{}",dtx1);
+        logger.info("附件费分账金额{}",orderAttachmentRecordList);
         if(CollectionUtils.isNotEmpty(orderAttachmentRecordList)){
             // 附件费分账.
             attachPaymentConfirm(orderAttachmentRecordList.get(0), orderDetailId, orderDetail.getWorkerId(), deptId);
@@ -732,6 +733,7 @@ public class OrderDetailServiceImpl implements OrderDetailService {
         if(AdapayUtils.getWorkerMemberId(workerId, deptId).equals(masterMemberId)){
             masterFee = BigDecimal.ZERO;
         }
+        logger.info("子订单改价分账1级{}2级{}",placeOneMoney,placeTwoMoney);
         // 上门师傅的报酬
         BigDecimal workerFee = changeMoney;
         BigDecimal fineMoney = BigDecimal.ZERO;
diff --git a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml
index 28a66ba7..af1b1566 100644
--- a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml
+++ b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml
@@ -595,12 +595,6 @@
         </where>
     </select>
 
-    <update id="updateOrderMasterAddressById" parameterType="com.ghy.order.domain.OrderMaster">
-        UPDATE order_master
-        SET timeout_ = #{timeout}
-        <if test="timeoutFineTimes != null">,timeout_fine_times = #{timeoutFineTimes}</if>
-        WHERE id = #{id}
-    </update>
 
     <update id="updateOrderMasterAddressById" parameterType="com.ghy.order.domain.OrderMaster">
         UPDATE order_master
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 fd356b61..1f9f941b 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
@@ -617,7 +617,8 @@ public class OrderServiceImpl implements OrderService {
         // 查询出"待确认"状态的子订单
         List<OrderDetail> orderDetails = orderDetailService.selectByStatus(Collections.singletonList(OrderStatus.FINISH_CHECK.code()));
         long now = System.currentTimeMillis();
-        long day14ago = now - (60 * 60 * 1000L);
+        //TODO:测试完毕以后改为60分钟
+        long day14ago = now - (10 * 60 * 1000L);
 //        long day14ago = now - 10000L;
         for (OrderDetail orderDetail : orderDetails) {
             // 筛选符合自动确认的订单