Merge branch 'feature/1021' into 'master'

feat:[1005781]慢接口

See merge request rays/pcloud-book!1441

pcloud-service-book/src/main/java/com/pcloud/book/consumer/user/AgentConsr.java

@@ -101,6 +101,9 @@ public class AgentConsr {
     @ParamLog("getNameById")
     public String getNameById(Long agentId){
     	String name="";
+		if (null == agentId) {
+			return name;
+		}
     	try {
     		name = ResponseHandleUtil.parseResponse(agentService.getNameById(agentId),String.class);
 		}catch (Exception e){

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

@@ -1607,9 +1607,7 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
                 resourcePageVO.setBookName(bookDto.getBookName());
             }
         }
-        //上次阅读时间
-        String lastTime = wechatGroupConsr.getUserLastTime(bookGroupId, wechatUserId);
-        resourcePageVO.setLastReadTime(StringUtil.isEmpty(lastTime) ? DateUtils.formatDate(new Date()) : lastTime);
+        resourcePageVO.setLastReadTime(DateUtils.formatDate(new Date()));
         //小程序
         BookAppletScene bookAppletScene = bookAppletSceneDao.getByBookGroupId(bookGroupId);
         resourcePageVO.setAppletId(null == bookAppletScene ? null : bookAppletScene.getAppletId());
@@ -1635,22 +1633,28 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
     private ResourcePageVO getResourcePageBySceneId4Wechat(Long sceneId) {
         ResourcePageVO resourcePageVO = new ResourcePageVO();
         resourcePageVO.setSceneId(sceneId);
-        QrcodeSceneDto qrcodeSceneDto = qrcodeSceneConsr.getById(sceneId);
-        if (null != qrcodeSceneDto) {
-            resourcePageVO.setBookId(qrcodeSceneDto.getAdviserBookId());
-            resourcePageVO.setAdviserId(qrcodeSceneDto.getCreatedByUserLogin());
-            resourcePageVO.setChannelId(qrcodeSceneDto.getChannelPartyId());
-            if (qrcodeSceneDto.getBook() != null) {
-                resourcePageVO.setBookName(qrcodeSceneDto.getBook().getBookName());
-                resourcePageVO.setBookImg(qrcodeSceneDto.getBook().getCoverImg());
-            }
-            resourcePageVO.setQrcodeName(qrcodeSceneDto.getSceneName());
+        Map<Long, QrcodeSceneDto> qrcodeSceneDtoMap = qrcodeSceneConsr.listBaseInfoByIds(Arrays.asList(sceneId));
+        if (!MapUtils.isEmpty(qrcodeSceneDtoMap) && qrcodeSceneDtoMap.containsKey(sceneId)) {
+            QrcodeSceneDto qrcodeSceneDto = qrcodeSceneDtoMap.get(sceneId);
+            Long bookId = qrcodeSceneDto.getAdviserBookId();
             Long adviserId = qrcodeSceneDto.getCreatedByUserLogin();
+            Long channelId = qrcodeSceneDto.getChannelPartyId();
+            resourcePageVO.setBookId(bookId);
+            resourcePageVO.setAdviserId(adviserId);
+            resourcePageVO.setChannelId(channelId);
+            resourcePageVO.setQrcodeName(qrcodeSceneDto.getSceneName());
+            if (null != bookId) {
+                BookDto bookDto = bookBiz.getBaseById(bookId);
+                if (null != bookDto) {
+                    resourcePageVO.setBookImg(bookDto.getCoverImg());
+                    resourcePageVO.setBookName(bookDto.getBookName());
+                }
+            }
             Map<Long, AdviserBaseInfoDto> agentMap = adviserConsr.getAdviserId2AdviserInfoDtoMap(Arrays.asList(adviserId));
             if (!MapUtils.isEmpty(agentMap)) {
                 resourcePageVO.setAgentName(Optional.ofNullable(agentMap.get(adviserId)).orElseGet(AdviserBaseInfoDto::new).getAgentName());
             }
-            AccountSettingDto accountSettingDto = qrcodeSceneConsr.getWechatInfo(qrcodeSceneDto.getChannelPartyId());
+            AccountSettingDto accountSettingDto = qrcodeSceneConsr.getWechatInfo(channelId);
             if(accountSettingDto != null){
                 resourcePageVO.setAccountSettingId(accountSettingDto.getAccountSettingId());
             }
@@ -1673,7 +1677,6 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
             resourcePageVO.setFontColor(resourcePage.getFontColor());
             resourcePageVO.setWatermark(resourcePage.getWatermark());
             resourcePageVO.setWatermarkStyle(resourcePage.getWatermarkStyle());
-
         }
         return resourcePageVO;
     }