门店查询优化

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

@@ -69,8 +69,13 @@ public class MaidianDataController extends WebBaseController {
     //首页-企业概况
     @RequestMapping("/total-activation-data")
     public HaobanResponse totalActivationData(MemberAnalyzeParamsDTO paramsDTO) {
-        List<String> storeRolesByClerkId = staffApiService.getHaoBanStoreRolesByClerkId(paramsDTO.getClerkId(), AuthWebRequestUtil.getLoginUser().getWxEnterpriseId());
-        paramsDTO.setStoreIdList(storeRolesByClerkId);
+        List<String> storeList = staffApiService.getHaoBanStoreIdsRolesByClerkId(AuthWebRequestUtil.getLoginUser().getClerkId(), AuthWebRequestUtil.getLoginUser().getWxEnterpriseId());
+        if(CollectionUtils.isEmpty(storeList)) {
+            return resultResponse(HaoBanErrCode.ERR_100007);
+        }
+        if(!(storeList.size()==1 && storeList.contains("-1"))) {
+            paramsDTO.setStoreIdList(storeList);
+        }
         paramsDTO.setWebFlag(1);
         Map<String, Object> returnMap = new HashMap<String, Object>();
         AdsGicLogHaobanStoreLoginDDTO dto = maidianDataService.totalActivationData(paramsDTO);
@@ -105,8 +110,13 @@ public class MaidianDataController extends WebBaseController {
     @RequestMapping("/total-login-data")
     public HaobanResponse totalLoginData(MemberAnalyzeParamsDTO paramsDTO, int datesType) {
         paramsDTO.setWebFlag(1);
-        List<String> storeRolesByClerkId = staffApiService.getHaoBanStoreRolesByClerkId(paramsDTO.getClerkId(),AuthWebRequestUtil.getLoginUser().getWxEnterpriseId());
-        paramsDTO.setStoreIdList(storeRolesByClerkId);
+        List<String> storeList = staffApiService.getHaoBanStoreIdsRolesByClerkId(AuthWebRequestUtil.getLoginUser().getClerkId(),AuthWebRequestUtil.getLoginUser().getWxEnterpriseId());
+        if(CollectionUtils.isEmpty(storeList)) {
+            return resultResponse(HaoBanErrCode.ERR_100007);
+        }
+        if(!(storeList.size()==1 && storeList.contains("-1"))) {
+            paramsDTO.setStoreIdList(storeList);
+        }
         Map<String, Object> returnMap = new HashMap<String, Object>();
         List<HaobanLoginInfoDTO> resultList = new ArrayList<HaobanLoginInfoDTO>();
         if (datesType == 1) {
@@ -197,8 +207,13 @@ public class MaidianDataController extends WebBaseController {
     @RequestMapping("/export-activite-list")
     public HaobanResponse exportActiviteList(HttpServletRequest request, HttpServletResponse response, MemberAnalyzeParamsDTO paramsDTO) {
         paramsDTO.setWebFlag(1);
-        List<String> storeRolesByClerkId = staffApiService.getHaoBanStoreRolesByClerkId(paramsDTO.getClerkId(),AuthWebRequestUtil.getLoginUser().getWxEnterpriseId());
-        paramsDTO.setStoreIdList(storeRolesByClerkId);
+        List<String> storeList = staffApiService.getHaoBanStoreIdsRolesByClerkId(AuthWebRequestUtil.getLoginUser().getClerkId(),AuthWebRequestUtil.getLoginUser().getWxEnterpriseId());
+        if(CollectionUtils.isEmpty(storeList)) {
+            return resultResponse(HaoBanErrCode.ERR_100007);
+        }
+        if(!(storeList.size()==1 && storeList.contains("-1"))) {
+            paramsDTO.setStoreIdList(storeList);
+        }
         paramsDTO.setCurrentPage(1);
         paramsDTO.setPageSize(Integer.MAX_VALUE);
         Page<HaobanClerkLoginDTO> page = maidianDataService.pageActiviteList(paramsDTO);
@@ -216,8 +231,13 @@ public class MaidianDataController extends WebBaseController {
     @RequestMapping("/export-login-detail-list")
     public HaobanResponse exportLoginDetailList(HttpServletRequest request, HttpServletResponse response, MemberAnalyzeParamsDTO paramsDTO) {
         paramsDTO.setWebFlag(1);
-        List<String> storeRolesByClerkId = staffApiService.getHaoBanStoreRolesByClerkId(paramsDTO.getClerkId(),AuthWebRequestUtil.getLoginUser().getWxEnterpriseId());
-        paramsDTO.setStoreIdList(storeRolesByClerkId);
+        List<String> storeList = staffApiService.getHaoBanStoreIdsRolesByClerkId(AuthWebRequestUtil.getLoginUser().getClerkId(),AuthWebRequestUtil.getLoginUser().getWxEnterpriseId());
+        if(CollectionUtils.isEmpty(storeList)) {
+            return resultResponse(HaoBanErrCode.ERR_100007);
+        }
+        if(!(storeList.size()==1 && storeList.contains("-1"))) {
+            paramsDTO.setStoreIdList(storeList);
+        }
         //默认排序
         if (StringUtils.isEmpty(paramsDTO.getSortColumn())) {
             paramsDTO.setSortColumn("lastLoginTime");
@@ -295,8 +315,13 @@ public class MaidianDataController extends WebBaseController {
     @RequestMapping("/area-ranking-list")
     public HaobanResponse areaRankingList(MemberAnalyzeParamsDTO paramsDTO) {
         paramsDTO.setWebFlag(1);
-        List<String> storeRolesByClerkId = staffApiService.getHaoBanStoreRolesByClerkId(paramsDTO.getClerkId(),AuthWebRequestUtil.getLoginUser().getWxEnterpriseId());
-        paramsDTO.setStoreIdList(storeRolesByClerkId);
+        List<String> storeList = staffApiService.getHaoBanStoreIdsRolesByClerkId(AuthWebRequestUtil.getLoginUser().getClerkId(),AuthWebRequestUtil.getLoginUser().getWxEnterpriseId());
+        if(CollectionUtils.isEmpty(storeList)) {
+            return resultResponse(HaoBanErrCode.ERR_100007);
+        }
+        if(!(storeList.size()==1 && storeList.contains("-1"))) {
+            paramsDTO.setStoreIdList(storeList);
+        }
         //默认排序
         if (StringUtils.isEmpty(paramsDTO.getSortColumn())) {
             paramsDTO.setSortColumn("loginRate");
@@ -315,8 +340,13 @@ public class MaidianDataController extends WebBaseController {
     @RequestMapping("/export-area-ranking-list")
     public HaobanResponse exportAreaRankingList(HttpServletRequest request, HttpServletResponse response, MemberAnalyzeParamsDTO paramsDTO) {
         paramsDTO.setWebFlag(1);
-        List<String> storeRolesByClerkId = staffApiService.getHaoBanStoreRolesByClerkId(paramsDTO.getClerkId(),AuthWebRequestUtil.getLoginUser().getWxEnterpriseId());
-        paramsDTO.setStoreIdList(storeRolesByClerkId);
+        List<String> storeList = staffApiService.getHaoBanStoreIdsRolesByClerkId(AuthWebRequestUtil.getLoginUser().getClerkId(),AuthWebRequestUtil.getLoginUser().getWxEnterpriseId());
+        if(CollectionUtils.isEmpty(storeList)) {
+            return resultResponse(HaoBanErrCode.ERR_100007);
+        }
+        if(!(storeList.size()==1 && storeList.contains("-1"))) {
+            paramsDTO.setStoreIdList(storeList);
+        }
         //默认排序
         if (StringUtils.isEmpty(paramsDTO.getSortColumn())) {
             paramsDTO.setSortColumn("loginRate");

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

@@ -44,17 +44,17 @@ public class StoreController extends WebBaseController{
         storeSearchDTO.setStatus("2");
         storeSearchDTO.setStoreType(storeType);
 
-        List<String> storeRolesByClerkId = staffApiService.getHaoBanStoreRolesByClerkId(clerkId, loginUser.getWxEnterpriseId());
+        List<String> storeList = staffApiService.getHaoBanStoreIdsRolesByClerkId(clerkId, loginUser.getWxEnterpriseId());
         PageResult<StoreDTO> pageVo = new PageResult<>();
         pageVo.setPageNum(pageNum);
         pageVo.setPageSize(pageSize);
-
-        if (CollectionUtils.isEmpty(storeRolesByClerkId)) {
+        if (CollectionUtils.isEmpty(storeList)) {
             logger.info("导购无门店权限");
             return resultResponse(HaoBanErrCode.ERR_1,pageVo);
         }
-
-        storeSearchDTO.setStoreIdList(storeRolesByClerkId);
+        if(!(storeList.size()==1 && storeList.contains("-1"))) {
+            storeSearchDTO.setStoreIdList(storeList);
+        }
         Page<StoreDTO> pageResult = storeService.storeListPage(page, storeSearchDTO);
         pageVo.setList(pageResult.getResult());
         pageVo.setTotal(pageResult.getTotalCount());