Merge branch 'feature/1004824' into 'master'

feat: [1004824] RAYS码扫码后客户端支持展示二维码名称

See merge request rays/pcloud-book!1308

pcloud-service-book/src/main/java/com/pcloud/book/consumer/channel/QrcodeSceneConsr.java

@@ -585,4 +585,16 @@ public class QrcodeSceneConsr {
 		}
 		return new ArrayList<>();
 	}
+
+	public Integer getPushTextOpenStatus(Long adviserId) {
+		if (null == adviserId) {
+			return 0;
+		}
+		try {
+			return ResponseHandleUtil.parseResponse(qrcodeSceneService.getPushTextOpenStatus(adviserId), Integer.class);
+		} catch (Exception e) {
+			LOGGER.error("调用getPushTextOpenStatus失败"+e.getMessage(), e);
+		}
+		return 0;
+	}
 }

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

@@ -1018,6 +1018,9 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
             ResourcePageCollect collect = resourcePageCollectDao.getCollectRecordByUser(wechatUserId, resourcePageVO.getId());
             resourcePageVO.setCollectState(null == collect ? 0 : 1);
         }
+        if (null != resourcePageVO.getAdviserId()) {
+            resourcePageVO.setPushTextOpenStatus(qrcodeSceneConsr.getPushTextOpenStatus(resourcePageVO.getAdviserId()));
+        }
         return resourcePageVO;
     }
 
@@ -1030,6 +1033,7 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
             resourcePageVO.setBookId(bookGroupDTO.getBookId());
             resourcePageVO.setAdviserId(bookGroupDTO.getCreateUser());
             resourcePageVO.setChannelId(bookGroupDTO.getChannelId());
+            resourcePageVO.setQrcodeName(bookGroupDTO.getGroupQrcodeName());
             resourcePageVO.setAgentName(agentConsr.getNameById(bookGroupDTO.getAgentId()));
             BookDto bookDto = bookBiz.getBaseById(bookGroupDTO.getBookId());
             if (null != bookDto) {
@@ -1066,6 +1070,7 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
             resourcePageVO.setChannelId(qrcodeSceneDto.getChannelPartyId());
             resourcePageVO.setBookImg(qrcodeSceneDto.getBook().getCoverImg());
             resourcePageVO.setBookName(qrcodeSceneDto.getBook().getBookName());
+            resourcePageVO.setQrcodeName(qrcodeSceneDto.getSceneName());
             Long adviserId = qrcodeSceneDto.getCreatedByUserLogin();
             Map<Long, AdviserBaseInfoDto> agentMap = adviserConsr.getAdviserId2AdviserInfoDtoMap(Arrays.asList(adviserId));
             if (!MapUtils.isEmpty(agentMap)) {

pcloud-service-book/src/main/java/com/pcloud/book/group/vo/ResourcePageVO.java

@@ -70,4 +70,12 @@ public class ResourcePageVO extends BaseDto {
      * 自定义配置的图书封面
      */
     private String bookCover;
+    /**
+     * 二维码名称
+     */
+    private String qrcodeName;
+    /**
+     * 扫码推送二维码名称权限状态
+     */
+    private Integer pushTextOpenStatus;
 }
\ No newline at end of file