Merge branch 'feature/110' into 'master'

Feature/110

See merge request rays/pcloud-book!1524

pcloud-service-book/src/main/java/com/pcloud/book/consumer/app/AssistTempletConsr.java

@@ -72,6 +72,14 @@ public class AssistTempletConsr {
 		}
 		return ids;
 	}
+	public Map<Long,String> mapNameByIds(List<Long>idList){
+		Map<Long, String> assistTempletDTOs = new HashMap<>();
+		if (ListUtils.isEmpty(idList)) {
+			return assistTempletDTOs;
+		}
+		return ResponseHandleUtil.parseMapResponse(assistTempletService.mapNamesById(idList),
+				Long.class, String.class);
+	}
 
 
 

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

@@ -5657,27 +5657,27 @@ public class BookGroupBizImpl implements BookGroupBiz {
                 if(adviserDto.getThirdTempletId()!=null) {
                     idList.add(adviserDto.getThirdTempletId());
                 }
-                Map<Long, AssistTempletDTO> longAssistTempletDTOMap = assistTempletConsr.mapByIds(idList);
+                Map<Long, String> longAssistTempletDTOMap = assistTempletConsr.mapNameByIds(idList);
 
                 if(adviserDto.getTempletId()!=null) {
-                    AssistTempletDTO first = longAssistTempletDTOMap.get(adviserDto.getTempletId());
-                    if(first!=null && first.getTempletName()!=null){
+                    String first = longAssistTempletDTOMap.get(adviserDto.getTempletId());
+                    if(first!=null ){
                         map.put("templetId", adviserDto.getTempletId());
-                        map.put("templateName", first.getTempletName());
+                        map.put("templateName", first);
                     }
                 }
                 if(adviserDto.getSecondTempletId()!=null) {
-                    AssistTempletDTO second = longAssistTempletDTOMap.get(adviserDto.getSecondTempletId());
-                    if(second!=null && second.getTempletName()!=null){
+                    String second = longAssistTempletDTOMap.get(adviserDto.getSecondTempletId());
+                    if(second!=null){
                         map.put("secondTempletId", adviserDto.getSecondTempletId());
-                        map.put("secondTempletName", second.getTempletName());
+                        map.put("secondTempletName", second);
                     }
                 }
                 if(adviserDto.getThirdTempletId()!=null) {
-                    AssistTempletDTO third = longAssistTempletDTOMap.get(adviserDto.getThirdTempletId());
-                    if(third!=null && third.getTempletName()!=null){
+                    String third = longAssistTempletDTOMap.get(adviserDto.getThirdTempletId());
+                    if(third!=null){
                         map.put("thirdTempletId", adviserDto.getThirdTempletId());
-                        map.put("thirdTempletName", third.getTempletName());
+                        map.put("thirdTempletName", third);
                     }
                 }