门店查询

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

@@ -1617,7 +1617,7 @@ public class WxStaffController extends WebBaseController {
     
     // 区经门店列表
     @RequestMapping("/list-clerk-store")
-    public RestResponse<Object> listClerkStore(String wxEnterpriseId , String enterpriseId,String clerkId, @RequestParam(defaultValue="20")int pageSize , @RequestParam(defaultValue="1")int currentPage) {
+    public RestResponse<Object> listClerkStore(String wxEnterpriseId , String enterpriseId,String clerkId, @RequestParam(defaultValue="20")int pageSize , @RequestParam(defaultValue="1")int currentPage , String storeSearchParams) {
         List<String> storeIdList = this.staffApiService.getHaoBanStoreIdsRolesByClerkId(clerkId, wxEnterpriseId) ;
         if (CollectionUtils.isEmpty(storeIdList)) {
             return RestResponse.failure("-1", "无授权门店");
@@ -1674,17 +1674,34 @@ public class WxStaffController extends WebBaseController {
         return RestResponse.successResult(page);
     }
     
-    //区经门店查询
-    @RequestMapping("search-clerk-store")
-    public RestResponse<Object> listClerkStoreByParams(String wxEnterpriseId,  String enterpriseId,  String clerkId, String  storeSearchParams) {
-        if(StringUtils.isEmpty(storeSearchParams)) {
-            return RestResponse.failure("-1", "查询条件为空") ;
-        }
+    
+    @RequestMapping("/list-clerk-store-page")
+    public RestResponse<Object> listClerkStorePage(String wxEnterpriseId , String enterpriseId,String clerkId, @RequestParam(defaultValue="20")int pageSize , @RequestParam(defaultValue="1")int currentPage , String storeSearchParams) {
         // 如果有权限控制,进行管辖门店过0滤
         List<String> authStoreIdList = this.staffApiService.getHaoBanStoreIdsRolesByClerkId(clerkId, wxEnterpriseId);
         if (CollectionUtils.isEmpty(authStoreIdList)) {
             return RestResponse.failure("-1", "无授权门店");
         }
+        Page page = this.page(wxEnterpriseId, enterpriseId, clerkId, 20, 1, storeSearchParams, authStoreIdList) ;
+        List<StoreDTO> storeList = (List<StoreDTO>) page.getResult();
+        List<StoreListVO> retList = new ArrayList<StoreListVO>();
+        StoreListVO vo = null;
+        for (StoreDTO dto : storeList) {
+            vo = new StoreListVO();
+            vo.setStoreId(dto.getStoreId());
+            vo.setStoreName(dto.getStoreName());
+            retList.add(vo);
+        }
+        Page<StoreListVO> retPage = new Page<>();
+        retPage.setResult(retList);
+        retPage.setTotalCount(page.getTotalCount());
+        retPage.setCurrentPage(currentPage);
+        retPage.setPageSize(pageSize);
+        return RestResponse.successResult(retPage);
+    }
+    
+    
+    private Page page(String wxEnterpriseId , String enterpriseId,String clerkId, @RequestParam(defaultValue="20")int pageSize , @RequestParam(defaultValue="1")int currentPage , String storeSearchParams , List<String> authStoreIdList) {
         StoreSearchDTO searchDTO = new StoreSearchDTO();
         searchDTO.setRecycleStoreCount(0);
         searchDTO.setMemberCountFlag(0);
@@ -1696,15 +1713,30 @@ public class WxStaffController extends WebBaseController {
         }
         // 门店参数
         Page page = new Page();
-        page.setPageSize(20);
-        page.setCurrentPage(1);
+        page.setPageSize(pageSize);
+        page.setCurrentPage(currentPage);
         Map<String, Object> params = new HashMap<>();
         params.put("searchDto", searchDTO);
         page.setParams(params);
         logger.info("查询条件={}", JSON.toJSONString(page));
         Map<String, Object> result = storeService.getStoreListPage(page);
         page = (Page) result.get("page");
-        List<StoreDTO> storeList = (List<StoreDTO>) result.get("list");
+        return page ;
+    }
+    
+    //区经门店查询
+    @RequestMapping("search-clerk-store")
+    public RestResponse<Object> listClerkStoreByParams(String wxEnterpriseId,  String enterpriseId,  String clerkId, String  storeSearchParams) {
+        if(StringUtils.isEmpty(storeSearchParams)) {
+            return RestResponse.failure("-1", "查询条件为空") ;
+        }
+        // 如果有权限控制,进行管辖门店过0滤
+        List<String> authStoreIdList = this.staffApiService.getHaoBanStoreIdsRolesByClerkId(clerkId, wxEnterpriseId);
+        if (CollectionUtils.isEmpty(authStoreIdList)) {
+            return RestResponse.failure("-1", "无授权门店");
+        }
+        Page page = this.page(wxEnterpriseId, enterpriseId, clerkId, 20, 1, storeSearchParams, authStoreIdList) ;
+        List<StoreDTO> storeList = (List<StoreDTO>) page.getResult();
         List<StoreListVO> retList = new ArrayList<StoreListVO>();
         StoreListVO vo = null;
         for (StoreDTO dto : storeList) {