Merge branch 'feat-1002250' into 'master'

1002250特殊出版社配置小号

See merge request rays/pcloud-book!319

pcloud-service-book/src/main/java/com/pcloud/book/group/biz/impl/BookGroupBizImpl.java

@@ -1460,24 +1460,6 @@ public class BookGroupBizImpl implements BookGroupBiz {
         TempletRelevance templetRelevance = templetRelevanceDao.getByTempletId(templetId);
         LOGGER.info("根据分类id获取大类templetRelevance" + templetRelevance.toString());
         Integer largeTemplet = templetRelevance.getLargeTemplet();
-        List<Long> labelIds = new ArrayList<>();
-        if (null != bookGroupDTO.getProLabelId()) {
-            labelIds.add(bookGroupDTO.getProLabelId());
-        }
-        if (null != bookGroupDTO.getDepLabelId()) {
-            labelIds.add(bookGroupDTO.getDepLabelId());
-        }
-        if (!ListUtils.isEmpty(labelIds)) {
-            Map<Long, String> labelMap = ResponseHandleUtil.parseMap(labelService.getLabelName(labelIds), Long.class, String.class);
-            if (!MapUtils.isEmpty(labelMap)) {
-                if (null != bookGroupDTO.getProLabelId() && labelMap.containsKey(bookGroupDTO.getProLabelId())) {
-                    bookGroupDTO.setProLabelName(labelMap.get(bookGroupDTO.getProLabelId()));
-                }
-                if (null != bookGroupDTO.getDepLabelId() && labelMap.containsKey(bookGroupDTO.getDepLabelId())) {
-                    bookGroupDTO.setDepLabelName(labelMap.get(bookGroupDTO.getDepLabelId()));
-                }
-            }
-        }
         Long agentId=bookGroupDTO.getAgentId();
         //根据bookGroupId获取机器人
         AvailableRobotParamDTO availableRobotParamDTO=new AvailableRobotParamDTO();
@@ -1485,13 +1467,40 @@ public class BookGroupBizImpl implements BookGroupBiz {
         availableRobotParamDTO.setBookGroupId(bookGroupId);
         availableRobotParamDTO.setWechatUserId(wechatUserId);
         availableRobotParamDTO.setLargeTemplet(largeTemplet);
-        availableRobotParamDTO.setGrade(bookGroupDTO.getDepLabelName());
-        availableRobotParamDTO.setSubject(bookGroupDTO.getProLabelName());
         availableRobotParamDTO.setSpecialAgent(bookGroupDTO.getBelongSpecialAgent());
         if (JoinGroupTypeEnum.ROBOT.getCode().equals(bookGroupDTO.getJoinGroupType())){
+            List<Long> labelIds = new ArrayList<>();
+            if (null != bookGroupDTO.getProLabelId()) {
+                labelIds.add(bookGroupDTO.getProLabelId());
+            }
+            if (null != bookGroupDTO.getDepLabelId()) {
+                labelIds.add(bookGroupDTO.getDepLabelId());
+            }
+            if (!ListUtils.isEmpty(labelIds)) {
+                Map<Long, String> labelMap = ResponseHandleUtil.parseMap(labelService.getLabelName(labelIds), Long.class, String.class);
+                if (!MapUtils.isEmpty(labelMap)) {
+                    if (null != bookGroupDTO.getProLabelId() && labelMap.containsKey(bookGroupDTO.getProLabelId())) {
+                        availableRobotParamDTO.setSubject(labelMap.get(bookGroupDTO.getProLabelId()));
+                    }
+                    if (null != bookGroupDTO.getDepLabelId() && labelMap.containsKey(bookGroupDTO.getDepLabelId())) {
+                        availableRobotParamDTO.setGrade(labelMap.get(bookGroupDTO.getDepLabelId()));
+                    }
+                }
+            }
             availableRobotParamDTO.setRobotType(SelfRobotTypeEnum.version_origin.getCode());
         }
         if (JoinGroupTypeEnum.AI_ROBOT.getCode().equals(bookGroupDTO.getJoinGroupType())){
+            Long subLabelId = bookDto.getSubLabelId();
+            Long graLabelId = bookDto.getGraLabelId();
+            if (subLabelId!=null&&graLabelId!=null){
+                Map<Long, BookLabel> bookLabelMap = bookLabelDao.getMapByIds(Arrays.asList(subLabelId, graLabelId));
+                if (bookLabelMap.get(graLabelId)!=null){
+                    availableRobotParamDTO.setGrade(bookLabelMap.get(graLabelId).getName());
+                }
+                if (bookLabelMap.get(subLabelId)!=null){
+                    availableRobotParamDTO.setSubject(bookLabelMap.get(subLabelId).getName());
+                }
+            }
             availableRobotParamDTO.setRobotType(SelfRobotTypeEnum.version1.getCode());
         }
         SelfRobotDTO selfRobotDTO = wechatGroupConsr.getAvailableRobotByBookGroup(availableRobotParamDTO);