feat：去除非重粉会员的重粉标签显示

fs-admin/src/main/java/com/fs/store/controller/FsUserController.java

@@ -14,12 +14,16 @@ import com.fs.store.param.h5.FsUserPageListParam;
 import com.fs.store.service.IFsUserService;
 import com.fs.store.vo.FSUserVO;
 import com.fs.store.vo.h5.FsUserPageListVO;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 用户Controller
@@ -153,10 +157,14 @@ public class FsUserController extends BaseController
     @PreAuthorize("@ss.hasPermi('store:user:darkRoomList')")
     @GetMapping("/darkRoomList")
     @ApiOperation("小黑屋")
-    public TableDataInfo darkRoomList(FsUserPageListParam param) {
-        startPage();
-        List<FsUserPageListVO> list = fsUserService.selectFsUserPageList(param);
-        return getDataTable(list);
+    public R darkRoomList(FsUserPageListParam param) {
+//        startPage();
+        PageHelper.startPage(param.getPageNum(), param.getPageSize());
+        PageInfo<FsUserPageListVO> fsUserPageListVOPageInfo = fsUserService.selectFsUserPageList(param);
+        Map<String, Object> map = new HashMap<String, Object>();
+        map.put("rows", fsUserPageListVOPageInfo.getList());
+        map.put("total", fsUserPageListVOPageInfo.getList().size());
+        return R.ok(map);
     }
 
     @PreAuthorize("@ss.hasPermi('store:user:enabledUsers')")

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

@@ -478,21 +478,34 @@ public class FsUserServiceImpl implements IFsUserService
             List<FsUserCompanyUser> repeatCompanyUserNames = fsUserCompanyUserMapper.selectRepeatCompanyUserName(userIds);
             Map<Long, String> map = repeatCompanyUserNames.stream().collect(Collectors.toMap(FsUserCompanyUser::getUserId, FsUserCompanyUser::getRepeatCompanyUserName));
 
-            fsUserPageListVOS.stream().map(v -> {
-                FsUserPageListVO fsUserPageListVO = new FsUserPageListVO();
-                BeanUtils.copyProperties(v, fsUserPageListVO);
-                fsUserPageListVO.setRepeatCompanyUserName(map.get(v.getUserId()));
-                if ("微信用户".equals(v.getNickname()) && StringUtils.isNotEmpty(v.getPhone())) {
-                    fsUserPageListVO.setNickname(v.getPhone());
+            for (FsUserPageListVO fsUserPageListVO : fsUserPageListVOS) {
+                fsUserPageListVO.setRepeatCompanyUserName(map.get(fsUserPageListVO.getUserId()));
+                if ("微信用户".equals(fsUserPageListVO.getNickname()) && StringUtils.isNotEmpty(fsUserPageListVO.getPhone())) {
+                    fsUserPageListVO.setNickname(fsUserPageListVO.getPhone());
                 }
-                return fsUserPageListVO;
-            }).collect(Collectors.toList());
+                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) {
+        String tag = fsUserPageListVO.getTag();
+        String[] splitTag = tag.split(",");
+        StringBuilder newTag = new StringBuilder();
+        for (String s : splitTag) {
+            if(!"重粉".equals(s)){
+                newTag.append(s);
+            }
+        }
+        return newTag;
+    }
+
     @Override
     public TableDataInfo selectFsUserPageListNew(FsUserPageListParam param) {
         // 找出下级销售