diff --git a/core/model/src/main/java/cn/qihangerp/model/entity/DouOrder.java b/core/model/src/main/java/cn/qihangerp/model/entity/DouOrder.java
index e0c76e49..da46f4c5 100644
--- a/core/model/src/main/java/cn/qihangerp/model/entity/DouOrder.java
+++ b/core/model/src/main/java/cn/qihangerp/model/entity/DouOrder.java
@@ -41,7 +41,7 @@ public class DouOrder implements Serializable {
     /**
      * 订单状态1 待确认/待支付（订单创建完毕）105 已支付 2 备货中 101 部分发货 3 已发货（全部发货）4 已取消5 已完成（已收货）
      */
-    private Long orderStatus;
+    private Integer orderStatus;
 
     /**
      * 订单状态描述
diff --git a/core/model/src/main/java/cn/qihangerp/model/entity/DouOrderItem.java b/core/model/src/main/java/cn/qihangerp/model/entity/DouOrderItem.java
index 9a355b93..680cb47c 100644
--- a/core/model/src/main/java/cn/qihangerp/model/entity/DouOrderItem.java
+++ b/core/model/src/main/java/cn/qihangerp/model/entity/DouOrderItem.java
@@ -126,7 +126,7 @@ public class DouOrderItem implements Serializable {
     /**
      * 订单商品数量
      */
-    private Long itemNum;
+    private Integer itemNum;
 
     /**
      * 物流收货时间 
diff --git a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouOrderApiController.java b/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouOrderApiController.java
index 6886c01c..e8de41d5 100644
--- a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouOrderApiController.java
+++ b/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouOrderApiController.java
@@ -136,14 +136,21 @@ public class DouOrderApiController {
             BeanUtils.copyProperties(gitem, douOrder);
             douOrder.setOrderPhaseList(JSONObject.toJSONString(gitem.getOrderPhaseList()));
             douOrder.setEncryptPostAddress(gitem.getPostAddr().getEncryptDetail());
-            douOrder.setProvinceName(gitem.getPostAddr().getProvince().getName());
-            douOrder.setProvinceId(gitem.getPostAddr().getProvince().getId());
-            douOrder.setCityName(gitem.getPostAddr().getCity().getName());
-            douOrder.setCityId(gitem.getPostAddr().getCity().getId());
-            douOrder.setTownName(gitem.getPostAddr().getTown().getName());
-            douOrder.setTownId(gitem.getPostAddr().getTown().getId());
-            douOrder.setStreetName(gitem.getPostAddr().getStreet().getName());
-            douOrder.setStreetId(gitem.getPostAddr().getStreet().getId());
+//            douOrder.setProvinceName(gitem.getPostAddr().getProvince().getName());
+            douOrder.setProvinceName(gitem.getPostAddr().getProvince()!=null?gitem.getPostAddr().getProvince().getName():"");
+//            douOrder.setProvinceId(gitem.getPostAddr().getProvince().getId());
+            douOrder.setProvinceId(gitem.getPostAddr().getProvince()!=null?gitem.getPostAddr().getProvince().getId():"0");
+//            douOrder.setCityName(gitem.getPostAddr().getCity().getName());
+            douOrder.setCityName(gitem.getPostAddr().getProvince()!=null?gitem.getPostAddr().getCity().getName():"");
+//            douOrder.setCityId(gitem.getPostAddr().getCity().getId());
+            douOrder.setCityId(gitem.getPostAddr().getProvince()!=null?gitem.getPostAddr().getCity().getId():"");
+//            douOrder.setTownName(gitem.getPostAddr().getTown().getName());
+            douOrder.setTownName(gitem.getPostAddr().getProvince()!=null?gitem.getPostAddr().getTown().getName():"");
+//            douOrder.setTownId(gitem.getPostAddr().getTown().getId());
+            douOrder.setTownId(gitem.getPostAddr().getProvince()!=null?gitem.getPostAddr().getTown().getId():"0");
+//            douOrder.setStreetName(gitem.getPostAddr().getStreet().getName());
+            douOrder.setStreetName(gitem.getPostAddr().getProvince()!=null?gitem.getPostAddr().getStreet().getName():"");
+            douOrder.setStreetId(gitem.getPostAddr().getProvince()!=null?gitem.getPostAddr().getStreet().getId():"0");
             douOrder.setMaskPostAddress(gitem.getMaskPostAddr().getDetail());
             douOrder.setLogisticsInfo(JSONObject.toJSONString(gitem.getLogisticsInfo()));
             List<DouOrderItem> items = new ArrayList<>();
@@ -155,6 +162,7 @@ public class DouOrderApiController {
                     item.setAfterSaleType(i.getAfterSaleInfo().getAfterSaleType());
                     item.setRefundStatus(i.getAfterSaleInfo().getRefundStatus());
                     item.setSpec(JSONObject.toJSONString(i.getSpec()));
+//                    item.setItemNum(i.getItemNum());
                     items.add(item);
                 }
                 douOrder.setItems(items);
diff --git a/vue/src/views/dou/order/index.vue b/vue/src/views/dou/order/index.vue
index cda5fc8a..80b8c6e6 100644
--- a/vue/src/views/dou/order/index.vue
+++ b/vue/src/views/dou/order/index.vue
@@ -304,6 +304,7 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
+      this.pullLoading=false
       this.queryParams.pageNum = 1;
       this.getList();
     },
@@ -351,6 +352,7 @@ export default {
           }else{
             this.$modal.msgSuccess(JSON.stringify(response));
             this.getList()
+            this.pullLoading = false
           }
           this.pullLoading = false
         })