Merge branch 'master' of http://begitlab.chubanyun.me/rays/pcloud-book into feat-rsy

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

+package com.pcloud.book.group.dto;
+
+import java.util.List;
+
+import lombok.Data;
+
+/**
+ * 用于根据bookId和adviserId查询BookGroup相关信息
+ */
+@Data
+public class QueryByBookAdviserDTO {
+    List<Long> bookIds;
+    List<Long> adviserIds;
+}

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

@@ -7,6 +7,7 @@ import java.util.Map;
 import com.pcloud.book.group.dto.PersonalQrcodeDTO;
 import com.pcloud.book.group.dto.GroupCipherDTO;
 import com.pcloud.book.group.dto.GroupUseDTO;
+import com.pcloud.book.group.dto.QueryByBookAdviserDTO;
 import com.pcloud.book.group.dto.ResourceBrowseParamDto;
 
 import org.springframework.cloud.netflix.feign.FeignClient;
@@ -37,6 +38,10 @@ public interface BookGroupService {
     @RequestMapping(value = "getBookGroupInfoByIds", method = RequestMethod.POST)
     ResponseEntity<ResponseDto<Map<Long, BookGroupDTO>>> getBookGroupInfoByIds(@RequestBody List<Long> bookGroupIds) throws BizException;
 
+    @ApiOperation("根据bookId和AdviserId批量获取社群书基本信息")
+    @PostMapping(value = "getBookGroupInfoByBookIdAndAdviserId")
+    ResponseEntity<ResponseDto<List<BookGroupDTO>>> getBookGroupInfoByBookIdAndAdviserId(@RequestBody QueryByBookAdviserDTO queryByBookAdviserDTO) throws BizException;
+
     @ApiOperation("为信息流批量获取社群书基本信息")
     @RequestMapping(value = "getFlowInfoByBookGroupIds", method = RequestMethod.POST)
     ResponseEntity<ResponseDto<Map<Long, StoreFlowInfoDto>>> getFlowInfoByBookGroupIds(@RequestBody List<Long> bookGroupIds) throws BizException;

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

@@ -105,8 +105,12 @@ public class AdNewsBizImpl implements AdNewsBiz {
         adNewsSetDao.insert(adNewsSet);
         buildAdNewsGroups(adNewsSet, adNewsSet.getCreateUser());
         adNewsGroupDao.batchInsert(adNewsSet.getAdNewsGroups());
-        buildAdNewsWechats(adNewsSet);
-        adNewsWechatDao.batchInsert(adNewsSet.getAdNewsWechats());
+        // 判断是否增加自有过公众号,如果没有则将当前数据入库
+        if (!ListUtils.isEmpty(adNewsSet.getAdNewsWechats())
+                && !adNewsWechatDao.existsAdNewsWechat(adNewsSet.getUpdateUser())) {
+            buildAdNewsWechats(adNewsSet);
+            adNewsWechatDao.batchInsert(adNewsSet.getAdNewsWechats());
+        }
         //创建定时任务
         buildAdNewsSh(adNewsSet);
         return adNewsSet.getId();

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

@@ -66,6 +66,11 @@ public interface BookGroupBiz {
     Map<Long, BookGroupDTO> getBookGroupInfoByIds(List<Long> bookGroupIds) throws BizException;
 
     /**
+     * 根据bookId和AdviserId批量获取社群书基本信息
+     */
+    List<BookGroupDTO> getBookGroupInfoByBookIdAndAdviserId(List<Long> bookIds, List<Long> adviserIds);
+
+    /**
      * 获取社群书群二维码信息
      * @param bookGroupId 群二维码ID
      * @return

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

@@ -334,6 +334,15 @@ public class BookGroupBizImpl implements BookGroupBiz {
         return list.stream().collect(Collectors.toMap(BookGroupDTO::getId, dto -> dto));
     }
 
+    @Override
+    public List<BookGroupDTO> getBookGroupInfoByBookIdAndAdviserId(List<Long> bookIds, List<Long> adviserIds){
+        if(ListUtils.isEmpty(bookIds) || ListUtils.isEmpty(adviserIds)) {
+            return null;
+        }
+
+        return bookGroupDao.getDTOByBookIdsAnsAdviserIds(bookIds,adviserIds);
+    }
+
     /**
      * 获取社群书群二维码信息
      */

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

@@ -39,6 +39,13 @@ public interface BookGroupDao extends BaseDao<BookGroup> {
     BookGroupDTO getDTOByBookId(Long bookId, Long channelId, Long adviserId);
 
     /**
+     *
+     * @param bookIds    书刊ID
+     * @param adviserIds 编辑ID
+     */
+    List<BookGroupDTO> getDTOByBookIdsAnsAdviserIds(List<Long> bookIds, List<Long> adviserIds);
+
+    /**
      * 根据书刊ID删除
      * @param bookId    书刊ID
      * @param channelId 运营ID

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

@@ -47,6 +47,14 @@ public class BookGroupDaoImpl extends BaseDaoImpl<BookGroup> implements BookGrou
         return super.getSqlSession().selectOne(getStatement("getDTOByBookId"), paramMap);
     }
 
+    @Override
+    public List<BookGroupDTO> getDTOByBookIdsAnsAdviserIds(List<Long> bookIds, List<Long> adviserIds) {
+        Map<String, Object> paramMap = new HashMap<>();
+        paramMap.put("bookIds",bookIds);
+        paramMap.put("adviserIds",adviserIds);
+        return super.getSqlSession().selectList(getStatement("getDTOByBookIdsAnsAdviserIds"),paramMap);
+    }
+
     /**
      * 根据书刊ID删除
      */

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

@@ -8,6 +8,7 @@ import com.pcloud.book.group.dto.GroupCipherDTO;
 import com.pcloud.book.group.dto.GroupUseDTO;
 import io.swagger.annotations.ApiOperation;
 
+import com.pcloud.book.group.dto.QueryByBookAdviserDTO;
 import com.pcloud.book.group.dto.ResourceBrowseParamDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
@@ -51,6 +52,15 @@ public class BookGroupServiceImpl implements BookGroupService {
     }
 
     /**
+     * 根据bookId和AdviserId批量获取社群书基本信息
+     */
+    @Override
+    @PostMapping(value = "getBookGroupInfoByBookIdAndAdviserId")
+    public ResponseEntity<ResponseDto<List<BookGroupDTO>>> getBookGroupInfoByBookIdAndAdviserId(@RequestBody QueryByBookAdviserDTO queryByBookAdviserDTO) throws BizException {
+        return ResponseHandleUtil.toResponse(bookGroupBiz.getBookGroupInfoByBookIdAndAdviserId(queryByBookAdviserDTO.getBookIds(),queryByBookAdviserDTO.getAdviserIds()));
+    }
+
+    /**
      * 为信息流批量获取社群书基本信息
      */
     @Override

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

@@ -90,6 +90,21 @@
         and create_user = #{adviserId,jdbcType=BIGINT}
         ORDER BY create_time ASC limit 1
     </select>
+    
+    <select id="getDTOByBookIdsAnsAdviserIds" resultMap="BookGroupDTO" parameterType="map">
+        select
+        <include refid="Base_Column_List"/>
+        from book_group
+        where is_delete = 0
+        and book_id in
+        <foreach collection="bookIds" open="(" close=")" item="item" separator=",">
+            ${item}
+        </foreach>
+        and create_user in
+        <foreach collection="adviserIds" open="(" close=")" item="item" separator=",">
+            ${item}
+        </foreach>
+    </select>
 
     <select id="getBookGroupCount" resultType="Integer" parameterType="Long">
         SELECT