Merge branch 'fixbug/rayh5' into 'master'

feat: [1004558] H5落地页

See merge request rays/pcloud-book!1264

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

@@ -136,4 +136,11 @@ public interface ResourcePageBiz {
      *  * @param null
      */
     List<BookGroupServe> getServeListByBookGroupId(Long bookGroupId);
+    /**
+     * 批量更新预览二维码
+     * @author：zhuyajie
+     * @date：2021/4/20 1:14
+     *  * @param null
+     */
+    void batchUpdateQrcode(List<Long> bookGroupIds);
 }

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

@@ -149,15 +149,19 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
         Long sceneId = updateResourcePageVO.getSceneId();
         ResourcePage resourcePage = resourcePageDao.getBySceneId(sceneId);
         updateResourcePageVO.setOpenRays(updateResourcePageVO.getOpenRays() == null ? 0 : updateResourcePageVO.getOpenRays());
+        //预览二维码
+        String qrcodeLink = BookProps.getWechatDomain()+"/rayh5/book?sceneId="+sceneId;
         if (null == resourcePage) {
             resourcePage = new ResourcePage();
             BeanUtils.copyProperties(updateResourcePageVO, resourcePage);
-            //预览二维码
-            String qrcodeLink = "https://wechat666.raysgo.com/rayh5/book?sceneId="+sceneId;
             String qrcodeUrl = QrcodeUtils.createWithMargin(qrcodeLink, 1);
             resourcePage.setQrcodeUrl(qrcodeUrl);
             resourcePageDao.insert(resourcePage);
         } else {
+            if (StringUtil.isEmpty(resourcePage.getQrcodeUrl())) {
+                String qrcodeUrl = QrcodeUtils.createWithMargin(qrcodeLink, 1);
+                resourcePage.setQrcodeUrl(qrcodeUrl);
+            }
             resourcePage.setStyle(updateResourcePageVO.getStyle());
             resourcePage.setOpenRays(updateResourcePageVO.getOpenRays());
             resourcePage.setShowBook(updateResourcePageVO.getShowBook());
@@ -181,15 +185,19 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
         Long bookGroupId = updateResourcePageVO.getBookGroupId();
         ResourcePage resourcePage = resourcePageDao.getByBookGroupId(bookGroupId);
         updateResourcePageVO.setOpenRays(updateResourcePageVO.getOpenRays() == null ? 0 : updateResourcePageVO.getOpenRays());
+        //预览二维码
+        String qrcodeLink = BookProps.getWechatDomain()+"/rayh5/book?bookGroupId="+bookGroupId;
         if (null == resourcePage) {
             resourcePage = new ResourcePage();
             BeanUtils.copyProperties(updateResourcePageVO, resourcePage);
-            //预览二维码
-            String qrcodeLink = "https://wechat666.raysgo.com/rayh5/book?bookGroupId="+bookGroupId;
             String qrcodeUrl = QrcodeUtils.createWithMargin(qrcodeLink, 1);
             resourcePage.setQrcodeUrl(qrcodeUrl);
             resourcePageDao.insert(resourcePage);
         } else {
+            if (StringUtil.isEmpty(resourcePage.getQrcodeUrl())) {
+                String qrcodeUrl = QrcodeUtils.createWithMargin(qrcodeLink, 1);
+                resourcePage.setQrcodeUrl(qrcodeUrl);
+            }
             resourcePage.setStyle(updateResourcePageVO.getStyle());
             resourcePage.setOpenRays(updateResourcePageVO.getOpenRays());
             resourcePage.setShowBook(updateResourcePageVO.getShowBook());
@@ -441,8 +449,16 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
             }
             BeanUtils.copyProperties(resourcePage, resourcePageVO);
             BookGroupDTO bookGroupDTO = bookGroupBiz.getBookInfo(bookGroupId);
+            if (null != bookGroupDTO) {
                 resourcePageVO.setBookImg(bookGroupDTO.getBookImg());
                 resourcePageVO.setBookName(bookGroupDTO.getBookName());
+            }
+            BookGroupDTO dto = bookGroupDao.getDTOById(bookGroupId);
+            if (null != dto) {
+                resourcePageVO.setBookId(dto.getBookId());
+                resourcePageVO.setAdviserId(dto.getCreateUser());
+                resourcePageVO.setChannelId(dto.getChannelId());
+            }
         } else {
             ResourcePage resourcePage = resourcePageDao.getBySceneId(sceneId);
             if (null == resourcePage) {
@@ -452,6 +468,9 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
             QrcodeSceneDto qrcodeSceneDto = qrcodeSceneConsr.getById(sceneId);
             resourcePageVO.setBookImg(qrcodeSceneDto.getBook().getCoverImg());
             resourcePageVO.setBookName(qrcodeSceneDto.getBook().getBookName());
+            resourcePageVO.setBookId(qrcodeSceneDto.getAdviserBookId());
+            resourcePageVO.setAdviserId(qrcodeSceneDto.getCreatedByUserLogin());
+            resourcePageVO.setChannelId(qrcodeSceneDto.getChannelPartyId());
         }
         Map<Long, AdviserBaseInfoDto> agentMap = adviserConsr.getAdviserId2AdviserInfoDtoMap(Arrays.asList(adviserId));
         if (!MapUtils.isEmpty(agentMap)) {
@@ -1224,4 +1243,24 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
         return resourcePageItemDao.getServeListByBookGroupId(bookGroupId);
     }
 
+    @Override
+    public void batchUpdateQrcode(List<Long> bookGroupIds) {
+        if (ListUtils.isEmpty(bookGroupIds)) {
+            return;
+        }
+        for (Long bookGroupId:bookGroupIds) {
+            ResourcePage resourcePage = resourcePageDao.getByBookGroupId(bookGroupId);
+            if (null == resourcePage) {
+                continue;
+            }
+            if (StringUtil.isEmpty(resourcePage.getQrcodeUrl())) {
+                //预览二维码
+                String qrcodeLink = BookProps.getWechatDomain()+"/rayh5/book?bookGroupId="+bookGroupId;
+                String qrcodeUrl = QrcodeUtils.createWithMargin(qrcodeLink, 1);
+                resourcePage.setQrcodeUrl(qrcodeUrl);
+                resourcePageDao.update(resourcePage);
+            }
+        }
+    }
+
 }

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

@@ -152,4 +152,11 @@ public class ResourcePageFacade {
         Long wechatUserId = Cookie.getId(userInfo,Cookie._WECHAT_USER_ID);
         return new ResponseDto<>(resourcePageBiz.getResourcePageByBookGroupIdOrSceneId4Wechat(bookGroupId, wechatUserId, sceneId));
     }
+
+    @ApiOperation("批量更新预览二维码")
+    @PostMapping("batchUpdateQrcode")
+    public ResponseDto<?> batchUpdateQrcode(@RequestBody List<Long> bookGroupIds) {
+        resourcePageBiz.batchUpdateQrcode(bookGroupIds);
+        return new ResponseDto<>();
+    }
 }