跳转判断逻辑

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/MemberUnionidRelatedApiService.java

@@ -47,7 +47,15 @@ public interface MemberUnionidRelatedApiService {
 
 	List<MemberUnionidRelatedDTO> listByEnterpriseIdAndDate(String enterpriseId, Date date);
 
-	List<MemberStoreDTO> listByExTernalUseridAndWxUserId(String externalUserid, String wxUserId);
+    /**
+     * 查看是否可以跳转会员详情的会员列表
+     *
+     * @param externalUserid
+     * @param wxUserId
+     * @param storeId
+     * @return
+     */
+    List<MemberStoreDTO> listByExTernalUseridAndWxUserId(String externalUserid, String wxUserId, String storeId);
 
 	String add(String wxEnterpriseId, String selfExternalUserId, String userId1, String storeId);
 

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MemberUnionidRelatedApiServiceImpl.java

@@ -151,7 +151,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
     }
 
     @Override
-    public List<MemberStoreDTO> listByExTernalUseridAndWxUserId(String externalUserid, String wxUserId) {
+    public List<MemberStoreDTO> listByExTernalUseridAndWxUserId(String externalUserid, String wxUserId, String storeId) {
         List<TabHaobanExternalClerkRelated> list = externalClerkRelatedService.listByExTernalUseridAndWxUserId(externalUserid, wxUserId);
         List<MemberStoreDTO> result = new ArrayList<>();
         if (CollectionUtil.isEmpty(list)) {
@@ -168,23 +168,6 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
             log.info("staff关联门店不存在1");
             return null;
         }
-//        Map<String, StaffClerkRelationDTO> storeMap = clerkRelationDTOS.stream().collect(Collectors.toMap(mid -> mid.getStoreId(), dto -> dto, (o, n) -> n));
-//		//1、查该staff的门店id
-//		List<TabHaobanStaffDepartmentRelated> relatedIds = staffDepartmentRelatedService.listByWxUserId(wxUserId);
-//		if(CollectionUtil.isEmpty(relatedIds)){
-//			log.info("staff关联部门不存在1");
-//			return null;
-//		}
-//		List<String> departmentIds = relatedIds.stream().map(s->s.getDepartmentId()).collect(Collectors.toList());
-//		if(CollectionUtil.isEmpty(departmentIds)){
-//			log.info("staff部门不存在1");
-//			return null;
-//		}
-//		List<DepartmentDTO> stores  = departmentApiService.listByDepartmentIds(departmentIds, 1);
-//		if(CollectionUtil.isEmpty(stores)){
-//			log.info("staff关联门店不存在1");
-//			return null;
-//		}
         List<String> storeIds = clerkRelationDTOS.stream().filter(s -> (s.getStoreId() != null || "".equals(s.getStoreId()))).map(s -> s.getStoreId()).collect(Collectors.toList());
         if (CollectionUtil.isEmpty(storeIds)) {
             log.info("staff关联门店不存在2");
@@ -192,6 +175,9 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         }
         //2、获取member的storeId
         for (TabHaobanExternalClerkRelated tab : list) {
+            if (StringUtils.isNotBlank(storeId) && (!storeId.equals(tab.getStoreId()))) {
+                continue;
+            }
             String memberId = tab.getMemberId();
             if (StringUtils.isEmpty(memberId)) {
                 continue;

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

@@ -315,11 +315,11 @@ public class InfoController extends WebBaseController{
 	}
 	
 	@RequestMapping("get-member-store")
-	public HaobanResponse getMemberStore(String externalUserid,String wxUserId) {
+    public HaobanResponse getMemberStore(String externalUserid, String wxUserId, String storeId) {
         if (StringUtils.isAnyBlank(externalUserid,wxUserId)) {
             return resultResponse(HaoBanErrCode.ERR_2);
         }
-        List<MemberStoreDTO> result =  memberUnionidRelatedApiService.listByExTernalUseridAndWxUserId(externalUserid, wxUserId);
+        List<MemberStoreDTO> result = memberUnionidRelatedApiService.listByExTernalUseridAndWxUserId(externalUserid, wxUserId, storeId);
         return resultResponse(HaoBanErrCode.ERR_1,result);
 	}