Merge branch 'feat-zy-1002770' into 'master'

1002770 前端换了接口

See merge request rays/pcloud-book!641

pcloud-facade-book/src/main/java/com/pcloud/book/book/dto/BookDto.java

@@ -649,6 +649,16 @@ public class BookDto extends BaseDto {
     @ApiModelProperty("目的标签名称")
     private String purLabelName;
 
+    @ApiModelProperty("小睿分类编号")
+    private Integer classifyId;
+
+    public Integer getClassifyId() {
+        return classifyId;
+    }
+
+    public void setClassifyId(Integer classifyId) {
+        this.classifyId = classifyId;
+    }
 
     public String getQrRemark() {
         return qrRemark;

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

@@ -18,6 +18,7 @@ import com.pcloud.book.book.cache.BookCache;
 import com.pcloud.book.book.constant.BookConstant;
 import com.pcloud.book.book.dao.BookDao;
 import com.pcloud.book.book.dao.BookLabelDao;
+import com.pcloud.book.book.dao.BookRaysClassifyDao;
 import com.pcloud.book.book.dto.*;
 import com.pcloud.book.book.entity.Book;
 import com.pcloud.book.book.entity.BookAdviser;
@@ -46,6 +47,7 @@ import com.pcloud.book.copyright.vo.BookAuthInfoVO;
 import com.pcloud.book.es.biz.ESBookAndAdviserBiz;
 import com.pcloud.book.es.entity.ESBookAndAdviser;
 import com.pcloud.book.group.biz.BookGroupBiz;
+import com.pcloud.book.group.dao.BookGroupDao;
 import com.pcloud.book.group.dto.BookGroupDTO;
 import com.pcloud.book.group.enums.JoinGroupTypeEnum;
 import com.pcloud.book.mq.producer.BookMQProducer;
@@ -149,6 +151,10 @@ public class BookBizImpl implements BookBiz {
     private MessageConsr messageConsr;
     @Autowired
     private ESBookAndAdviserBiz esBookAndAdviserBiz;
+    @Autowired
+    private BookGroupDao bookGroupDao;
+    @Autowired
+    private BookRaysClassifyDao bookRaysClassifyDao;
 
     /**
      * 创建书籍,同时建立与编辑的推广关系
@@ -2068,6 +2074,11 @@ public class BookBizImpl implements BookBiz {
         if (bookDto == null) {
             return new BookDto();
         }
+        Integer joinGroupType = bookGroupDao.getJoinGroupType(paramMap);
+        if(null!=joinGroupType && JoinGroupTypeEnum.XIAORUI.getCode().equals(joinGroupType)){
+            Long classifyId = bookRaysClassifyDao.getClassifyIdByBookTemplateId(bookDto.getTempletId());
+            bookDto.setClassifyId(null!=classifyId ? classifyId.intValue():null);
+        }
         //	设置模板名字
         List<Long> templetIds = new ArrayList<>();
         if(bookDto.getTempletId()!=null) {

pcloud-service-book/src/main/java/com/pcloud/book/group/dao/BookGroupDao.java

@@ -312,4 +312,6 @@ public interface BookGroupDao extends BaseDao<BookGroup> {
     public Long getBookGroupId4OldData(Long raysBookId);
 
     Long getIdByBookNameAndJoinGroupType(String bookName, Integer joinGroupType);
+
+    Integer getJoinGroupType(Map<String,Object> map);
 }

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

@@ -375,4 +375,9 @@ public class BookGroupDaoImpl extends BaseDaoImpl<BookGroup> implements BookGrou
         map.put("joinGroupType", joinGroupType);
         return getSessionTemplate().selectOne(getStatement("getIdByBookNameAndJoinGroupType"),map);
     }
+
+    @Override
+    public Integer getJoinGroupType(Map<String, Object> map) {
+        return getSessionTemplate().selectOne(getStatement("getJoinGroupType"),map);
+    }
 }

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

@@ -960,4 +960,16 @@
         limit 1
     </select>
 
+    <select id="getJoinGroupType" parameterType="map" resultType="Integer">
+        SELECT
+        join_group_type
+        FROM
+        book_group
+        WHERE
+        BOOK_ID=#{bookId}
+        AND create_user=#{adviserId}
+        AND CHANNEL_ID=#{channelId}
+        and is_delete=0
+    </select>
+
 </mapper>
\ No newline at end of file