1005260小睿H5关注公众号弹窗

pcloud-facade-book/src/main/java/com/pcloud/book/group/dto/ResourcePageDTO.java

+package com.pcloud.book.group.dto;
+
+import com.pcloud.common.dto.BaseDto;
+
+import lombok.Data;
+
+/**
+ * @ClassName com.pcloud.book.group.dto.ResourcePageDTO
+ * @Author zhuyajie
+ * @Description 资源页信息
+ * @Date 2021/8/30 11:04
+ * @Version 1.0
+ **/
+@Data
+public class ResourcePageDTO extends BaseDto {
+    /**
+     * rays码id
+     */
+    private Long bookGroupId;
+    /**
+     * 风格类型（1默认2艺术3插画）
+     */
+    private Integer style;
+    /**
+     * 是否显示图书信息
+     */
+    private Integer showBook;
+    /**
+     * 是否开启小睿流程
+     */
+    private Integer openRays;
+    /**
+     * 是否开启世间食记
+     */
+    private Integer openFood;
+    /**
+     * 创建人
+     */
+    private Long createUser;
+    /**
+     * 预览二维码
+     */
+    private String qrcodeUrl;
+    /**
+     * 二维码id
+     */
+    private Long sceneId;
+    /**
+     * 公众号二维码id
+     */
+    private Long officialSceneId;
+    /**
+     * 自定义配置的图书封面
+     */
+    private String bookCover;
+
+    /**
+     * 书刊id
+     */
+    private Long bookId;
+    /**
+     * 渠道id
+     */
+    private Long channelId;
+    /**
+     * 背景图
+     */
+    private String backgroundImg;
+    /**
+     * 二维码图片解析后的地址
+     */
+    private String url;
+}

pcloud-facade-book/src/main/java/com/pcloud/book/group/service/BookGroupService.java

@@ -19,6 +19,7 @@ import com.pcloud.book.group.dto.MapBookGroupServeCountDTO;
 import com.pcloud.book.group.dto.PersonalQrcodeDTO;
 import com.pcloud.book.group.dto.QueryByBookAdviserDTO;
 import com.pcloud.book.group.dto.ResourceBrowseParamDto;
+import com.pcloud.book.group.dto.ResourcePageDTO;
 import com.pcloud.book.group.dto.SelfRobotBookGroupDTO;
 import com.pcloud.book.group.dto.SelfRobotUserDTO;
 import com.pcloud.book.group.dto.SelfRobtParamDTO;
@@ -282,4 +283,8 @@ public interface BookGroupService {
     @GetMapping("isOpenRaysScene")
     ResponseEntity<ResponseDto<Boolean>> isOpenRaysScene(@RequestParam(value = "sceneId", required = false) Long sceneId,
                                                                 @RequestParam(value = "bookGroupId", required = false) Long bookGroupId);
+
+    @ApiOperation("查资源页信息")
+    @GetMapping("getResourcePageById")
+    ResponseEntity<ResponseDto<ResourcePageDTO>> getResourcePageById(@RequestParam("resourcePageId") Long resourcePageId);
 }

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

@@ -625,15 +625,12 @@ public class QrcodeSceneConsr {
 		return accountSetting;
 	}
 
-	public String createTempQrcode4H5(Long accountSettingId, Long wechatUserId) {
-		LOGGER.info("H5创建公众号临时二维码,accountSettingId={},wechatUserId={}",accountSettingId, wechatUserId);
+	public String createTempQrcode4H5(QrcodeTemp qrcodeTemp) {
+		LOGGER.info("H5创建公众号临时二维码,qrcodeTemp={}",qrcodeTemp.toString());
 		String qrcode = "";
-		if (null == accountSettingId || null == wechatUserId) {
+		if (null == qrcodeTemp) {
 			return qrcode;
 		}
-		QrcodeTemp qrcodeTemp = new QrcodeTemp();
-		qrcodeTemp.setAccountSettingId(accountSettingId);
-		qrcodeTemp.setCreatedUser(wechatUserId);
 		try {
 			qrcode = ResponseHandleUtil.parseResponse(qrcodeTempService.createTempQrcode4H5(qrcodeTemp), String.class);
 		} catch (Exception e) {

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

@@ -6,6 +6,7 @@ import com.pcloud.book.group.dto.BookGroupServeCountDTO;
 import com.pcloud.book.group.dto.BookGroupServeDTO;
 import com.pcloud.book.group.dto.BookServeDTO;
 import com.pcloud.book.group.dto.ResourcePageCourseDTO;
+import com.pcloud.book.group.dto.ResourcePageDTO;
 import com.pcloud.book.group.entity.BookGroupServe;
 import com.pcloud.book.group.entity.ResourcePage;
 import com.pcloud.book.group.entity.ResourcePageCollect;
@@ -409,4 +410,12 @@ public interface ResourcePageBiz {
      *  * @param null
      */
     ResourcePageItemVO getPopupQrcode4Wechat(Long resourcePageId, Long wechatUserId);
+
+    /**
+     * 查资源页信息
+     * @author：zhuyajie
+     * @date：2021/8/30 11:08
+     *  * @param null
+     */
+    ResourcePageDTO getResourcePageById(Long resourcePageId);
 }

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

@@ -51,6 +51,7 @@ import com.pcloud.book.group.dto.BookGroupServeCountDTO;
 import com.pcloud.book.group.dto.BookGroupServeDTO;
 import com.pcloud.book.group.dto.BookServeDTO;
 import com.pcloud.book.group.dto.ResourcePageCourseDTO;
+import com.pcloud.book.group.dto.ResourcePageDTO;
 import com.pcloud.book.group.dto.ResourcePageUrlDTO;
 import com.pcloud.book.group.entity.BookAppletScene;
 import com.pcloud.book.group.entity.BookGroup;
@@ -78,6 +79,7 @@ import com.pcloud.channelcenter.qrcode.dto.BookSceneIdListDTO;
 import com.pcloud.channelcenter.qrcode.dto.GroupQrcodeVO;
 import com.pcloud.channelcenter.qrcode.dto.OwnMessageDTO;
 import com.pcloud.channelcenter.qrcode.dto.QrcodeSceneDto;
+import com.pcloud.channelcenter.qrcode.entity.QrcodeTemp;
 import com.pcloud.channelcenter.wechat.dto.AccountSettingDto;
 import com.pcloud.channelcenter.wechat.entity.AccountSetting;
 import com.pcloud.channelcenter.wechat.entity.Message;
@@ -2153,7 +2155,11 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
         if (null == accountSettingId) {
             accountSettingId = BookProps.getOperateOfficalId();
         }
-        String qrcodeUrl = qrcodeSceneConsr.createTempQrcode4H5(accountSettingId, wechatUserId);
+        QrcodeTemp qrcodeTemp = new QrcodeTemp();
+        qrcodeTemp.setAccountSettingId(accountSettingId);
+        qrcodeTemp.setCreatedUser(wechatUserId);
+//        qrcodeTemp.setPageId(resourcePageId);
+        String qrcodeUrl = qrcodeSceneConsr.createTempQrcode4H5(qrcodeTemp);
         if (!StringUtil.isEmpty(qrcodeUrl) && !StringUtil.isEmpty(logoUrl)) {
             //添加Logo
             String url = "";
@@ -2179,4 +2185,21 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
         return pageItemVO;
     }
 
+    @Override
+    public ResourcePageDTO getResourcePageById(Long resourcePageId) {
+        ResourcePageDTO resourcePageDTO = new ResourcePageDTO();
+        ResourcePage resourcePage = resourcePageDao.getById(resourcePageId);
+        if (null != resourcePage){
+            BeanUtils.copyProperties(resourcePage, resourcePageDTO);
+            if (null != resourcePage.getSceneId()) {
+                QrcodeSceneDto qrcodeSceneDto = qrcodeSceneConsr.getById(resourcePage.getSceneId());
+                resourcePageDTO.setUrl(null == qrcodeSceneDto?null:qrcodeSceneDto.getUrl());
+            } else if (null != resourcePage.getBookGroupId()) {
+                BookGroupDTO dto = bookGroupDao.getDTOById(resourcePage.getBookGroupId());
+                resourcePageDTO.setUrl(null == dto?null:dto.getGroupQrcodeLink());
+            }
+        }
+        return resourcePageDTO;
+    }
+
 }

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

@@ -22,6 +22,7 @@ import com.pcloud.book.group.dto.MapBookGroupServeCountDTO;
 import com.pcloud.book.group.dto.PersonalQrcodeDTO;
 import com.pcloud.book.group.dto.QueryByBookAdviserDTO;
 import com.pcloud.book.group.dto.ResourceBrowseParamDto;
+import com.pcloud.book.group.dto.ResourcePageDTO;
 import com.pcloud.book.group.dto.SelfRobotBookGroupDTO;
 import com.pcloud.book.group.dto.SelfRobotUserDTO;
 import com.pcloud.book.group.dto.SelfRobtParamDTO;
@@ -483,4 +484,10 @@ public class BookGroupServiceImpl implements BookGroupService {
                             @RequestParam(value = "bookGroupId", required = false) Long bookGroupId) {
         return ResponseHandleUtil.toResponse(resourcePageBiz.isOpenRaysScene(sceneId, bookGroupId));
     }
+
+    @Override
+    @GetMapping("getResourcePageById")
+    public ResponseEntity<ResponseDto<ResourcePageDTO>> getResourcePageById(@RequestParam("resourcePageId") Long resourcePageId) {
+        return ResponseHandleUtil.toResponse(resourcePageBiz.getResourcePageById(resourcePageId));
+    }
 }