Merge branch 'fixbug/fixThirdNum' into 'master'

bug: [none]  fixThirdNum

See merge request rays/pcloud-book!963

pcloud-service-book/src/main/java/com/pcloud/book/applet/biz/impl/AppletGroupSearchRecordBizImpl.java

@@ -33,6 +33,7 @@ import com.pcloud.book.rightsSetting.entity.BaseTempletClassify;
 import com.pcloud.book.skill.biz.PcloudGroupActivityBiz;
 import com.pcloud.book.skill.dao.PcloudGroupActivityDao;
 import com.pcloud.book.skill.dto.GroupActivity4AppletDTO;
+import com.pcloud.book.util.common.YesOrNoEnums;
 import com.pcloud.common.core.aspect.ParamLog;
 import com.pcloud.common.exceptions.BizException;
 import com.pcloud.common.page.PageBeanNew;
@@ -283,11 +284,16 @@ public class AppletGroupSearchRecordBizImpl implements AppletGroupSearchRecordBi
                     groupActivity4AppletDTO.setStatus(1);
                 }
             }
-            //头像列表从缓存里取
-            List<String> headUrlList = this.getHeadUrlList(groupActivity4AppletDTO.getUserNumber(), groupActivity4AppletDTO.getBookGroupQrcodeId());
-            groupActivity4AppletDTO.setHeadUrlList(headUrlList);
-            List<AppletGroupStatementDTO> statementDTOS = this.getStatementList(groupActivity4AppletDTO.getUserNumber(), headUrlList, groupActivity4AppletDTO.getBookGroupQrcodeId());
-            groupActivity4AppletDTO.setStatementDTOList(statementDTOS);
+            if(null != groupActivity4AppletDTO.getGroupType() && groupActivity4AppletDTO.getGroupType().intValue() == YesOrNoEnums.YES.getValue()){
+                //第三方群自主填充
+                rightsSettingBiz.fillThirdGroupHeadList(groupActivity4AppletDTO);
+            } else {
+                //头像列表从缓存里取
+                List<String> headUrlList = this.getHeadUrlList(groupActivity4AppletDTO.getUserNumber(), groupActivity4AppletDTO.getBookGroupQrcodeId());
+                groupActivity4AppletDTO.setHeadUrlList(headUrlList);
+                List<AppletGroupStatementDTO> statementDTOS = this.getStatementList(groupActivity4AppletDTO.getUserNumber(), headUrlList, groupActivity4AppletDTO.getBookGroupQrcodeId());
+                groupActivity4AppletDTO.setStatementDTOList(statementDTOS);
+            }
         }
         return tishBookSchoolList;
     }

pcloud-service-book/src/main/java/com/pcloud/book/skill/biz/impl/PcloudGroupActivityBizImpl.java

 package com.pcloud.book.skill.biz.impl;
 
+import cn.hutool.core.util.RandomUtil;
 import com.alibaba.fastjson.JSON;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
@@ -54,6 +55,7 @@ import com.pcloud.book.skill.facade.request.UpdateGroupActivityRequestVO;
 import com.pcloud.book.skill.facade.response.ListGroupActivityResponseVO;
 import com.pcloud.book.skill.facade.response.QueryGroupActivityResponseVO;
 import com.pcloud.book.util.common.YesOrNoEnums;
+import com.pcloud.common.constant.CacheConstant;
 import com.pcloud.common.core.aspect.ParamLog;
 import com.pcloud.common.exceptions.BizException;
 import com.pcloud.common.page.PageBeanNew;
@@ -61,6 +63,7 @@ import com.pcloud.common.page.PageParam;
 import com.pcloud.common.utils.ListUtils;
 import com.pcloud.common.utils.NumberUtil;
 import com.pcloud.common.utils.QrcodeUtils;
+import com.pcloud.common.utils.cache.redis.JedisClusterUtils;
 import com.pcloud.common.utils.httpclient.UrlUtils;
 import com.pcloud.common.utils.string.StringUtil;
 import com.pcloud.common.utils.string.StringUtilParent;
@@ -616,16 +619,32 @@ public class PcloudGroupActivityBizImpl implements PcloudGroupActivityBiz {
                     activity4AppletDTO.setStatementDTOList(statementDTOS);
                 }
             }else{
-                //头像、对话
-                List<String> headUrlList = appletGroupSearchRecordBiz
-                        .getHeadUrlList(3, 3L);
-                activity4AppletDTO.setHeadUrlList(headUrlList);
+               fillThirdGroupHeadList(activity4AppletDTO);
             }
 
         }
         return list;
     }
 
+    private void fillThirdGroupHeadList(AppletGroupManageDTO activity4AppletDTO) {
+        //头像列表从缓存里取
+        String key = CacheConstant.BOOK + "THIRD_GROUP:" + activity4AppletDTO.getGroupActivityId();
+        Integer userNum;
+        if (StringUtil.isEmpty(JedisClusterUtils.get(key))) {
+            userNum = RandomUtil.randomInt(10, 30);
+            JedisClusterUtils.set(key, userNum.toString(), 3600);
+        } else {
+            userNum = Integer.valueOf(JedisClusterUtils.get(key));
+        }
+        List<String> headUrlList = appletGroupSearchRecordBiz
+                .getHeadUrlList(userNum, 3L);
+        activity4AppletDTO.setHeadUrlList(headUrlList);
+        List<AppletGroupStatementDTO> statementDTOS = appletGroupSearchRecordBiz
+                .getStatementList(userNum, headUrlList, activity4AppletDTO.getId());
+        activity4AppletDTO.setStatementDTOList(statementDTOS);
+        activity4AppletDTO.setUserNumber(userNum);
+    }
+
     @Override
     public List<GroupActivity4AppletDTO> getTishBookSchoolListWrap(BaseTempletClassify baseTempletClassify, Integer limit) {
         List<GroupActivity4AppletDTO> list = pcloudGroupActivityDao.getTishBookSchoolList(baseTempletClassify, limit);