fix: 宠粉

fs-service-system/src/main/java/com/fs/qw/cache/IQwExternalContactCacheService.java

@@ -8,4 +8,12 @@ public interface IQwExternalContactCacheService {
      * @return 企业微信客户
      */
     String selectQwExternalContactById(Long id);
+
+    /**
+     * 查询是否宠粉
+     *
+     * @param id 企业微信客户主键
+     * @return 企业微信客户
+     */
+    Integer selectQwIsRepeat(Long id);
 }

fs-service-system/src/main/java/com/fs/qw/cache/impl/QwExternalContactCacheServiceImpl.java

@@ -23,6 +23,11 @@ public class QwExternalContactCacheServiceImpl implements IQwExternalContactCach
             .expireAfterWrite(12, TimeUnit.HOURS)
             .build();
 
+    private static final Cache<Long,Integer> QW_REPEAT_CACHE = Caffeine.newBuilder()
+            .maximumSize(5000)
+            .expireAfterWrite(3, TimeUnit.MINUTES)
+            .build();
+
 
     @Override
     public String selectQwExternalContactById(Long id) {
@@ -34,4 +39,11 @@ public class QwExternalContactCacheServiceImpl implements IQwExternalContactCach
             return "-";
         });
     }
+
+    @Override
+    public Integer selectQwIsRepeat(Long id) {
+        return QW_REPEAT_CACHE.get(id,e->{
+            return qwExternalContactService.selectQwIsRepeat(id);
+        });
+    }
 }

fs-service-system/src/main/java/com/fs/qw/mapper/QwExternalContactMapper.java

@@ -374,4 +374,12 @@ public interface QwExternalContactMapper extends BaseMapper<QwExternalContact> {
     int batchUpdateContactByIds(@Param("list") List<Map<Long, Integer>> list);
 
     List<QwExternalContactVOTime> selectQwExternalContactListVOByUserIds(@Param("ids") List<String> ids);
+
+    /**
+     * 查询外部联系人是否宠粉
+     * @param id
+     * @return
+     */
+    @Select("select is_repeat from qw_external_contact where user_id=${userId} limit 1")
+    Integer selectQwIsRepeat(@Param("userId") Long id);
 }

fs-service-system/src/main/java/com/fs/qw/service/IQwExternalContactService.java

@@ -198,4 +198,11 @@ public interface IQwExternalContactService extends IService<QwExternalContact> {
     Boolean disabledUser(String[] ids, boolean status);
 
     List<QwExternalContactVOTime> selectQwExternalContactListVOByUserIds(List<String> externalIdList);
+
+    /**
+     * 查询企微是否宠粉
+     * @param id
+     * @return
+     */
+    Integer selectQwIsRepeat(Long id);
 }

fs-service-system/src/main/java/com/fs/qw/service/impl/QwExternalContactServiceImpl.java

@@ -4499,6 +4499,11 @@ public class QwExternalContactServiceImpl extends ServiceImpl<QwExternalContactM
         return qwExternalContactMapper.selectQwExternalContactListVOByUserIds(ids);
     }
 
+    @Override
+    public Integer selectQwIsRepeat(Long id) {
+        return qwExternalContactMapper.selectQwIsRepeat(id);
+    }
+
     //发送好友欢迎语
     void SyncAddSendWelcome(QwExternalContact qwExternalContact, QwUser qwUser, String corpId) {
         QwFriendWelcomeVO qwFriendWelcomeVO = qwFriendWelcomeMapper.selectQwFriendWelcomeByUserIdVO(qwUser.getId(), corpId);

fs-service-system/src/main/java/com/fs/store/param/h5/FsUserPageListParam.java

@@ -73,5 +73,7 @@ public class FsUserPageListParam implements Serializable {
     private Long pcLoginUserId;
 
 
+
+
 }
 

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

@@ -26,6 +26,7 @@ import com.fs.course.vo.newfs.FsCourseAnalysisCountVO;
 import com.fs.course.vo.newfs.FsCourseAnalysisVO;
 import com.fs.course.vo.newfs.FsUserCourseVideoPageListVO;
 import com.fs.his.vo.OptionsVO;
+import com.fs.qw.cache.IQwExternalContactCacheService;
 import com.fs.qw.param.QwFsUserParam;
 import com.fs.qw.vo.QwFsUserVO;
 import com.fs.store.domain.*;
@@ -108,6 +109,9 @@ public class FsUserServiceImpl implements IFsUserService
 
     @Autowired
     private ICompanyTagCacheService companyTagCacheService;
+
+    @Autowired
+    private IQwExternalContactCacheService qwExternalContactCacheService;
     /**
      * 查询用户
      *
@@ -492,6 +496,12 @@ public class FsUserServiceImpl implements IFsUserService
                     item.setTagIds(userTagByUserId);
                     item.setTag(String.join(",",tagNames));
                 }
+
+                // 是否宠粉
+                Integer isRepeat = qwExternalContactCacheService.selectQwIsRepeat(item.getUserId());
+                if(isRepeat != null) {
+                    item.setIsRepeat(isRepeat);
+                }
             }
         }
 

fs-service-system/src/main/java/com/fs/store/vo/h5/FsUserPageListVO.java

@@ -80,4 +80,8 @@ public class FsUserPageListVO {
     @ApiModelProperty(value = "是否属于当前销售")
     private int isCurrentCompanyUser;
 
+    /**
+     * 是否宠粉
+     */
+    private Integer isRepeat;
 }