分页查询转化记录门店参数处理

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/potential/PotentialDataController.java

@@ -59,8 +59,17 @@ public class PotentialDataController {
         String enterpriseId = contactOrderPageQO.getEnterpriseId();
         String clerkId = contactOrderPageQO.getClerkId();
         String storeId = contactOrderPageQO.getStoreId();
+        List<String> storeIds = new ArrayList<>();
+        if (StringUtils.isBlank(storeId)) {
+            storeIds = clerkStoreAdaptor.queryClerkStoreIds(storeId, contactOrderPageQO.getEnterpriseId(),
+                    StoreStatusFilterUtils.getStoreStatusList(contactOrderPageQO.getStoreStatusFilter()));
+        } else {
+            storeIds.add(storeId);
+        }
         ContactOrderSearchQDTO searchQDTO = new ContactOrderSearchQDTO();
-        searchQDTO.setStoreIdList(Lists.newArrayList(storeId));
+        if (CollectionUtils.isNotEmpty(storeIds)) {
+            searchQDTO.setStoreIdList(storeIds);
+        }
         searchQDTO.setClerkId(clerkId);
         searchQDTO.setBeginTime(contactOrderPageQO.getBeginTime());
         searchQDTO.setEndTime(contactOrderPageQO.getEndTime());

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/qo/contact/ContactOrderPageQO.java

@@ -37,6 +37,11 @@ public class ContactOrderPageQO extends PageQo {
      */
     private String enterpriseId;
 
+    /**
+     * 门店过滤
+     */
+    private Integer storeStatusFilter;
+
     public String getClerkId() {
         return clerkId;
     }
@@ -76,4 +81,12 @@ public class ContactOrderPageQO extends PageQo {
     public void setEnterpriseId(String enterpriseId) {
         this.enterpriseId = enterpriseId;
     }
+
+    public Integer getStoreStatusFilter() {
+        return storeStatusFilter;
+    }
+
+    public void setStoreStatusFilter(Integer storeStatusFilter) {
+        this.storeStatusFilter = storeStatusFilter;
+    }
 }