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 5aa7d141..eada63d7 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
@@ -25,6 +25,8 @@ import com.ghy.order.service.OrderMasterService;
 import com.ghy.payment.domain.FinancialDetail;
 import com.ghy.payment.domain.FinancialMaster;
 import com.ghy.payment.service.FinancialDetailService;
+import com.ghy.system.domain.SysArea;
+import com.ghy.system.service.ISysAreaService;
 import com.ghy.web.pojo.vo.OrderListResponse;
 import com.ghy.web.pojo.vo.OrderStandard;
 import com.ghy.worker.domain.Worker;
@@ -64,6 +66,8 @@ public class OrderDetailController extends BaseController {
     @Autowired
     private CustomerAddressService addressService;
     @Autowired
+    private ISysAreaService sysAreaService;
+    @Autowired
     private GoodsService goodsService;
     @Autowired
     private GoodsStandardService goodsStandardService;
@@ -116,6 +120,8 @@ public class OrderDetailController extends BaseController {
 
             // 地址信息
             CustomerAddress customerAddress = addressService.selectByCustomerAddressId(orderMaster.getAddressId());
+            SysArea sysArea = sysAreaService.selectById(customerAddress.getCountryId());
+            String completeAddress = sysArea.getMergerName().replaceAll(",", "") + customerAddress.getAddress();
 
             for(OrderGoods orderGoods : orderStandardList){
                 OrderStandard orderStandard = new OrderStandard();
@@ -144,7 +150,7 @@ public class OrderDetailController extends BaseController {
             orderListResponse.setPayStatus(orderMaster.getPayStatus());
             orderListResponse.setPayType(orderMaster.getPayType());
             orderListResponse.setStandardList(standardList);
-            orderListResponse.setAddress(customerAddress.getAddress());
+            orderListResponse.setAddress(completeAddress);
             orderListResponse.setServerTime(detail.getRevTime());
             orderListResponse.setExpectTimeStart(detail.getExpectTimeStart());
             orderListResponse.setExpectTimeEnd(detail.getExpectTimeEnd());
@@ -196,6 +202,8 @@ public class OrderDetailController extends BaseController {
 
             // 地址信息
             CustomerAddress customerAddress = addressService.selectByCustomerAddressId(orderMaster.getAddressId());
+            SysArea sysArea = sysAreaService.selectById(customerAddress.getCountryId());
+            String completeAddress = sysArea.getMergerName().replaceAll(",", "") + customerAddress.getAddress();
 
             for(OrderGoods orderGoods : orderStandardList){
                 OrderStandard orderStandard = new OrderStandard();
@@ -225,7 +233,7 @@ public class OrderDetailController extends BaseController {
             orderListResponse.setPayStatus(orderMaster.getPayStatus());
             orderListResponse.setPayType(orderMaster.getPayType());
             orderListResponse.setStandardList(standardList);
-            orderListResponse.setAddress(customerAddress.getAddress());
+            orderListResponse.setAddress(completeAddress);
             orderListResponse.setServerTime(detail.getRevTime());
             orderListResponse.setExpectTimeStart(detail.getExpectTimeStart());
             orderListResponse.setExpectTimeEnd(detail.getExpectTimeEnd());
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 b7da2133..95b90a8b 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
@@ -163,7 +163,7 @@ public class OrderMasterController extends BaseController {
             rspData.setTotal(orderListResponses.size());
             return rspData;
         }
-        Integer pageSize = pageDomain.getPageNum() * 10;
+        Integer pageSize = pageDomain.getPageNum();
         if (pageSize > orderListResponses.size())
         {
             pageSize = orderListResponses.size();
diff --git a/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml
index bbf63d5f..0f60e694 100644
--- a/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml
+++ b/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml
@@ -98,6 +98,12 @@
             <if test="countryId != null">
                 AND ca.country_id = #{countryId}
             </if>
+            <if test="expectTimeStart != null">
+                AND od.expect_time_start &gt;= #{expectTimeStart}
+            </if>
+            <if test="expectTimeEnd != null">
+                AND od.expect_time_end &lt;= #{expectTimeEnd}
+            </if>
         </where>
         order by od.create_time
         <trim suffixOverrides=",">