Merge branch 'feature/1003798' into 'master'

feat: [1003798] 小程序流程优化-跳转小程序不过首页闪屏

See merge request rays/pcloud-book!1020

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

@@ -981,4 +981,12 @@ public interface BookGroupBiz {
      *  * @param null
      */
     Boolean checkRayUrl(String url);
+
+    /**
+     * 根据sceneId或bookGroupId查书刊信息
+     * @author：zhuyajie
+     * @date：2020/10/29 19:39
+     *  * @param null
+     */
+    Map<String, Object> getBookBase4Applet(Long sceneId, Long bookGroupId);
 }

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

@@ -5895,4 +5895,28 @@ public class BookGroupBizImpl implements BookGroupBiz {
         }
         return false;
     }
+
+    @Override
+    public Map<String, Object> getBookBase4Applet(Long sceneId, Long bookGroupId) {
+        Long bookId = 0L;
+        Long channelId = 0L;
+        Long adviserId = 0L;
+        if (null != bookGroupId) {
+            BookGroupDTO bookGroupDTO = bookGroupDao.getDTOById(bookGroupId);
+            if (null != bookGroupDTO) {
+                bookId = bookGroupDTO.getBookId();
+                channelId = bookGroupDTO.getChannelId();
+                adviserId = bookGroupDTO.getCreateUser();
+            }
+        } else {
+            QrcodeSceneDto qrcodeSceneDto = qrcodeSceneConsr.getById(sceneId);
+            if (null != qrcodeSceneDto) {
+                bookId = qrcodeSceneDto.getAdviserBookId();
+                channelId = qrcodeSceneDto.getChannelPartyId();
+                adviserId = qrcodeSceneDto.getCreatedByUserLogin();
+            }
+        }
+        Map<String, Object> map = this.getBookBaseInfo4Applet(adviserId, channelId, bookId);
+        return map;
+    }
 }

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

@@ -795,4 +795,10 @@ public interface BookGroupFacade {
     @RequestMapping(value = "getBookGroupsByBookIds", method = RequestMethod.POST)
     ResponseDto<?> getBookGroupsByBookIds(@RequestBody MapResourceTotalCountDTO requestDTO)
             throws BizException, PermissionException;
+
+    @ApiOperation("根据sceneId或bookGroupId查书刊信息")
+    @GetMapping("getBookBase4Applet")
+    ResponseDto<?> getBookBase4Applet(
+            @RequestParam(value = "sceneId", required = false) Long sceneId,
+            @RequestParam(value = "bookGroupId", required = false) Long bookGroupId);
 }

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

@@ -1305,4 +1305,15 @@ public class BookGroupFacadeImpl implements BookGroupFacade {
         }
         return new ResponseDto<>(bookGroupBiz.getBookGroupsByBookIds(requestDTO.getBookIds(), requestDTO.getAdviserIds(), requestDTO.getChannelIds()));
     }
+
+    @Override
+    @GetMapping("getBookBase4Applet")
+    public ResponseDto<?> getBookBase4Applet(
+            @RequestParam(value = "sceneId", required = false) Long sceneId,
+            @RequestParam(value = "bookGroupId", required = false) Long bookGroupId) {
+        if (null == sceneId && null == bookGroupId) {
+            throw new BookBizException(BookBizException.PARAM_IS_ERROR, "参数缺失！");
+        }
+        return new ResponseDto<>(bookGroupBiz.getBookBase4Applet(sceneId, bookGroupId));
+    }
 }