diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java
index afe7cc04..ed654b61 100644
--- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java
@@ -799,7 +799,7 @@ public class OrderDetailController extends BaseController {
                 orderListResponse.setPayMoney(detailPayMoney);
                 orderListResponse.setIsOnlyServ(Boolean.FALSE);
             }
-
+                
             orderListResponse.setIsNeedBill(orderMaster.getIsNeedBill());
             orderListResponse.setIsMonitoredOrder(orderMaster.getIsMonitoredOrder());
             orderListResponse.setOrderImages(orderMaster.getOrderImages());
@@ -812,6 +812,8 @@ public class OrderDetailController extends BaseController {
             orderListResponse.setOrderType(orderMaster.getOrderType());
             orderListResponse.setHasServiceOrder(orderMaster.getHasServiceOrder());
             // 编辑返回属性
+            orderListResponse.setShareAccountCountdownEndTime(detail.getShareAccountCountdownEndTime());
+            orderListResponse.setShareAccountCountdownDuration(detail.getShareAccountCountdownDuration());
             orderListResponse.setOrderDetailId(detail.getId());
             orderListResponse.setOrderDetailCode(detail.getCode());
             orderListResponse.setOrderMasterId(detail.getOrderMasterId());
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 c4838dda..a6d99cc6 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
@@ -1853,12 +1853,14 @@ public class OrderMasterController extends BaseController {
             serverMoney=serverMoney.add(leaderMoney);
             logger.info("大师傅的服务金额{}大师傅的分成{}",serverMoney,leaderMoney);
             Shop shop=shopService.getShop(goods.getShopId());
+            Shop serviceShop=shopService.getShop(orderMaster.getServiceShopId());
             shop = calculateShopDistance(orderMaster, shop);
             // 编辑返回属性
             orderListResponse.setDeliveryType(orderMaster.getDeliveryType());
             orderListResponse.setDeliveryRemark(orderMaster.getDeliveryRemark());
             orderListResponse.setDeliveryImages(orderMaster.getDeliveryImages());
             orderListResponse.setShop(shop);
+            orderListResponse.setServiceShop(serviceShop);
 
             orderListResponse.setGoods(goods);
             orderListResponse.setTrackingNumber(orderMaster.getTrackingNumber());
diff --git a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java
index 7fd315ff..ca57c9bd 100644
--- a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java
+++ b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java
@@ -301,4 +301,6 @@ public class OrderListResponse {
     private Integer shareAccountCountdownDuration;
 
     private Shop shop;
+
+    private Shop serviceShop;
 }
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 a182eaaf..a67f6e57 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
@@ -767,6 +767,7 @@ public class OrderDetailServiceImpl implements OrderDetailService {
         logger.info("子订单[code={}]开始自动提现", odCode);
         if (MoneyUtil.lte0(dtx)) {
             logger.info("子订单[code={}] 待提现金额={} 无需提现", odCode, dtx);
+                  updateStatus(orderDetailId, OrderStatus.FINISH.code());
         } else {
             // 待提现金额
             String cashAmt = AdapayUtils.bigDecimalToString(dtx);