Merge branch 'feature/get4RayBook' into 'master'

feat: [1003673] 扫码直接跳小程序

See merge request rays/pcloud-book!983

pcloud-service-book/src/main/java/com/pcloud/book/book/biz/BookBiz.java

@@ -662,6 +662,7 @@ public interface BookBiz {
 
 	PageBeanNew<BookDto> getAdviserBooks4Rights(String keyword, Long agentId, Long templetId, Long secondTempletId, String typeCode, Integer currentPage, Integer numPerPage, Integer isIgnore);
 
+	void createBookGroupAppletUrl(Long bookId, Long channelId, Long adviserId,List<Long> sceneIds);
 	/**
 	 * 小程序首页书刊搜索
 	 * @author：zhuyajie

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

@@ -2408,6 +2408,7 @@ public class BookBizImpl implements BookBiz {
         return page;
     }
 
+    @Override
     public void createBookGroupAppletUrl(Long bookId, Long channelId, Long adviserId,List<Long> sceneIds){
         BookAdviserDto bookAdviserDto = bookAdviserDao.getBase(bookId,channelId,adviserId);
         Long raysClassifyId = bookRaysClassifyDao.getClassifyIdByBookTemplateId(bookAdviserDto.getTempletId());

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

@@ -960,4 +960,12 @@ public interface BookGroupBiz {
     Integer getBookGroupCountByAgent(Integer joinGroupType, Long agentId);
 
     List<BookServeDTO> getBookAndBookGroupServeIds4Price(Long adviserId, Long bookId, Long channelId);
+
+    /**
+     * 根据bookgroupId查小睿书
+     * @author：zhuyajie
+     * @date：2020/9/28 10:51
+     *  * @param null
+     */
+    BookGroupDTO getRayBookByBookGroupId(Long bookGroupId);
 }

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

@@ -179,7 +179,6 @@ import com.pcloud.book.record.entity.BookBrowseRecord;
 import com.pcloud.book.rightsSetting.biz.RightsSettingBiz;
 import com.pcloud.book.rightsSetting.constants.RightsSettingConstant;
 import com.pcloud.book.rightsSetting.dto.RightsSettingDto;
-import com.pcloud.book.rightsSetting.entity.RightsNowItem;
 import com.pcloud.book.skill.biz.PcloudGroupActivityBiz;
 import com.pcloud.book.skill.entity.PcloudGroupActivity;
 import com.pcloud.book.util.common.ThreadPoolUtils;
@@ -5124,7 +5123,21 @@ public class BookGroupBizImpl implements BookGroupBiz {
     public BookAppletSceneDTO getBookAppletBySceneId( Long sceneId ) {
         BookAppletScene bySceneId = bookAppletSceneDao.getBySceneId(sceneId);
         if (bySceneId == null) {
-            return null;
+            //关联书刊是否开启小睿流程
+            QrcodeSceneDto qrcodeSceneDto = qrcodeSceneConsr.getById(sceneId);
+            if (null == qrcodeSceneDto || !qrcodeSceneDto.getQrcodeType().equals("ali")) {
+                return null;
+            }
+            BookAdviserDto bookAdviserDto = bookAdviserDao.getBase(qrcodeSceneDto.getAdviserBookId(), qrcodeSceneDto.getChannelPartyId(), qrcodeSceneDto.getCreatedByUserLogin());
+            if (null == bookAdviserDto || YesOrNoEnums.NO.getValue().equals(bookAdviserDto.getIsOpenRobotProcess())) {
+                return null;
+            }
+            //给二维码创建小睿码
+            ThreadPoolUtils.OTHER_THREAD_POOL.execute(() -> {
+                bookBiz.createBookGroupAppletUrl(qrcodeSceneDto.getAdviserBookId(), qrcodeSceneDto.getChannelPartyId(), qrcodeSceneDto.getCreatedByUserLogin(), Arrays.asList(sceneId));
+            });
+            bySceneId = new BookAppletScene();
+            bySceneId.setSceneId(sceneId);
         }
         BookAppletSceneDTO dto = new BookAppletSceneDTO();
         BeanUtils.copyProperties(bySceneId, dto);
@@ -5688,6 +5701,22 @@ public class BookGroupBizImpl implements BookGroupBiz {
         return serveDTOList;
     }
 
+    @Override
+    public BookGroupDTO getRayBookByBookGroupId(Long bookGroupId) {
+        BookGroupDTO bookGroupDTO = bookGroupDao.getBookBaseInfoById(bookGroupId);
+        if (null == bookGroupDTO){
+            return new BookGroupDTO();
+        }
+        bookGroupDTO.setAdviserId(bookGroupDTO.getCreateUser());
+        BookAdviserDto bookAdviserDto = bookAdviserDao.getBase(bookGroupDTO.getBookId(), bookGroupDTO.getChannelId(), bookGroupDTO.getCreateUser());
+        if (null != bookAdviserDto && YesOrNoEnums.YES.getValue().equals(bookAdviserDto.getIsOpenRobotProcess())) {
+            bookGroupDTO.setOpenWeapp(true);
+        } else {
+            bookGroupDTO.setOpenWeapp(false);
+        }
+        return bookGroupDTO;
+    }
+
     private void setAppPrice(List<BookServeDTO> serveDTOList) {
         if (ListUtils.isEmpty(serveDTOList)) {
             return;

pcloud-service-book/src/main/java/com/pcloud/book/group/dto/BookAppletSceneDTO.java

@@ -53,4 +53,9 @@ public class BookAppletSceneDTO extends BaseDto {
      * 小程序公众号id
      */
     private Long accountSettingId;
+    /**
+     * 现代纸书自建码的id
+     */
+    private Long sceneId;
+
 }

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

@@ -786,4 +786,8 @@ public interface BookGroupFacade {
             @RequestParam(value = "currentPage", required = false) Integer currentPage,
             @RequestParam(value = "numPerPage", required = false) Integer numPerPage)
             throws BizException, PermissionException;
+
+    @ApiOperation("根据bookgroupId查小睿书")
+    @GetMapping("getRayBookByBookGroupId")
+    ResponseDto<?> getRayBookByBookGroupId(@RequestParam("bookGroupId") Long bookGroupId);
 }

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

@@ -1291,4 +1291,9 @@ public class BookGroupFacadeImpl implements BookGroupFacade {
         return new ResponseDto<>(pageBean);
     }
 
+    @Override
+    @GetMapping("getRayBookByBookGroupId")
+    public ResponseDto<?> getRayBookByBookGroupId(@RequestParam("bookGroupId") Long bookGroupId){
+        return new ResponseDto<>(bookGroupBiz.getRayBookByBookGroupId(bookGroupId));
+    }
 }

pcloud-service-book/src/main/resources/mapper/group/BookAppletScene.xml

@@ -91,6 +91,7 @@
         FROM book_applet_scene
         WHERE scene_id=#{sceneId}
         AND is_delete = 0
+        limit 1
     </select>
 
     <select id="updateRaysClassifyIdByBookGroupId" parameterType="map">