Merge remote-tracking branch 'origin/master'

fs-service-system/src/main/java/com/fs/course/service/impl/FsUserCourseVideoServiceImpl.java

@@ -993,7 +993,7 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
     @Override
     @Transactional
     public ResponseResult<Boolean> isAddCompanyUser(FsUserCourseAddCompanyUserParam param) {
-        logger.info("=======================进入个微-判断是否添加客服===========================，入参：{}",param);
+        logger.info("\n 【进入个微-判断是否添加客服】，入参：{}",param);
         //查询用户
         FsUser fsUser = fsUserMapper.selectFsUserById(param.getUserId());
         if (fsUser == null){

fs-service-system/src/main/java/com/fs/store/service/impl/FsUserServiceImpl.java

@@ -503,32 +503,37 @@ public class FsUserServiceImpl implements IFsUserService
         }
         List<FsUserPageListVO> fsUserPageListVOS = fsUserMapper.selectFsUserPageList(param);
 
-        // 获取当前销售所有重粉会员
-        List<FsUserCompanyUser> fsUserCompanyUsers = fsUserCompanyUserMapper.selectRepeatUser(param.getUserId());
-
-        if(!fsUserCompanyUsers.isEmpty()){
-            List<Long> userIds = fsUserCompanyUsers.stream().map(FsUserCompanyUser::getUserId).collect(Collectors.toList());
-            // 获取会员所属的重粉销售
-            List<FsUserCompanyUser> repeatCompanyUserNames = fsUserCompanyUserMapper.selectRepeatCompanyUserName(userIds);
-            Map<Long, String> map = repeatCompanyUserNames.stream().collect(Collectors.toMap(FsUserCompanyUser::getUserId, FsUserCompanyUser::getRepeatCompanyUserName));
-
-            for (FsUserPageListVO fsUserPageListVO : fsUserPageListVOS) {
-                fsUserPageListVO.setRepeatCompanyUserName(map.get(fsUserPageListVO.getUserId()));
-                if ("微信用户".equals(fsUserPageListVO.getNickname()) && StringUtils.isNotEmpty(fsUserPageListVO.getPhone())) {
-                    fsUserPageListVO.setNickname(fsUserPageListVO.getPhone());
-                }
-                if (StringUtils.isEmpty(fsUserPageListVO.getNickname())){
-                    fsUserPageListVO.setNickname("用户暂未授权头像昵称");
-                }
-                if(StringUtils.isNotEmpty(fsUserPageListVO.getTag()) && fsUserPageListVO.getIsRepeatFans() == 0){
-                    StringBuilder newTag = removeRepeatFansTag(fsUserPageListVO);
-                    fsUserPageListVO.setTag(newTag.toString());
-                }
+        for (FsUserPageListVO fsUserPageListVO : fsUserPageListVOS) {
+            if (StringUtils.isEmpty(fsUserPageListVO.getNickname())){
+                fsUserPageListVO.setNickname("用户暂未授权昵称");
             }
-            return new PageInfo<>(fsUserPageListVOS);
-        } else {
-            return new PageInfo<>(fsUserPageListVOS);
         }
+
+        return new PageInfo<>(fsUserPageListVOS);
+
+        // 获取当前销售所有重粉会员
+//        List<FsUserCompanyUser> fsUserCompanyUsers = fsUserCompanyUserMapper.selectRepeatUser(param.getUserId());
+
+//        if(!fsUserCompanyUsers.isEmpty()){
+//            List<Long> userIds = fsUserCompanyUsers.stream().map(FsUserCompanyUser::getUserId).collect(Collectors.toList());
+//            // 获取会员所属的重粉销售
+//            List<FsUserCompanyUser> repeatCompanyUserNames = fsUserCompanyUserMapper.selectRepeatCompanyUserName(userIds);
+//            Map<Long, String> map = repeatCompanyUserNames.stream().collect(Collectors.toMap(FsUserCompanyUser::getUserId, FsUserCompanyUser::getRepeatCompanyUserName));
+//
+//            for (FsUserPageListVO fsUserPageListVO : fsUserPageListVOS) {
+//                fsUserPageListVO.setRepeatCompanyUserName(map.get(fsUserPageListVO.getUserId()));
+//                if ("微信用户".equals(fsUserPageListVO.getNickname()) && StringUtils.isNotEmpty(fsUserPageListVO.getPhone())) {
+//                    fsUserPageListVO.setNickname(fsUserPageListVO.getPhone());
+//                }
+//                if(StringUtils.isNotEmpty(fsUserPageListVO.getTag()) && fsUserPageListVO.getIsRepeatFans() == 0){
+//                    StringBuilder newTag = removeRepeatFansTag(fsUserPageListVO);
+//                    fsUserPageListVO.setTag(newTag.toString());
+//                }
+//            }
+//            return new PageInfo<>(fsUserPageListVOS);
+//        } else {
+//            return new PageInfo<>(fsUserPageListVOS);
+//        }
     }
 
     private static StringBuilder removeRepeatFansTag(FsUserPageListVO fsUserPageListVO) {

fs-service-system/src/main/resources/mapper/store/FsUserMapper.xml

@@ -644,7 +644,7 @@
             fs_user
                 LEFT JOIN fs_user_company_user ON fs_user_company_user.user_id = fs_user.user_id
                 LEFT JOIN company_user ON company_user.user_id = fs_user_company_user.company_user_id
-        WHERE fs_user.is_del = 0 and fs_user_company_user.is_repeat_fans is not null
+        WHERE fs_user.is_del = 0
         <if test="userId != null and userId != 0 ">
             and (fs_user.company_user_id = #{userId} OR company_user.parent_id = #{userId} )
         </if>

fs-user-app/src/main/java/com/fs/app/controller/WxCompanyUserController.java

@@ -133,11 +133,11 @@ public class WxCompanyUserController extends AppBaseController {
                     if (user.getCompanyUserId() != null && !param.getCompanyUserId().equals(user.getCompanyUserId())){
                         return R.error(406, "该用户已成为其他销售会员");
                     }
-                    if((companyUser.getIsAllowedAllRegister() == null || companyUser.getIsAllowedAllRegister() == 1)
-                            && companyUser.getIsNeedRegisterMember() != null && companyUser.getIsNeedRegisterMember() != 1){
-                        userMap.setCompanyId(param.getCompanyId());
-                        userMap.setCompanyUserId(param.getCompanyUserId());
-                    }
+//                    if((companyUser.getIsAllowedAllRegister() == null || companyUser.getIsAllowedAllRegister() == 1)
+//                            && companyUser.getIsNeedRegisterMember() != null && companyUser.getIsNeedRegisterMember() != 1){
+//                        userMap.setCompanyId(param.getCompanyId());
+//                        userMap.setCompanyUserId(param.getCompanyUserId());
+//                    }
                     userService.updateFsUser(userMap);
                 } else {
                     //新增