门店查询条件优化

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

@@ -13,6 +13,8 @@ import com.gic.haoban.common.utils.HaobanResponse;
 import com.gic.haoban.manage.api.service.StaffApiService;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
 import com.gic.redis.data.util.RedisUtil;
+
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -136,8 +138,13 @@ public class MaidianDataController extends WebBaseController {
     @RequestMapping("/area-login-ranking")
     public HaobanResponse areaLoginRanking(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);
+        }
         Map<String, Object> returnMap = new HashMap<String, Object>();
         List<AreaLoginDTO> list = maidianDataService.areaLoginRanking(paramsDTO);
         if (CollectionUtil.isEmpty(list)) {
@@ -151,8 +158,13 @@ public class MaidianDataController extends WebBaseController {
     @RequestMapping("/activite-date")
     public HaobanResponse activiteDate(MemberAnalyzeParamsDTO paramsDTO) {
         paramsDTO.setWebFlag(1);
-        List<String> storeRolesByClerkId = staffApiService.getHaoBanStoreRolesByClerkId(paramsDTO.getClerkId(),AuthWebRequestUtil.getLoginUser().getWxEnterpriseId());
-        paramsDTO.setStoreIdList(storeRolesByClerkId);
+        List<String> storeList = staffApiService.getHaoBanStoreIdsRolesByClerkId(paramsDTO.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>();
         //近7日
@@ -169,8 +181,13 @@ public class MaidianDataController extends WebBaseController {
     @RequestMapping("/activite-list")
     public HaobanResponse activiteList(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);
+        }
         Page<HaobanClerkLoginDTO> page = maidianDataService.pageActiviteList(paramsDTO);
         return resultResponse(HaoBanErrCode.ERR_1, page);
 
@@ -237,8 +254,13 @@ public class MaidianDataController extends WebBaseController {
     @RequestMapping("/login-detail-list")
     public HaobanResponse loginDetailList(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");
@@ -256,8 +278,13 @@ public class MaidianDataController extends WebBaseController {
     @RequestMapping("area-ranking-date")
     public HaobanResponse areaRankingDate(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);
+        }
         Map<String, Object> returnMap = new HashMap<String, Object>();
         List<AreaLoginDTO> list = maidianDataService.areaRankingDate(paramsDTO);
         returnMap.put("result", list);

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/errCode/HaoBanErrCode.java

@@ -119,7 +119,7 @@ public enum HaoBanErrCode {
 
     ERR_100031(100031, "该小程序已经绑定过，不能重复绑定"),
     ERR_100032(100032, "代理不能设置导购编辑权限"),
-
+    ERR_100007(100007, "无门店权限"),
     ERR_DEFINE(-888, "自定义错误"),
     ERR_OTHER(-999, "未知错误code");
     private int code;