Merge branch 'master_xgh_我的客户迭代' into 'developer'

Master xgh 我的客户迭代

See merge request !374

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

@@ -195,6 +195,8 @@ public interface ExternalClerkRelatedApiService {
     
     com.gic.api.base.commons.ServiceResponse<Boolean> isQwFriend(String enterpriseId, String staffId, String memberId) ;
     
+    com.gic.api.base.commons.ServiceResponse<String> getExternalUseridForWxa(String enterpriseId, String staffId, String memberId) ;
+    
     List<String> listMemberAndClerk(List<String> memberIdList , List<String> clerkIdList , String enterpriseId) ; 
 
     /**

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

@@ -458,6 +458,16 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
     }
     
     @Override
+    public com.gic.api.base.commons.ServiceResponse<String> getExternalUseridForWxa(String enterpriseId, String staffId,
+            String memberId) {
+        TabHaobanExternalClerkRelated externalClerkRelated = tabHaobanExternalClerkRelatedMapper.getByMemberIdAndStaffId(staffId, enterpriseId, memberId);
+        if(null != externalClerkRelated) {
+            return com.gic.api.base.commons.ServiceResponse.success(externalClerkRelated.getExternalClerkRelatedId());
+        }
+        return com.gic.api.base.commons.ServiceResponse.failure("9999", "无好友关系") ; 
+    }
+    
+    @Override
     public List<String> listMemberAndClerk(List<String> memberIdList, List<String> clerkIdList, String enterpriseId) {
         List<String> list = tabHaobanExternalClerkRelatedMapper.listMemberAndClerk(memberIdList, clerkIdList, enterpriseId);
         return list;

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

@@ -801,24 +801,24 @@ public class StaffApiServiceImpl implements StaffApiService {
         Object cache = RedisUtil.getCache(cacheKey);
         if (cache != null) {
             List<String> storeList = (List<String>) cache;
-            logger.info("从缓存中获取通道={},数量:{}", cacheKey, storeList.size());
+            logger.info("从缓存中获取key={},store数量:{}", cacheKey, storeList.size());
             return storeList;
         }
         ClerkDTO clerkDTO = clerkService.getClerkByClerkId(clerkId);
         if (clerkDTO == null) {
-            logger.info("导购不存在：clerkId:{}", clerkId);
+            logger.info("导购不存在：clerkId:{},无门店", clerkId);
             return Collections.emptyList();
         }
         String enterpriseId = clerkDTO.getEnterpriseId();
         List<String> enterpriseIdStoreIds = storeRangeService.listStoreIdByWxEnterpriseId(wxEnterpriseId, enterpriseId);
         if (CollectionUtils.isEmpty(enterpriseIdStoreIds)) {
-            logger.info("好办门店空,eid={}", enterpriseId);
+            logger.info("无好办门店,eid={}", enterpriseId);
             return Collections.emptyList();
         }
-        logger.info("好办门店id数量:{}", enterpriseIdStoreIds.size());
+        logger.info("好办门店数量={}", enterpriseIdStoreIds.size());
         List<String> gicStoreIds = getStoreIdList(clerkDTO);
         if (CollectionUtils.isEmpty(gicStoreIds)) {
-            logger.info("gic门店为空");
+            logger.info("无gic门店为空");
             return Collections.emptyList();
         }
         if (gicStoreIds.contains("-1")) {
@@ -838,10 +838,10 @@ public class StaffApiServiceImpl implements StaffApiService {
             RedisUtil.setCache(cacheKey, enterpriseIdStoreIds, 10L, TimeUnit.MINUTES);
             return enterpriseIdStoreIds;
         }
-        logger.info("gic门店数量：{}", gicStoreIds.size());
+        logger.info("gic门店数量={}", gicStoreIds.size());
         //取交集
         List<String> storeList = RolesListUtils.mergeList(enterpriseIdStoreIds, gicStoreIds);
-        logger.info("该导购权限：clerkId:{},门店数量：{}", clerkId, storeList.size());
+        logger.info("clerkId={},门店交集数量={}", clerkId, storeList.size());
         RedisUtil.setCache(cacheKey, storeList, 10L, TimeUnit.MINUTES);
         return storeList;
     }
@@ -912,7 +912,6 @@ public class StaffApiServiceImpl implements StaffApiService {
         Integer superAdmin = clerkDTO.getSuperAdmin();
         if (superAdmin != null && superAdmin == 1) {
             logger.info("gic超管，clerkId：{}", clerkId);
-            //gic超管
             return Collections.singletonList("-1");
         }
         String enterpriseId = clerkDTO.getEnterpriseId();
@@ -920,23 +919,22 @@ public class StaffApiServiceImpl implements StaffApiService {
         if (enterpriseSetting.getEnableAccessControl() != null && enterpriseSetting.getEnableAccessControl() == 1) {
             String storeWidgetId = this.powerService.getStoreWidgetId(new Date(), clerkId);
             if (StringUtils.isBlank(storeWidgetId)) {
-                logger.info("导购权限不存在");
+                logger.info("导购无门店权限,门店组件id is null");
                 return Collections.emptyList();
             }
             StoreWidgetDTO storeWidgetDTO = this.storeWidgetService.getStoreWidgetBykey(storeWidgetId);
             if (storeWidgetDTO == null) {
-                logger.info("导购权限不存在");
+                logger.info("导购门店权限查不到,storeWidgetId={}",storeWidgetId);
                 return Collections.emptyList();
             }
             Integer selectType = storeWidgetDTO.getSelectType();
             if (selectType != null && selectType == 0) {
-                //gic超管
-                logger.info("gic超管，clerkId：{}", clerkId);
+                logger.info("gic超管所有门店,clerkId：{}", clerkId);
                 return Collections.singletonList("-1");
             }
             return getStoreWidgetIdStoreIds(storeWidgetId, enterpriseId);
         } else {
-            //未开启分权
+            logger.info("无开启权限 ,所有门店,clerkId={}", clerkId);
             return Collections.singletonList("-1");
         }
     }