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 97a44ca6..edfc3688 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
@@ -1591,6 +1591,17 @@ public class OrderController extends BaseController {
                     orderListResponse.setInsuranceManager(manager);
                 }
             }
+
+            orderListResponse.setProvinceName(master.getProvinceName());
+            orderListResponse.setCityName(master.getCityName());
+            orderListResponse.setCountryName(master.getCountryName());
+            orderListResponse.setStreetName(master.getStreetName());
+            orderListResponse.setProvinceId(master.getProvinceId());
+            orderListResponse.setCityId(master.getCityId());
+            orderListResponse.setCountryId(master.getCountryId());
+            orderListResponse.setStreetId(master.getStreetId());
+            orderListResponse.setPhone(master.getPhone());
+            orderListResponse.setName(master.getName());
             String addressSysArea = sysArea.getMergerName();
             String[] array = addressSysArea.split(",");
             if (StringUtils.isEmpty(master.getProvinceName())){
@@ -1604,21 +1615,10 @@ public class OrderController extends BaseController {
                 orderListResponse.setStreetId(customerAddress.getStreetId());
                 orderListResponse.setPhone(customerAddress.getPhone());
                 orderListResponse.setName(customerAddress.getName());
-            }else{
-                orderListResponse.setProvinceName(master.getProvinceName());
-                orderListResponse.setCityName(master.getCityName());
-                orderListResponse.setCountryName(master.getCountryName());
-                orderListResponse.setStreetName(master.getStreetName());
-                orderListResponse.setProvinceId(master.getProvinceId());
-                orderListResponse.setCityId(master.getCityId());
-                orderListResponse.setCountryId(master.getCountryId());
-                orderListResponse.setStreetId(master.getStreetId());
-                orderListResponse.setPhone(master.getPhone());
-                orderListResponse.setName(master.getName());
             }
 
 
-            logger.info("所有的列表信息{}", orderListResponse);
+            logger.info("所有的列表信息{}主单信息{}", orderListResponse,master);
             orderListResponses.add(orderListResponse);
 
         }