Merge branch 'feat-C1554' into 'master'

社群书版权保护

See merge request rays/pcloud-book!139

pcloud-facade-book/src/main/java/com/pcloud/book/copyright/dto/CheckUserAuthDTO.java

+package com.pcloud.book.copyright.dto;
+
+import com.pcloud.common.dto.BaseDto;
+
+import java.util.Date;
+import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * @author lihao
+ * @date 2019/9/3 17:02
+ */
+@ApiModel
+public class CheckUserAuthDTO extends BaseDto {
+
+    private static final long serialVersionUID = -2646713544720373882L;
+
+    @ApiModelProperty("图书标识")
+    private Long bookId;
+
+    @ApiModelProperty("运营标识")
+    private Long channelId;
+
+    @ApiModelProperty("编辑标识")
+    private Long adviserId;
+
+    @ApiModelProperty("微信用户列表")
+    private List<Long> wechatUserIds;
+
+    public Long getBookId() {
+        return bookId;
+    }
+
+    public void setBookId(Long bookId) {
+        this.bookId = bookId;
+    }
+
+    public Long getChannelId() {
+        return channelId;
+    }
+
+    public void setChannelId(Long channelId) {
+        this.channelId = channelId;
+    }
+
+    public Long getAdviserId() {
+        return adviserId;
+    }
+
+    public void setAdviserId(Long adviserId) {
+        this.adviserId = adviserId;
+    }
+
+    public List<Long> getWechatUserIds() {
+        return wechatUserIds;
+    }
+
+    public void setWechatUserIds(List<Long> wechatUserIds) {
+        this.wechatUserIds = wechatUserIds;
+    }
+
+    @Override
+    public String toString() {
+        return "CheckUserAuthDTO{" +
+                "bookId=" + bookId +
+                ", channelId=" + channelId +
+                ", adviserId=" + adviserId +
+                ", wechatUserIds=" + wechatUserIds +
+                '}';
+    }
+}

pcloud-facade-book/src/main/java/com/pcloud/book/copyright/service/BookAuthInfoService.java

@@ -2,6 +2,7 @@ package com.pcloud.book.copyright.service;
 
 import com.pcloud.book.copyright.dto.BookAuthInfoCountDTO;
 import com.pcloud.book.copyright.dto.BookAuthTotalCountDTO;
+import com.pcloud.book.copyright.dto.CheckUserAuthDTO;
 import com.pcloud.common.dto.ResponseDto;
 import com.pcloud.common.exceptions.BizException;
 import io.swagger.annotations.Api;
@@ -26,13 +27,13 @@ public interface BookAuthInfoService {
 
     @ApiOperation(value = "获取图书授权金价格", httpMethod = "GET")
     @RequestMapping(value = "/getBookAuthPrice", method = RequestMethod.GET)
-    ResponseEntity<ResponseDto<BigDecimal>> getBookAuthPrice(@RequestParam("bookId") Long bookId, @RequestParam("channelId")Long channelId, @RequestParam("adviserId")Long adviserId)
-            throws BizException;
+    ResponseEntity<ResponseDto<BigDecimal>> getBookAuthPrice(@RequestParam("bookId") Long bookId, @RequestParam("channelId")Long channelId,
+                                                             @RequestParam("adviserId")Long adviserId) throws BizException;
 
     @ApiOperation(value = "获取图书授权统计信息", httpMethod = "GET")
     @RequestMapping(value = "/getBookAuthInfoCount", method = RequestMethod.GET)
-    ResponseEntity<ResponseDto<BookAuthInfoCountDTO>> getBookAuthInfoCount(@RequestParam("bookId") Long bookId, @RequestParam("channelId")Long channelId, @RequestParam("adviserId")Long adviserId, @RequestParam("monthDate") String monthDate)
-            throws BizException;
+    ResponseEntity<ResponseDto<BookAuthInfoCountDTO>> getBookAuthInfoCount(@RequestParam("bookId") Long bookId, @RequestParam("channelId")Long channelId,
+                                                                           @RequestParam("adviserId")Long adviserId, @RequestParam("monthDate") String monthDate) throws BizException;
 
     @ApiOperation(value = "获取图书授权总统计信息", httpMethod = "GET")
     @RequestMapping(value = "/getBookAuthTotalCount", method = RequestMethod.GET)
@@ -41,4 +42,15 @@ public interface BookAuthInfoService {
     @ApiOperation(value = "根据获取图书授权总统计信息", httpMethod = "POST")
     @RequestMapping(value = "/getBookAuthTotalCount4Adviser", method = RequestMethod.POST)
     ResponseEntity<ResponseDto<BookAuthTotalCountDTO>> getBookAuthTotalCount4Adviser(@RequestBody List<Long> adviserIds) throws BizException;
+
+    @ApiOperation(value = "校验用户是否授权过（进群）", httpMethod = "POST")
+    @RequestMapping(value = "/checkUserIsHaveAuth", method = RequestMethod.POST)
+    ResponseEntity<ResponseDto<Boolean>> checkUserIsHaveAuth(@RequestBody CheckUserAuthDTO checkUserAuthDTO) throws BizException;
+
+    @ApiOperation(value = "获取社群书授权金价格", httpMethod = "GET")
+    @RequestMapping(value = "/getGroupBookAuthPrice", method = RequestMethod.GET)
+    ResponseEntity<ResponseDto<BigDecimal>> getGroupBookAuthPrice(@RequestParam("bookId") Long bookId, @RequestParam("channelId")Long channelId,
+                                                             @RequestParam("adviserId")Long adviserId) throws BizException;
+
+
 }

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

@@ -12,6 +12,7 @@ import com.pcloud.book.book.dto.BookInfoAnalysicsDTO;
 import com.pcloud.book.book.dto.BookInfoAndAuthStatusDTO;
 import com.pcloud.book.book.entity.Book;
 import com.pcloud.book.book.vo.ListNoAuthBookParam;
+import com.pcloud.book.book.vo.ListNoAuthGroupBookParam;
 import com.pcloud.common.exceptions.BizException;
 import com.pcloud.common.page.PageBean;
 import com.pcloud.common.page.PageBeanNew;
@@ -550,6 +551,14 @@ public interface BookBiz {
     PageBeanNew listNoAuthBook(ListNoAuthBookParam listNoAuthBookParam, Long adviserId);
 
 	/**
+	 * 获取未设置授权的社群书
+	 * @param listNoAuthGroupBookParam
+	 * @param adviserId
+	 * @return
+	 */
+	PageBeanNew listNoAuthGroupBook(ListNoAuthGroupBookParam listNoAuthGroupBookParam, Long adviserId);
+
+	/**
 	 * 获取图书基本信息与授权状态
 	 */
 	BookInfoAndAuthStatusDTO getBaseAndAuthStatus(Long bookId, Long channelId, Long adviserId);

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

@@ -39,6 +39,7 @@ import com.pcloud.book.book.entity.BookAdviser;
 import com.pcloud.book.book.set.BookSet;
 import com.pcloud.book.book.tools.BookTools;
 import com.pcloud.book.book.vo.ListNoAuthBookParam;
+import com.pcloud.book.book.vo.ListNoAuthGroupBookParam;
 import com.pcloud.book.consumer.analysisengine.SceneRecordConsr;
 import com.pcloud.book.consumer.app.AssistTempletConsr;
 import com.pcloud.book.consumer.channel.QrcodeSceneConsr;
@@ -1673,6 +1674,28 @@ public class BookBizImpl implements BookBiz {
     }
 
     @Override
+    @ParamLog("未设置版权保护的社群书")
+    public PageBeanNew listNoAuthGroupBook(ListNoAuthGroupBookParam listNoAuthGroupBookParam, Long adviserId) {
+        Map<String, Object> paramMap = new HashMap<>();
+        paramMap.put("adviserId", adviserId);
+        paramMap.put("channelId", listNoAuthGroupBookParam.getChannelId());
+        paramMap.put("name", listNoAuthGroupBookParam.getName() != null && "".equals(listNoAuthGroupBookParam.getName().trim()) ? null : listNoAuthGroupBookParam.getName());
+        paramMap.put("typeCode", listNoAuthGroupBookParam.getTypeCode() != null && "".equals(listNoAuthGroupBookParam.getTypeCode().trim()) ? null : listNoAuthGroupBookParam.getTypeCode());
+        paramMap.put("templetId", listNoAuthGroupBookParam.getTempletId());
+        paramMap.put("secondTempletIds", Optional.ofNullable(listNoAuthGroupBookParam.getSecondTempletId()).map(Lists::newArrayList).orElse(Lists.newArrayList()));
+        PageParam pageParam = new PageParam(listNoAuthGroupBookParam.getCurrentPage(), listNoAuthGroupBookParam.getNumPerPage());
+        PageBeanNew pageBean = bookDao.listPageNew(pageParam, paramMap, "listNoAuthGroupBook");
+        if (pageBean == null || ListUtils.isEmpty(pageBean.getRecordList())) {
+            return new PageBeanNew(listNoAuthGroupBookParam.getCurrentPage(), listNoAuthGroupBookParam.getNumPerPage(), new ArrayList<>());
+        }
+        //设置类型名称
+        bookSet.setTempletNames(pageBean.getRecordList());
+        //设置运营平台名称
+        bookSet.setChannelName(pageBean.getRecordList());
+        return pageBean;
+    }
+
+    @Override
     @ParamLog("获取图书基本信息与授权状态")
     public BookInfoAndAuthStatusDTO getBaseAndAuthStatus(Long bookId, Long channelId, Long adviserId) {
         BookDto book = getBaseById(bookId);
@@ -1683,7 +1706,7 @@ public class BookBizImpl implements BookBiz {
         BookInfoAndAuthStatusDTO bookInfoAndAuthStatusDTO = new BookInfoAndAuthStatusDTO();
         BeanUtils.copyProperties(book, bookInfoAndAuthStatusDTO);
         //获取授权状态
-        BookAuthInfoVO infoByBook = bookAuthInfoBiz.getInfoByBook(bookId, channelId, adviserId);
+        BookAuthInfoVO infoByBook = bookAuthInfoBiz.getInfoByBook(bookId, channelId, adviserId, null);
         if (infoByBook != null) {
             BeanUtils.copyProperties(infoByBook, bookInfoAndAuthStatusDTO);
         }

pcloud-service-book/src/main/java/com/pcloud/book/book/facade/BookFacade.java

@@ -7,6 +7,7 @@ import com.pcloud.book.book.dto.BookAssocCount;
 import com.pcloud.book.book.dto.BookDto;
 import com.pcloud.book.book.entity.Book;
 import com.pcloud.book.book.vo.ListNoAuthBookParam;
+import com.pcloud.book.book.vo.ListNoAuthGroupBookParam;
 import com.pcloud.common.dto.ResponseDto;
 import com.pcloud.common.exceptions.BizException;
 import com.pcloud.common.page.PageBean;
@@ -560,4 +561,9 @@ public interface BookFacade {
     @ApiOperation(value = "获取未设置正版授权的图书", httpMethod = "POST")
     ResponseDto<PageBeanNew> listNoAuthBook(@RequestHeader("token") String token,
                                                    @RequestBody ListNoAuthBookParam listNoAuthBookParam) throws PermissionException;
+
+    @RequestMapping(value = "listNoAuthGroupBook", method = RequestMethod.POST)
+    @ApiOperation(value = "获取未设置正版授权的社群书", httpMethod = "POST")
+    ResponseDto<PageBeanNew> listNoAuthGroupBook(@RequestHeader("token") String token,
+                                            @RequestBody ListNoAuthGroupBookParam listNoAuthGroupBookParam) throws PermissionException;
 }

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

@@ -11,6 +11,7 @@ import com.pcloud.book.book.dto.BookDto;
 import com.pcloud.book.book.entity.Book;
 import com.pcloud.book.book.facade.BookFacade;
 import com.pcloud.book.book.vo.ListNoAuthBookParam;
+import com.pcloud.book.book.vo.ListNoAuthGroupBookParam;
 import com.pcloud.common.dto.ResponseDto;
 import com.pcloud.common.exceptions.BizException;
 import com.pcloud.common.page.PageBean;
@@ -746,4 +747,14 @@ public class BookFacadeImpl implements BookFacade {
         PageBeanNew pageBeanNew = bookBiz.listNoAuthBook(listNoAuthBookParam, adviserId);
         return new ResponseDto<PageBeanNew>(null == pageBeanNew ? new PageBeanNew():pageBeanNew);
     }
+
+    @Override
+    @RequestMapping(value = "listNoAuthGroupBook", method = RequestMethod.POST)
+    public ResponseDto<PageBeanNew> listNoAuthGroupBook(@RequestHeader("token") String token,
+                                                   @RequestBody ListNoAuthGroupBookParam listNoAuthGroupBookParam)
+            throws BizException, PermissionException {
+        Long adviserId = (Long) SessionUtil.getVlaue(token, SessionUtil.PARTY_ID);
+        PageBeanNew pageBeanNew = bookBiz.listNoAuthGroupBook(listNoAuthGroupBookParam, adviserId);
+        return new ResponseDto<PageBeanNew>(null == pageBeanNew ? new PageBeanNew():pageBeanNew);
+    }
 }

pcloud-service-book/src/main/java/com/pcloud/book/book/vo/ListNoAuthGroupBookParam.java

+package com.pcloud.book.book.vo;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+import java.io.Serializable;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * @author lily
+ * @date 2018/12/3 20:35
+ */
+@ApiModel
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class ListNoAuthGroupBookParam implements Serializable {
+
+    @ApiModelProperty("isbn/issn/图书名称")
+    private String name;
+
+    @ApiModelProperty("运营标识")
+    private Long channelId;
+
+    @ApiModelProperty("图书类型标识")
+    private Long templetId;
+
+    @ApiModelProperty("图书类型标识")
+    private Long secondTempletId;
+
+    @ApiModelProperty("当前页")
+    private Integer currentPage;
+
+    @ApiModelProperty("每页条数")
+    private Integer numPerPage;
+
+    @ApiModelProperty("类型")
+    private String typeCode;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Long getChannelId() {
+        return channelId;
+    }
+
+    public void setChannelId(Long channelId) {
+        this.channelId = channelId;
+    }
+
+    public Long getTempletId() {
+        return templetId;
+    }
+
+    public Long getSecondTempletId() {
+        return secondTempletId;
+    }
+
+    public void setSecondTempletId(Long secondTempletId) {
+        this.secondTempletId = secondTempletId;
+    }
+
+    public void setTempletId(Long templetId) {
+        this.templetId = templetId;
+    }
+
+    public Integer getCurrentPage() {
+        return currentPage;
+    }
+
+    public void setCurrentPage(Integer currentPage) {
+        this.currentPage = currentPage;
+    }
+
+    public Integer getNumPerPage() {
+        return numPerPage;
+    }
+
+    public void setNumPerPage(Integer numPerPage) {
+        this.numPerPage = numPerPage;
+    }
+
+    public String getTypeCode() {
+        return typeCode;
+    }
+
+    public void setTypeCode(String typeCode) {
+        this.typeCode = typeCode;
+    }
+
+    @Override
+    public String toString() {
+        return "ListNoAuthBookParam{" +
+                "name='" + name + '\'' +
+                ", channelId=" + channelId +
+                ", templetId=" + templetId +
+                ", secondTempletId=" + secondTempletId +
+                ", currentPage=" + currentPage +
+                ", numPerPage=" + numPerPage +
+                ", typeCode='" + typeCode + '\'' +
+                '}';
+    }
+}

pcloud-service-book/src/main/java/com/pcloud/book/copyright/biz/BookAuthCodeBiz.java

@@ -28,7 +28,7 @@ public interface BookAuthCodeBiz {
     /**
      *  获取最大批次号
      */
-    Integer getMaxBatchNum(Long bookId, Long channelId, Long adviserId);
+    Integer getMaxBatchNum(Long bookId, Long channelId, Long adviserId, Integer authBookType);
 
     /**
      *  校验验证码
@@ -53,7 +53,7 @@ public interface BookAuthCodeBiz {
      * @Desr:获取导入记录
      * @Date:2019/5/22 18:02
      */
-    PageBeanNew<ImportRecordVO> importCodeRecord(Long bookId, Long channelId, Long adviserId, Integer currentPage, Integer numPerPage);
+    PageBeanNew<ImportRecordVO> importCodeRecord(Long bookId, Long channelId, Long adviserId, Integer authBookType, Integer currentPage, Integer numPerPage);
 
     /**
      * 获取正版授权码
@@ -64,7 +64,7 @@ public interface BookAuthCodeBiz {
      * @param pageParam
      * @return
      */
-    PageBeanNew<BookAuthCodeDTO> getCodeList(Long bookId, Long channelId, Long adviserId, String keyword, Integer state, PageParam pageParam);
+    PageBeanNew<BookAuthCodeDTO> getCodeList(Long bookId, Long channelId, Long adviserId, String keyword, Integer state, Integer authBookType, PageParam pageParam);
 
     /**
      * 批量删除正版授权码
@@ -82,5 +82,5 @@ public interface BookAuthCodeBiz {
      * @param partyId
      * @return
      */
-    Map<String, Object> getCodeExcel(Long bookId, String codeIds, Long channelId, Long status, String systemCode, Long partyId);
+    Map<String, Object> getCodeExcel(Long bookId, String codeIds, Long channelId, Long status, String systemCode, Long partyId, Integer authBookType);
 }

pcloud-service-book/src/main/java/com/pcloud/book/copyright/biz/BookAuthInfoBiz.java

@@ -7,6 +7,7 @@ import com.pcloud.book.copyright.vo.BookAuthInfoVO;
 import com.pcloud.book.copyright.vo.BookAuthInfoWechatVO;
 import com.pcloud.book.copyright.vo.GetAuthInfoParam;
 import com.pcloud.book.copyright.vo.ListHaveAuthBookParam;
+import com.pcloud.book.copyright.vo.ListHaveAuthGroupBookParam;
 import com.pcloud.book.copyright.vo.SetAuthStatusParam;
 import com.pcloud.book.copyright.vo.SetAuthOpenParam;
 import com.pcloud.book.copyright.vo.SetLocationDescVO;
@@ -44,12 +45,12 @@ public interface BookAuthInfoBiz {
     /**
      *  获取图书正版授权基本信息
      */
-    BookAuthInfoVO getInfoByBook(Long bookId, Long channelId, Long adviserId);
+    BookAuthInfoVO getInfoByBook(Long bookId, Long channelId, Long adviserId, Integer authBookType);
 
     /**
      *  获取图书正版授权基本信息
      */
-    BookAuthInfoAndServesVO getInfoAndServesByBook(Long bookId, Long channelId, Long adviserId);
+    BookAuthInfoAndServesVO getInfoAndServesByBook(Long bookId, Long channelId, Long adviserId, Integer authBookType);
 
     /**
      * 获取设置够正版授权图书信息
@@ -58,9 +59,15 @@ public interface BookAuthInfoBiz {
     PageBeanNew listHaveSetAuthBook(ListHaveAuthBookParam listHaveAuthBookParam, Long adviserId);
 
     /**
+     * 获取设置够正版授权社群书信息
+     * @return
+     */
+    PageBeanNew listHaveSetAuthGroupBook(ListHaveAuthGroupBookParam listHaveAuthGroupBookParam, Long adviserId);
+
+    /**
      * 获取正版授权金价格
      */
-    BigDecimal getBookAuthPrice(Long bookId, Long channelId, Long adviserId);
+    BigDecimal getBookAuthPrice(Long bookId, Long channelId, Long adviserId, Integer authBookType);
 
     /**
      * 获取图书授权信息
@@ -70,7 +77,7 @@ public interface BookAuthInfoBiz {
     /**
      * 获取图书授权基本信息
      */
-    BookAuthInfoVO getAuthBookInfo(Long bookId, Long channelId, Long adviserId, Long sceneId);
+    BookAuthInfoVO getAuthBookInfo(Long bookId, Long channelId, Long adviserId, Long sceneId, Integer authBookType);
 
     /**
       * 获取图书授权统计

pcloud-service-book/src/main/java/com/pcloud/book/copyright/biz/BookAuthUserBiz.java

 package com.pcloud.book.copyright.biz;
 
+import com.pcloud.book.copyright.dto.CheckUserAuthDTO;
 import com.pcloud.book.copyright.entity.BookAuthUser;
 import com.pcloud.book.copyright.vo.BookAuthCodeUserVO;
 import com.pcloud.book.copyright.vo.BookClickBuyRecordParam;
@@ -17,7 +18,7 @@ public interface BookAuthUserBiz {
     /**
      * 获取授权用户数量
      */
-    BookAuthCodeUserVO getAuthUserCount(Long bookId, Long channelId, Long adviserId);
+    BookAuthCodeUserVO getAuthUserCount(Long bookId, Long channelId, Long adviserId, Integer authBookType);
 
     /**
      * 根据月份获取授权用户数量
@@ -27,12 +28,12 @@ public interface BookAuthUserBiz {
     /**
      * 最近30天趋势图
      */
-    List<ThirtyDayCountVO> listThirtyDay(Long bookId, Long channelId, Long adviserId, String province);
+    List<ThirtyDayCountVO> listThirtyDay(Long bookId, Long channelId, Long adviserId, String province, Integer authBookType);
 
     /**
      * 最近6个月趋势图
      */
-    List<SixMonthCountVO> listSixMonth(Long bookId, Long channelId, Long adviserId, String province);
+    List<SixMonthCountVO> listSixMonth(Long bookId, Long channelId, Long adviserId, String province, Integer authBookType);
 
     /**
      * 新增用户授权记录
@@ -42,7 +43,7 @@ public interface BookAuthUserBiz {
     /**
      * 校验用户是否已经授权
      */
-    Boolean checkIsHaveAuth(Long bookId, Long channelId, Long adviserId, Long wechatUserId);
+    Boolean checkIsHaveAuth(Long bookId, Long channelId, Long adviserId, Long wechatUserId, Integer authBookType);
 
     /**
      * 获取授权信息总的统计数据
@@ -58,4 +59,9 @@ public interface BookAuthUserBiz {
      * 省份排名前10
      */
     List<ProvinceTop10VO> listTop10ByBook(Long bookId, Long channelId, Long adviserId, Integer type);
+
+    /**
+     * 校验用户是否授权(进群)
+     */
+    Boolean checkUserIsHaveAuth(CheckUserAuthDTO checkUserAuthDTO);
 }

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

@@ -52,6 +52,13 @@ public class BookAuthOrderBizImpl implements BookAuthOrderBiz {
         bookAuthOrder.setMoney(genuine.getMoney());
         bookAuthOrder.setAccountSettingId(genuine.getOfficialAccountId());
         bookAuthOrder.setOrderNum(genuine.getOrderFormMainId().toString());
+        if(genuine.getIsGroupBook() != null && genuine.getIsGroupBook() .equals(1)) {
+            bookAuthOrder.setIsGroupBook(1);
+            bookAuthOrder.setIsPaperBook(0);
+        } else {
+            bookAuthOrder.setIsGroupBook(0);
+            bookAuthOrder.setIsPaperBook(1);
+        }
         bookAuthOrderDao.insert(bookAuthOrder);
         //新增用户授权记录
         BookAuthUser bookAuthUser = new BookAuthUser();

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

@@ -4,9 +4,11 @@ import com.pcloud.book.base.exception.BookBizException;
 import com.pcloud.book.copyright.biz.BookAuthUserBiz;
 import com.pcloud.book.copyright.dao.BookAuthUserDao;
 import com.pcloud.book.copyright.dao.BookClickBuyRecordDao;
+import com.pcloud.book.copyright.dto.CheckUserAuthDTO;
 import com.pcloud.book.copyright.dto.DateDTO;
 import com.pcloud.book.copyright.entity.BookAuthUser;
 import com.pcloud.book.copyright.entity.BookClickBuyRecord;
+import com.pcloud.book.copyright.enums.AuthBookTypeEnum;
 import com.pcloud.book.copyright.tools.CopyrightTools;
 import com.pcloud.book.copyright.vo.BookAuthCodeUserVO;
 import com.pcloud.book.copyright.vo.BookClickBuyRecordParam;
@@ -47,11 +49,11 @@ public class BookAuthUserBizImpl implements BookAuthUserBiz {
 
     @ParamLog(value = "获取授权用户数量")
     @Override
-    public BookAuthCodeUserVO getAuthUserCount(Long bookId, Long channelId, Long adviserId) {
+    public BookAuthCodeUserVO getAuthUserCount(Long bookId, Long channelId, Long adviserId, Integer authBookType) {
         if (bookId == null || channelId == null || adviserId == null) {
             throw new BookBizException(BookBizException.PARAM_IS_NULL, "图书不存在");
         }
-        BookAuthCodeUserVO bookAuthCodeUserVO = bookAuthUserDao.getAuthUserCount(bookId, channelId, adviserId);
+        BookAuthCodeUserVO bookAuthCodeUserVO = bookAuthUserDao.getAuthUserCount(bookId, channelId, adviserId, authBookType);
         if (bookAuthCodeUserVO != null) {
             bookAuthCodeUserVO.setCodeUserCount(bookAuthCodeUserVO.getTotalCount() - bookAuthCodeUserVO.getPayUserCount());
         } else {
@@ -75,7 +77,7 @@ public class BookAuthUserBizImpl implements BookAuthUserBiz {
     }
 
     @Override
-    public List<ThirtyDayCountVO> listThirtyDay(Long bookId, Long channelId, Long adviserId, String province) {
+    public List<ThirtyDayCountVO> listThirtyDay(Long bookId, Long channelId, Long adviserId, String province, Integer authBookType) {
         DateDTO date = CopyrightTools.getDateByType(30L);
         Map<String, Object> paramMap = new HashMap<>();
         paramMap.put("startDate", date.getStartTime());
@@ -84,6 +86,11 @@ public class BookAuthUserBizImpl implements BookAuthUserBiz {
         paramMap.put("channelId", channelId);
         paramMap.put("adviserId", adviserId);
         paramMap.put("province", province);
+        if(authBookType == null || authBookType.equals(AuthBookTypeEnum.PAPER_BOOK.value)) {
+            paramMap.put("isPaperBook", 1);
+        } else {
+            paramMap.put("isGroupBook", 1);
+        }
         List<ThirtyDayCountVO>  thirtyDayCountVOS = bookAuthUserDao.listThirtyDay(paramMap);
         setZoreRecord(thirtyDayCountVOS, date.getStartTime(), date.getEndTime());
         return thirtyDayCountVOS;
@@ -118,13 +125,18 @@ public class BookAuthUserBizImpl implements BookAuthUserBiz {
     }
 
     @Override
-    public List<SixMonthCountVO> listSixMonth(Long bookId, Long channelId, Long adviserId, String province) {
+    public List<SixMonthCountVO> listSixMonth(Long bookId, Long channelId, Long adviserId, String province, Integer authBookType) {
         Map<String, Object> paramMap = new HashMap<>();
         paramMap.put("bookId", bookId);
         paramMap.put("channelId", channelId);
         paramMap.put("adviserId", adviserId);
         paramMap.put("province", province);
         paramMap.put("months", CopyrightTools.getLast6Months());
+        if(authBookType == null || authBookType.equals(AuthBookTypeEnum.PAPER_BOOK.value)) {
+            paramMap.put("isPaperBook", 1);
+        } else {
+            paramMap.put("isGroupBook", 1);
+        }
         List<SixMonthCountVO> sixMonthCountVOS = bookAuthUserDao.listSixMonth(paramMap);
         setZoreRecord(sixMonthCountVOS);
         return sixMonthCountVOS;
@@ -139,8 +151,8 @@ public class BookAuthUserBizImpl implements BookAuthUserBiz {
 
     @Override
     @ParamLog("校验用户是否已经授权")
-    public Boolean checkIsHaveAuth(Long bookId, Long channelId, Long adviserId, Long wechatUserId) {
-        return bookAuthUserDao.getIsHaveAuth(bookId, channelId, adviserId, wechatUserId);
+    public Boolean checkIsHaveAuth(Long bookId, Long channelId, Long adviserId, Long wechatUserId, Integer authBookType) {
+        return bookAuthUserDao.getIsHaveAuth(bookId, channelId, adviserId, wechatUserId, authBookType);
     }
 
     @Override
@@ -194,6 +206,25 @@ public class BookAuthUserBizImpl implements BookAuthUserBiz {
         return top10ByBook;
     }
 
+    @Override
+    @ParamLog("校验用户是否授权(进群)")
+    public Boolean checkUserIsHaveAuth(CheckUserAuthDTO checkUserAuthDTO) {
+        Long bookId = checkUserAuthDTO.getBookId();
+        Long channelId = checkUserAuthDTO.getChannelId();
+        Long adviserId = checkUserAuthDTO.getAdviserId();
+        List<Long> wechatUserIds = checkUserAuthDTO.getWechatUserIds();
+        if(null == bookId || null == channelId || null == adviserId || ListUtils.isEmpty(wechatUserIds)) {
+            LOGGER.error("参数缺失!");
+            return false;
+        }
+        Map<String, Object> paramMap = new HashMap<>();
+        paramMap.put("bookId", bookId);
+        paramMap.put("channelId", channelId);
+        paramMap.put("adviserId", adviserId);
+        paramMap.put("wechatUserIds", wechatUserIds);
+        return bookAuthUserDao.checkUserIsHaveAuth(paramMap);
+    }
+
     /**
      * 设置最近6月为空得书
      */

pcloud-service-book/src/main/java/com/pcloud/book/copyright/dao/BookAuthCodeDao.java

@@ -17,17 +17,17 @@ public interface BookAuthCodeDao extends BaseDao<BookAuthCode> {
     /**
      * 获取最大批次号
      */
-    Integer getMaxBatchNum(Long bookId, Long channelId, Long adviserId);
+    Integer getMaxBatchNum(Long bookId, Long channelId, Long adviserId, Integer authBookType);
 
     /**
      * 更新使用次数
      */
-    Integer updateUseCount(Long bookId, Long channelId, Long adviserId, String code, Integer codeUseCount);
+    Integer updateUseCount(Long bookId, Long channelId, Long adviserId, String code, Integer codeUseCount, Integer authBookType);
 
     /**
      * 获取码数量
      */
-    Boolean getIsHaveCode(Long bookId, Long channelId, Long adviserId, String code);
+    Boolean getIsHaveCode(Long bookId, Long channelId, Long adviserId, String code, Integer authBookType);
 
     /**
      * 批量删除正版授权码

pcloud-service-book/src/main/java/com/pcloud/book/copyright/dao/BookAuthInfoDao.java

@@ -27,7 +27,7 @@ public interface BookAuthInfoDao extends BaseDao<BookAuthInfo> {
     /**
      * 获取图书正版授权信息
      */
-    BookAuthInfoVO getInfoByBook(Long bookId, Long channelId, Long adviserId);
+    BookAuthInfoVO getInfoByBook(Long bookId, Long channelId, Long adviserId, Integer authBookType);
 
     /**
      * 更新图书版权状态

pcloud-service-book/src/main/java/com/pcloud/book/copyright/dao/BookAuthUserDao.java

@@ -18,7 +18,7 @@ public interface BookAuthUserDao extends BaseDao<BookAuthUser> {
     /**
      * 获取授权用户总数
      */
-    BookAuthCodeUserVO getAuthUserCount(Long bookId, Long channelId, Long adviserId);
+    BookAuthCodeUserVO getAuthUserCount(Long bookId, Long channelId, Long adviserId, Integer authBookType);
 
     /**
      * 30天趋势图
@@ -34,7 +34,7 @@ public interface BookAuthUserDao extends BaseDao<BookAuthUser> {
     /**
      * 校验是否已经授权
      */
-    Boolean getIsHaveAuth(Long bookId, Long channelId, Long adviserId, Long wechatUserId);
+    Boolean getIsHaveAuth(Long bookId, Long channelId, Long adviserId, Long wechatUserId, Integer authBookType);
 
     /**
      * 根据月份获取授权用户信息
@@ -50,4 +50,9 @@ public interface BookAuthUserDao extends BaseDao<BookAuthUser> {
      * 获取top10的图书
      */
     List<ProvinceTop10VO> listTop10ByBook(Map<String, Object> paramMap);
+
+    /**
+     * 校验用户是否授权
+     */
+    Boolean checkUserIsHaveAuth(Map<String, Object> paramMap);
 }

pcloud-service-book/src/main/java/com/pcloud/book/copyright/dao/impl/BookAuthCodeDaoImpl.java

@@ -19,32 +19,47 @@ import java.util.Map;
 public class BookAuthCodeDaoImpl extends BaseDaoImpl<BookAuthCode> implements BookAuthCodeDao {
 
     @Override
-    public Integer getMaxBatchNum(Long bookId, Long channelId, Long adviserId) {
+    public Integer getMaxBatchNum(Long bookId, Long channelId, Long adviserId, Integer authBookType) {
         Map<String,Object> paramMap = new HashMap<>();
         paramMap.put("bookId",bookId);
         paramMap.put("channelId",channelId);
         paramMap.put("adviserId",adviserId);
+        if(authBookType == null || authBookType.equals(0)) {
+            paramMap.put("isPaperBook", 1);
+        } else {
+            paramMap.put("isGroupBook", 1);
+        }
         return this.getSqlSession().selectOne(this.getStatement("getMaxBatchNum"), paramMap);
     }
 
     @Override
-    public Integer updateUseCount(Long bookId, Long channelId, Long adviserId, String code, Integer codeUseCount) {
+    public Integer updateUseCount(Long bookId, Long channelId, Long adviserId, String code, Integer codeUseCount, Integer authBookType) {
         Map<String,Object> paramMap = new HashMap<>();
         paramMap.put("bookId",bookId);
         paramMap.put("channelId",channelId);
         paramMap.put("adviserId",adviserId);
         paramMap.put("codeUseCount",codeUseCount);
         paramMap.put("code",code);
+        if(authBookType == null || authBookType.equals(0)) {
+            paramMap.put("isPaperBook", 1);
+        } else {
+            paramMap.put("isGroupBook", 1);
+        }
         return this.getSqlSession().update(this.getStatement("updateUseCount"), paramMap);
     }
 
     @Override
-    public Boolean getIsHaveCode(Long bookId, Long channelId, Long adviserId, String code) {
+    public Boolean getIsHaveCode(Long bookId, Long channelId, Long adviserId, String code, Integer authBookType) {
         Map<String,Object> paramMap = new HashMap<>();
         paramMap.put("bookId",bookId);
         paramMap.put("channelId",channelId);
         paramMap.put("adviserId",adviserId);
         paramMap.put("code",code);
+        if(authBookType == null || authBookType.equals(0)) {
+            paramMap.put("isPaperBook", 1);
+        } else {
+            paramMap.put("isGroupBook", 1);
+        }
         return this.getSqlSession().selectOne(this.getStatement("getIsHaveCode"), paramMap);
     }
 

pcloud-service-book/src/main/java/com/pcloud/book/copyright/dao/impl/BookAuthInfoDaoImpl.java

@@ -31,11 +31,18 @@ public class BookAuthInfoDaoImpl extends BaseDaoImpl<BookAuthInfo> implements Bo
     }
 
     @Override
-    public BookAuthInfoVO getInfoByBook(Long bookId, Long channelId, Long adviserId) {
+    public BookAuthInfoVO getInfoByBook(Long bookId, Long channelId, Long adviserId, Integer authBookType) {
         Map<String, Object> paramMap = new HashMap<>();
         paramMap.put("bookId", bookId);
         paramMap.put("channelId", channelId);
         paramMap.put("adviserId", adviserId);
+        if(authBookType == null || authBookType.equals(0)) {
+            paramMap.put("isPaperBook", 1);
+            paramMap.put("isGroupBook", 0);
+        } else {
+            paramMap.put("isPaperBook", 0);
+            paramMap.put("isGroupBook", 1);
+        }
         return this.getSqlSession().selectOne(this.getStatement("getInfoByBook"), paramMap);
     }
 

pcloud-service-book/src/main/java/com/pcloud/book/copyright/dao/impl/BookAuthUserDaoImpl.java

@@ -25,11 +25,16 @@ public class BookAuthUserDaoImpl extends BaseDaoImpl<BookAuthUser> implements Bo
      * 根据类型获取授权用户总数
      */
     @Override
-    public BookAuthCodeUserVO getAuthUserCount(Long bookId, Long channelId, Long adviserId) {
+    public BookAuthCodeUserVO getAuthUserCount(Long bookId, Long channelId, Long adviserId, Integer authBookType) {
         Map<String, Object> paramMap = new HashMap<>();
         paramMap.put("bookId", bookId);
         paramMap.put("channelId", channelId);
         paramMap.put("adviserId",adviserId);
+        if(authBookType == null || authBookType.equals(0)) {
+            paramMap.put("isPaperBook", 1);
+        } else {
+            paramMap.put("isGroupBook", 1);
+        }
         return this.getSqlSession().selectOne(this.getStatement("getAuthUserCount"), paramMap);
     }
 
@@ -44,12 +49,17 @@ public class BookAuthUserDaoImpl extends BaseDaoImpl<BookAuthUser> implements Bo
     }
 
     @Override
-    public Boolean getIsHaveAuth(Long bookId, Long channelId, Long adviserId, Long wechatUserId) {
+    public Boolean getIsHaveAuth(Long bookId, Long channelId, Long adviserId, Long wechatUserId, Integer authBookType) {
         Map<String, Object> paramMap = new HashMap<>();
         paramMap.put("bookId", bookId);
         paramMap.put("channelId", channelId);
         paramMap.put("adviserId",adviserId);
         paramMap.put("wechatUserId",wechatUserId);
+        if(authBookType == null || authBookType.equals(0)) {
+            paramMap.put("isPaperBook", 1);
+        } else {
+            paramMap.put("isGroupBook", 1);
+        }
         return this.getSqlSession().selectOne(this.getStatement("getIsHaveAuth"), paramMap);
     }
 
@@ -78,4 +88,9 @@ public class BookAuthUserDaoImpl extends BaseDaoImpl<BookAuthUser> implements Bo
         return this.getSqlSession().selectList(this.getStatement("listTop10ByBook"), paramMap);
     }
 
+    @Override
+    public Boolean checkUserIsHaveAuth(Map<String, Object> paramMap) {
+        return this.getSqlSession().selectOne(this.getStatement("checkUserIsHaveAuth"), paramMap);
+    }
+
 }

pcloud-service-book/src/main/java/com/pcloud/book/copyright/entity/BookAuthCode.java

@@ -51,6 +51,12 @@ public class BookAuthCode extends BaseEntity {
     @ApiModelProperty("最后修改时间")
     private Date lastModifiedDate;
 
+    @ApiModelProperty("是否是现代纸书")
+    private Integer isPaperBook;
+
+    @ApiModelProperty("是否是社群书")
+    private Integer isGroupBook;
+
     public String getFullCode() {
         return fullCode;
     }
@@ -157,6 +163,22 @@ public class BookAuthCode extends BaseEntity {
         this.lastModifiedDate = lastModifiedDate;
     }
 
+    public Integer getIsPaperBook() {
+        return isPaperBook;
+    }
+
+    public void setIsPaperBook(Integer isPaperBook) {
+        this.isPaperBook = isPaperBook;
+    }
+
+    public Integer getIsGroupBook() {
+        return isGroupBook;
+    }
+
+    public void setIsGroupBook(Integer isGroupBook) {
+        this.isGroupBook = isGroupBook;
+    }
+
     @Override
     public String toString() {
         return "BookAuthCode{" +
@@ -173,6 +195,8 @@ public class BookAuthCode extends BaseEntity {
                 ", createdDate=" + createdDate +
                 ", lastModifiedUser=" + lastModifiedUser +
                 ", lastModifiedDate=" + lastModifiedDate +
+                ", isPaperBook=" + isPaperBook +
+                ", isGroupBook=" + isGroupBook +
                 '}';
     }
 }

pcloud-service-book/src/main/java/com/pcloud/book/copyright/entity/BookAuthCodeImportRecord.java

@@ -4,6 +4,8 @@ import com.pcloud.common.entity.BaseEntity;
 
 import org.springframework.stereotype.Component;
 
+import io.swagger.annotations.ApiModelProperty;
+
 /**
  * @author lily
  * @date 2019/5/21 17:39
@@ -24,6 +26,12 @@ public class BookAuthCodeImportRecord extends BaseEntity {
 
     private Long createUser;
 
+    @ApiModelProperty("是否是现代纸书")
+    private Integer isPaperBook;
+
+    @ApiModelProperty("是否是社群书")
+    private Integer isGroupBook;
+
     public Long getBookId() {
         return bookId;
     }
@@ -82,6 +90,22 @@ public class BookAuthCodeImportRecord extends BaseEntity {
         this.id = id;
     }
 
+    public Integer getIsPaperBook() {
+        return isPaperBook;
+    }
+
+    public void setIsPaperBook(Integer isPaperBook) {
+        this.isPaperBook = isPaperBook;
+    }
+
+    public Integer getIsGroupBook() {
+        return isGroupBook;
+    }
+
+    public void setIsGroupBook(Integer isGroupBook) {
+        this.isGroupBook = isGroupBook;
+    }
+
     @Override
     public String toString() {
         return "BookAuthCodeImportRecord{" +
@@ -92,6 +116,8 @@ public class BookAuthCodeImportRecord extends BaseEntity {
                 ", fileName='" + fileName + '\'' +
                 ", fileUrl='" + fileUrl + '\'' +
                 ", createUser=" + createUser +
+                ", isPaperBook=" + isPaperBook +
+                ", isGroupBook=" + isGroupBook +
                 '}';
     }
 }

pcloud-service-book/src/main/java/com/pcloud/book/copyright/entity/BookAuthInfo.java

@@ -60,6 +60,13 @@ public class BookAuthInfo extends BaseEntity {
 
     @ApiModelProperty("最近关闭时间")
     private Date closeTime;
+
+    @ApiModelProperty("是否是现代纸书")
+    private Integer isPaperBook;
+
+    @ApiModelProperty("是否是社群书")
+    private Integer isGroupBook;
+
     @Override
     public Long getId() {
         return id;
@@ -190,6 +197,22 @@ public class BookAuthInfo extends BaseEntity {
         this.closeTime = closeTime;
     }
 
+    public Integer getIsPaperBook() {
+        return isPaperBook;
+    }
+
+    public void setIsPaperBook(Integer isPaperBook) {
+        this.isPaperBook = isPaperBook;
+    }
+
+    public Integer getIsGroupBook() {
+        return isGroupBook;
+    }
+
+    public void setIsGroupBook(Integer isGroupBook) {
+        this.isGroupBook = isGroupBook;
+    }
+
     @Override
     public String toString() {
         return "BookAuthInfo{" +
@@ -209,6 +232,8 @@ public class BookAuthInfo extends BaseEntity {
                 ", lastModifiedDate=" + lastModifiedDate +
                 ", openTime=" + openTime +
                 ", closeTime=" + closeTime +
+                ", isPaperBook=" + isPaperBook +
+                ", isGroupBook=" + isGroupBook +
                 '}';
     }
 }

pcloud-service-book/src/main/java/com/pcloud/book/copyright/entity/BookAuthOrder.java

@@ -45,6 +45,12 @@ public class BookAuthOrder extends BaseEntity {
     @ApiModelProperty("创建时间")
     private Date createdDate;
 
+    @ApiModelProperty("是否是现代纸书")
+    private Integer isPaperBook;
+
+    @ApiModelProperty("是否是社群书")
+    private Integer isGroupBook;
+
     @Override
     public Long getId() {
         return id;
@@ -135,6 +141,22 @@ public class BookAuthOrder extends BaseEntity {
         this.paymentSource = paymentSource;
     }
 
+    public Integer getIsPaperBook() {
+        return isPaperBook;
+    }
+
+    public void setIsPaperBook(Integer isPaperBook) {
+        this.isPaperBook = isPaperBook;
+    }
+
+    public Integer getIsGroupBook() {
+        return isGroupBook;
+    }
+
+    public void setIsGroupBook(Integer isGroupBook) {
+        this.isGroupBook = isGroupBook;
+    }
+
     @Override
     public String toString() {
         return "BookAuthOrder{" +
@@ -149,6 +171,8 @@ public class BookAuthOrder extends BaseEntity {
                 ", paymentSource=" + paymentSource +
                 ", createdUser=" + createdUser +
                 ", createdDate=" + createdDate +
+                ", isPaperBook=" + isPaperBook +
+                ", isGroupBook=" + isGroupBook +
                 '}';
     }
 }

pcloud-service-book/src/main/java/com/pcloud/book/copyright/entity/BookAuthUser.java

@@ -54,6 +54,12 @@ public class BookAuthUser extends BaseEntity {
     @ApiModelProperty("最后修改时间")
     private Date lastModifiedDate;
 
+    @ApiModelProperty("是否是现代纸书")
+    private Integer isPaperBook;
+
+    @ApiModelProperty("是否是社群书")
+    private Integer isGroupBook;
+
     @Override
     public Long getId() {
         return id;
@@ -168,6 +174,22 @@ public class BookAuthUser extends BaseEntity {
         this.city = city;
     }
 
+    public Integer getIsPaperBook() {
+        return isPaperBook;
+    }
+
+    public void setIsPaperBook(Integer isPaperBook) {
+        this.isPaperBook = isPaperBook;
+    }
+
+    public Integer getIsGroupBook() {
+        return isGroupBook;
+    }
+
+    public void setIsGroupBook(Integer isGroupBook) {
+        this.isGroupBook = isGroupBook;
+    }
+
     @Override
     public String toString() {
         return "BookAuthUser{" +
@@ -185,6 +207,8 @@ public class BookAuthUser extends BaseEntity {
                 ", createdDate=" + createdDate +
                 ", lastModifiedUser=" + lastModifiedUser +
                 ", lastModifiedDate=" + lastModifiedDate +
+                ", isPaperBook=" + isPaperBook +
+                ", isGroupBook=" + isGroupBook +
                 '}';
     }
 }

pcloud-service-book/src/main/java/com/pcloud/book/copyright/enums/AuthBookTypeEnum.java

+package com.pcloud.book.copyright.enums;
+
+public enum AuthBookTypeEnum {
+
+    /**
+     * 现代纸书
+     */
+    PAPER_BOOK(0),
+    /**
+     * 社群书
+     */
+    GROUP_BOOK(1);
+
+    public final Integer value;
+
+    AuthBookTypeEnum(Integer value) {
+        this.value = value;
+    }
+
+}

pcloud-service-book/src/main/java/com/pcloud/book/copyright/facade/BookAuthCodeFacade.java

@@ -49,7 +49,9 @@ public interface BookAuthCodeFacade {
 
     @ApiOperation(value = "授权码导入记录", httpMethod = "GET")
     @RequestMapping(value = "importCodeRecord", method = RequestMethod.GET)
-    ResponseDto<PageBeanNew<ImportRecordVO>> importCodeRecord(@RequestHeader("token") String token, @RequestParam("bookId") Long bookId, @RequestParam("channelId") Long channelId, @RequestParam("currentPage") Integer currenPage, @RequestParam("numPerPage") Integer numPerPage)
+    ResponseDto<PageBeanNew<ImportRecordVO>> importCodeRecord(@RequestHeader("token") String token, @RequestParam("bookId") Long bookId,
+                                                              @RequestParam("channelId") Long channelId, @RequestParam(value = "authBookType", required = false) Integer authBookType,
+                                                              @RequestParam("currentPage") Integer currenPage, @RequestParam("numPerPage") Integer numPerPage)
             throws PermissionException, BizException;
 
     @ApiOperation(value = "获取授权码列表", httpMethod = "GET")
@@ -59,6 +61,7 @@ public interface BookAuthCodeFacade {
                                                           @RequestParam("channelId") Long channelId,
                                                           @RequestParam(required = false,value = "keyword")String keyword,
                                                           @RequestParam(required = false,value = "state")Integer state,
+                                                          @RequestParam(required = false,value = "authBookType")Integer authBookType,
                                                           @RequestParam("currentPage") Integer currentPage,
                                                           @RequestParam("numPerPage") Integer numPerPage)
             throws PermissionException, BizException;
@@ -95,6 +98,7 @@ public interface BookAuthCodeFacade {
                                  @RequestParam(required = false, value ="bookId") Long bookId,
                                  @RequestParam(required = false, value ="codeIds") String codeIds,
                                  @RequestParam(required = false, value ="channelId") Long channelId,
-                                 @RequestParam(required = false, value ="status") Long status )
+                                 @RequestParam(required = false, value ="status") Long status,
+                                 @RequestParam(required = false,value = "authBookType")Integer authBookType)
             throws PermissionException, JsonParseException,BizException;
 }

pcloud-service-book/src/main/java/com/pcloud/book/copyright/facade/BookAuthInfoFacade.java

@@ -5,6 +5,7 @@ import com.pcloud.book.copyright.vo.BookAuthInfoVO;
 import com.pcloud.book.copyright.vo.BookAuthInfoWechatVO;
 import com.pcloud.book.copyright.vo.GetAuthInfoParam;
 import com.pcloud.book.copyright.vo.ListHaveAuthBookParam;
+import com.pcloud.book.copyright.vo.ListHaveAuthGroupBookParam;
 import com.pcloud.book.copyright.vo.SetAuthStatusParam;
 import com.pcloud.book.copyright.vo.SetAuthOpenParam;
 import com.pcloud.book.copyright.vo.SetLocationDescVO;
@@ -50,7 +51,8 @@ public interface BookAuthInfoFacade {
 
     @ApiOperation(value = "获取正版授权信息", httpMethod = "GET")
     @RequestMapping(value = "getInfoByBook", method = RequestMethod.GET)
-    ResponseDto<BookAuthInfoVO> getInfoByBook(@RequestHeader("token") String token, @RequestParam("bookId") Long bookId, @RequestParam("channelId") Long channelId)
+    ResponseDto<BookAuthInfoVO> getInfoByBook(@RequestHeader("token") String token, @RequestParam("bookId") Long bookId, @RequestParam("channelId") Long channelId,
+                                              @RequestParam(value = "authBookType", required = false) Integer authBookType)
             throws PermissionException, BizException;
 
     @ApiOperation(value = "获取正版授权信息(客户端)", httpMethod = "POST")
@@ -60,7 +62,8 @@ public interface BookAuthInfoFacade {
 
     @ApiOperation(value = "获取正版授权信息", httpMethod = "GET")
     @RequestMapping(value = "getInfoAndServesByBook", method = RequestMethod.GET)
-    ResponseDto<BookAuthInfoAndServesVO> getInfoAndServesByBook(@RequestHeader("token") String token, @RequestParam("bookId") Long bookId, @RequestParam("channelId") Long channelId)
+    ResponseDto<BookAuthInfoAndServesVO> getInfoAndServesByBook(@RequestHeader("token") String token, @RequestParam("bookId") Long bookId,
+                                                                @RequestParam("channelId") Long channelId, @RequestParam(value = "authBookType", required = false) Integer authBookType)
             throws PermissionException, BizException;
 
 
@@ -69,9 +72,15 @@ public interface BookAuthInfoFacade {
     ResponseDto<PageBeanNew> listHaveSetAuthBook(@RequestHeader("token") String token, @RequestBody ListHaveAuthBookParam listHaveAuthBookParam)
             throws PermissionException, BizException;
 
+    @ApiOperation(value = "获取设置过的版权保护社群书信息", httpMethod = "POST")
+    @RequestMapping(value = "listHaveSetAuthGroupBook", method = RequestMethod.POST)
+    ResponseDto<PageBeanNew> listHaveSetAuthGroupBook(@RequestHeader("token") String token, @RequestBody ListHaveAuthGroupBookParam listHaveAuthGroupBookParam)
+            throws PermissionException, BizException;
+
     @ApiOperation(value = "是否有可以导出的", httpMethod = "GET")
     @RequestMapping(value = "isHaveExport", method = RequestMethod.GET)
-    ResponseDto<Boolean> isHaveExport(@RequestHeader("token") String token, @RequestParam("bookId") Long bookId, @RequestParam("channelId") Long channelId)
+    ResponseDto<Boolean> isHaveExport(@RequestHeader("token") String token, @RequestParam("bookId") Long bookId,
+                                      @RequestParam("channelId") Long channelId)
             throws PermissionException, BizException;
 
 }

pcloud-service-book/src/main/java/com/pcloud/book/copyright/facade/BookAuthUserFacade.java

@@ -2,14 +2,14 @@ package com.pcloud.book.copyright.facade;
 
 import com.pcloud.book.copyright.vo.BookAuthCodeUserVO;
 import com.pcloud.book.copyright.vo.BookClickBuyRecordParam;
+import com.pcloud.book.copyright.vo.CheckUserParam;
 import com.pcloud.book.copyright.vo.ProvinceTop10VO;
 import com.pcloud.book.copyright.vo.SixMonthCountVO;
 import com.pcloud.book.copyright.vo.ThirtyDayCountVO;
 import com.pcloud.common.dto.ResponseDto;
 import com.pcloud.common.exceptions.BizException;
 import com.pcloud.common.permission.PermissionException;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+
 import org.springframework.web.bind.annotation.CookieValue;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -20,6 +20,9 @@ import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
 /**
  * @author lily
  * @date 2018/12/3 10:59
@@ -29,23 +32,28 @@ public interface BookAuthUserFacade {
 
     @ApiOperation(value = "获取正版授权总人数", httpMethod = "GET")
     @RequestMapping(value = "getAuthUserCount", method = RequestMethod.GET)
-    ResponseDto<BookAuthCodeUserVO> getAuthUserCount(@RequestHeader("token") String token, @RequestParam("bookId") Long bookId, @RequestParam("channelId") Long channelId)
+    ResponseDto<BookAuthCodeUserVO> getAuthUserCount(@RequestHeader("token") String token, @RequestParam("bookId") Long bookId,
+                                                     @RequestParam("channelId") Long channelId, @RequestParam(value = "authBookType", required = false) Integer authBookType)
             throws PermissionException, BizException;
 
     @ApiOperation(value = "获取30天趋势图", httpMethod = "GET")
     @RequestMapping(value = "listThirtyDay", method = RequestMethod.GET)
-    ResponseDto<List<ThirtyDayCountVO>> listThirtyDay(@RequestHeader("token") String token, @RequestParam("bookId") Long bookId, @RequestParam("channelId") Long channelId, @RequestParam(value = "province", required = false) String province)
+    ResponseDto<List<ThirtyDayCountVO>> listThirtyDay(@RequestHeader("token") String token, @RequestParam("bookId") Long bookId,
+                                                      @RequestParam("channelId") Long channelId, @RequestParam(value = "province", required = false) String province,
+                                                      @RequestParam(value = "authBookType", required = false) Integer authBookType)
             throws PermissionException, BizException;
 
 
     @ApiOperation(value = "6个月趋势图", httpMethod = "GET")
     @RequestMapping(value = "listSixMonth", method = RequestMethod.GET)
-    ResponseDto<List<SixMonthCountVO>> listSixMonth(@RequestHeader("token") String token, @RequestParam("bookId") Long bookId, @RequestParam("channelId") Long channelId, @RequestParam(value = "province", required = false) String province)
+    ResponseDto<List<SixMonthCountVO>> listSixMonth(@RequestHeader("token") String token, @RequestParam("bookId") Long bookId, @RequestParam("channelId") Long channelId,
+                                                    @RequestParam(value = "province", required = false) String province, @RequestParam(value = "authBookType", required = false) Integer authBookType)
             throws PermissionException, BizException;
 
     @ApiOperation(value = "省份排名前10(6个月/30天)", httpMethod = "GET")
     @RequestMapping(value = "listTop10ByBook", method = RequestMethod.GET)
-    ResponseDto<List<ProvinceTop10VO>> listTop10ByBook(@RequestHeader("token") String token, @RequestParam("bookId") Long bookId, @RequestParam("channelId") Long channelId, @RequestParam(value = "type", required = false) Integer type)
+    ResponseDto<List<ProvinceTop10VO>> listTop10ByBook(@RequestHeader("token") String token, @RequestParam("bookId") Long bookId, @RequestParam("channelId") Long channelId,
+                                                       @RequestParam(value = "type", required = false) Integer type)
             throws PermissionException, BizException;
 
 
@@ -53,4 +61,9 @@ public interface BookAuthUserFacade {
     @ApiOperation("新增点击购买链接记录")
     ResponseDto<?> insertClickBuyRecord(@CookieValue("userInfo") String userInfo, @RequestBody BookClickBuyRecordParam bookClickBuyRecordParam)
             throws BizException;
+
+    @PostMapping("checkIsHaveAuth")
+    @ApiOperation("校验用户是否授权过")
+    ResponseDto<?> checkIsHaveAuth(@CookieValue("userInfo") String userInfo, @RequestBody CheckUserParam checkUserParam)
+            throws BizException;
 }

pcloud-service-book/src/main/java/com/pcloud/book/copyright/facade/impl/BookAuthCodeFacadeImpl.java

@@ -81,9 +81,11 @@ public class BookAuthCodeFacadeImpl implements BookAuthCodeFacade {
 
     @Override
     @GetMapping("importCodeRecord")
-    public ResponseDto<PageBeanNew<ImportRecordVO>> importCodeRecord(@RequestHeader("token")String token, @RequestParam("bookId") Long bookId, @RequestParam("channelId") Long channelId, @RequestParam("currentPage") Integer currenPage, @RequestParam("numPerPage") Integer numPerPage) throws PermissionException, BizException {
+    public ResponseDto<PageBeanNew<ImportRecordVO>> importCodeRecord(@RequestHeader("token")String token, @RequestParam("bookId") Long bookId,
+                                                                     @RequestParam("channelId") Long channelId, @RequestParam(value = "authBookType", required = false) Integer authBookType,
+                                                                     @RequestParam("currentPage") Integer currenPage, @RequestParam("numPerPage") Integer numPerPage) throws PermissionException, BizException {
         Long adviserId = (Long) SessionUtil.getVlaue(token, SessionUtil.PARTY_ID);
-        PageBeanNew<ImportRecordVO> pageBean = bookAuthCodeBiz.importCodeRecord(bookId, channelId, adviserId, currenPage, numPerPage);
+        PageBeanNew<ImportRecordVO> pageBean = bookAuthCodeBiz.importCodeRecord(bookId, channelId, adviserId, authBookType, currenPage, numPerPage);
         return new ResponseDto<>(pageBean);
     }
 
@@ -94,6 +96,7 @@ public class BookAuthCodeFacadeImpl implements BookAuthCodeFacade {
                                                                  @RequestParam(required = false,value = "channelId")Long channelId,
                                                                  @RequestParam(required = false,value = "keyword")String keyword,
                                                                  @RequestParam(required = false,value = "state")Integer state,
+                                                                 @RequestParam(required = false,value = "authBookType")Integer authBookType,
                                                                  @RequestParam(required = false,value = "currentPage")Integer currentPage,
                                                                  @RequestParam(required = false,value = "numPerPage")Integer numPerPage) throws PermissionException, BizException {
         Long adviserId = (Long) SessionUtil.getVlaue(token, SessionUtil.PARTY_ID);
@@ -104,7 +107,7 @@ public class BookAuthCodeFacadeImpl implements BookAuthCodeFacade {
             throw new BookBizException(BookBizException.PARAM_IS_ERROR,"参数有误！");
         }
         PageParam pageParam = new PageParam(currentPage,numPerPage);
-        return new ResponseDto<>(bookAuthCodeBiz.getCodeList(bookId,channelId,adviserId,keyword,state,pageParam));
+        return new ResponseDto<>(bookAuthCodeBiz.getCodeList(bookId,channelId,adviserId,keyword,state, authBookType, pageParam));
     }
 
     /**
@@ -131,7 +134,8 @@ public class BookAuthCodeFacadeImpl implements BookAuthCodeFacade {
                                      @RequestParam(required = false, value ="bookId") Long bookId,
                                      @RequestParam(required = false, value ="codeIds") String codeIds,
                                      @RequestParam(required = false, value ="channelId") Long channelId,
-                                     @RequestParam(required = false, value ="status") Long status )
+                                     @RequestParam(required = false, value ="status") Long status,
+                                     @RequestParam(required = false,value = "authBookType")Integer authBookType)
             throws PermissionException, JsonParseException, BizException {
         String systemCode = (String) SessionUtil.getVlaue(token, SessionUtil.SYSTEM_CODE);
         Long partyId = (Long) SessionUtil.getVlaue(token, SessionUtil.PARTY_ID);
@@ -139,7 +143,7 @@ public class BookAuthCodeFacadeImpl implements BookAuthCodeFacade {
         if (null == status || null == bookId || null == channelId) {
             throw new BookBizException(BookBizException.PARAM_IS_ERROR, "参数错误");
         }
-        Map<String, Object> map = bookAuthCodeBiz.getCodeExcel(bookId,codeIds, channelId, status, systemCode, partyId);
+        Map<String, Object> map = bookAuthCodeBiz.getCodeExcel(bookId,codeIds, channelId, status, systemCode, partyId, authBookType);
         return new ResponseDto<>(map);
     }
 }

pcloud-service-book/src/main/java/com/pcloud/book/copyright/facade/impl/BookAuthInfoFacadeImpl.java

@@ -7,6 +7,7 @@ import com.pcloud.book.copyright.vo.BookAuthInfoVO;
 import com.pcloud.book.copyright.vo.BookAuthInfoWechatVO;
 import com.pcloud.book.copyright.vo.GetAuthInfoParam;
 import com.pcloud.book.copyright.vo.ListHaveAuthBookParam;
+import com.pcloud.book.copyright.vo.ListHaveAuthGroupBookParam;
 import com.pcloud.book.copyright.vo.SetAuthStatusParam;
 import com.pcloud.book.copyright.vo.SetAuthOpenParam;
 import com.pcloud.book.copyright.vo.SetLocationDescVO;
@@ -23,6 +24,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -71,9 +73,10 @@ public class BookAuthInfoFacadeImpl implements BookAuthInfoFacade {
 
     @Override
     @GetMapping("getInfoByBook")
-    public ResponseDto<BookAuthInfoVO> getInfoByBook(@RequestHeader("token") String token, @RequestParam("bookId") Long bookId, @RequestParam("channelId") Long channelId) throws PermissionException, BizException {
+    public ResponseDto<BookAuthInfoVO> getInfoByBook(@RequestHeader("token") String token, @RequestParam("bookId") Long bookId, @RequestParam("channelId") Long channelId,
+                                                     @RequestParam(value = "authBookType", required = false)  Integer authBookType) throws PermissionException, BizException {
         Long adviserId = (Long) SessionUtil.getVlaue(token, SessionUtil.PARTY_ID);
-        BookAuthInfoVO bookAuthInfoVO = bookAuthInfoBiz.getInfoByBook(bookId, channelId, adviserId);
+        BookAuthInfoVO bookAuthInfoVO = bookAuthInfoBiz.getInfoByBook(bookId, channelId, adviserId, authBookType);
         return new ResponseDto<>(bookAuthInfoVO);
     }
 
@@ -87,9 +90,10 @@ public class BookAuthInfoFacadeImpl implements BookAuthInfoFacade {
 
     @Override
     @GetMapping("getInfoAndServesByBook")
-    public ResponseDto<BookAuthInfoAndServesVO> getInfoAndServesByBook(@RequestHeader("token") String token, @RequestParam("bookId") Long bookId, @RequestParam("channelId") Long channelId) throws PermissionException, BizException {
+    public ResponseDto<BookAuthInfoAndServesVO> getInfoAndServesByBook(@RequestHeader("token") String token, @RequestParam("bookId") Long bookId,
+                                                                       @RequestParam("channelId") Long channelId, @RequestParam(value = "authBookType", required = false)  Integer authBookType) throws PermissionException, BizException {
         Long adviserId = (Long) SessionUtil.getVlaue(token, SessionUtil.PARTY_ID);
-        BookAuthInfoAndServesVO bookAuthInfoAndServesVO = bookAuthInfoBiz.getInfoAndServesByBook(bookId, channelId, adviserId);
+        BookAuthInfoAndServesVO bookAuthInfoAndServesVO = bookAuthInfoBiz.getInfoAndServesByBook(bookId, channelId, adviserId, authBookType);
         return new ResponseDto<>(bookAuthInfoAndServesVO);
     }
 
@@ -103,6 +107,15 @@ public class BookAuthInfoFacadeImpl implements BookAuthInfoFacade {
     }
 
     @Override
+    @RequestMapping(value = "listHaveSetAuthGroupBook", method = RequestMethod.POST)
+    public ResponseDto<PageBeanNew> listHaveSetAuthGroupBook(@RequestHeader("token") String token, @RequestBody ListHaveAuthGroupBookParam listHaveAuthGroupBookParam)
+            throws PermissionException, BizException {
+        Long adviserId = (Long) SessionUtil.getVlaue(token, SessionUtil.PARTY_ID);
+        PageBeanNew pageBeanNew = bookAuthInfoBiz.listHaveSetAuthGroupBook(listHaveAuthGroupBookParam, adviserId) ;
+        return new ResponseDto<>(pageBeanNew);
+    }
+
+    @Override
     @GetMapping("isHaveExport")
     public ResponseDto<Boolean> isHaveExport(@RequestHeader("token") String token, @RequestParam("bookId") Long bookId, @RequestParam("channelId") Long channelId)
             throws PermissionException, BizException {

pcloud-service-book/src/main/java/com/pcloud/book/copyright/facade/impl/BookAuthUserFacadeImpl.java

@@ -4,6 +4,7 @@ import com.pcloud.book.copyright.biz.BookAuthUserBiz;
 import com.pcloud.book.copyright.facade.BookAuthUserFacade;
 import com.pcloud.book.copyright.vo.BookAuthCodeUserVO;
 import com.pcloud.book.copyright.vo.BookClickBuyRecordParam;
+import com.pcloud.book.copyright.vo.CheckUserParam;
 import com.pcloud.book.copyright.vo.ProvinceTop10VO;
 import com.pcloud.book.copyright.vo.SixMonthCountVO;
 import com.pcloud.book.copyright.vo.ThirtyDayCountVO;
@@ -38,28 +39,30 @@ public class BookAuthUserFacadeImpl implements BookAuthUserFacade {
     @Override
     @ApiOperation(value = "获取正版授权总人数", httpMethod = "GET")
     @RequestMapping(value = "getAuthUserCount", method = RequestMethod.GET)
-    public ResponseDto<BookAuthCodeUserVO> getAuthUserCount(@RequestHeader("token") String token, @RequestParam("bookId") Long bookId, @RequestParam("channelId") Long channelId) throws PermissionException, BizException {
+    public ResponseDto<BookAuthCodeUserVO> getAuthUserCount(@RequestHeader("token") String token, @RequestParam("bookId") Long bookId,
+                                                            @RequestParam("channelId") Long channelId, @RequestParam(value = "authBookType", required = false) Integer authBookType) throws PermissionException, BizException {
         Long adviserId = (Long) SessionUtil.getVlaue(token, SessionUtil.PARTY_ID);
-        BookAuthCodeUserVO bookAuthCodeUserVO = bookAuthUserBiz.getAuthUserCount(bookId, channelId, adviserId);
+        BookAuthCodeUserVO bookAuthCodeUserVO = bookAuthUserBiz.getAuthUserCount(bookId, channelId, adviserId, authBookType);
         return new ResponseDto<>(bookAuthCodeUserVO);
     }
 
     @Override
     @RequestMapping(value = "listThirtyDay", method = RequestMethod.GET)
     public ResponseDto<List<ThirtyDayCountVO>> listThirtyDay(@RequestHeader("token") String token, @RequestParam("bookId") Long bookId, @RequestParam("channelId") Long channelId
-            , @RequestParam(value = "province", required = false) String province) throws PermissionException, BizException {
+            , @RequestParam(value = "province", required = false) String province, @RequestParam(value = "authBookType", required = false) Integer authBookType)
+            throws PermissionException, BizException {
         Long adviserId = (Long) SessionUtil.getVlaue(token, SessionUtil.PARTY_ID);
-        List<ThirtyDayCountVO> thirtyDayCountVOS = bookAuthUserBiz.listThirtyDay(bookId, channelId, adviserId, province);
+        List<ThirtyDayCountVO> thirtyDayCountVOS = bookAuthUserBiz.listThirtyDay(bookId, channelId, adviserId, province, authBookType);
         return new ResponseDto<>(thirtyDayCountVOS);
     }
 
     @Override
     @RequestMapping(value = "listSixMonth", method = RequestMethod.GET)
     public ResponseDto<List<SixMonthCountVO>> listSixMonth(@RequestHeader("token") String token, @RequestParam("bookId") Long bookId, @RequestParam("channelId") Long channelId
-            , @RequestParam(value = "province", required = false) String province)
+            , @RequestParam(value = "province", required = false) String province, @RequestParam(value = "authBookType", required = false) Integer authBookType)
             throws PermissionException, BizException{
         Long adviserId = (Long) SessionUtil.getVlaue(token, SessionUtil.PARTY_ID);
-        List<SixMonthCountVO> sixMonthCountVOS = bookAuthUserBiz.listSixMonth(bookId, channelId, adviserId, province);
+        List<SixMonthCountVO> sixMonthCountVOS = bookAuthUserBiz.listSixMonth(bookId, channelId, adviserId, province, authBookType);
         return new ResponseDto<>(sixMonthCountVOS);
     }
 
@@ -79,4 +82,18 @@ public class BookAuthUserFacadeImpl implements BookAuthUserFacade {
         bookAuthUserBiz.insertClickBuyRecord(bookClickBuyRecordParam, channelId, wechatUserId);
         return new ResponseDto<>();
     }
+
+    @PostMapping("checkIsHaveAuth")
+    public ResponseDto<?> checkIsHaveAuth(@CookieValue("userInfo") String userInfo, @RequestBody CheckUserParam checkUserParam)
+            throws  BizException{
+        Long bookId = checkUserParam.getBookId();
+        Long adviserId = checkUserParam.getAdviserId();
+        Long channelId = checkUserParam.getChannelId();
+        if(null == channelId) {
+            channelId = Cookie.getId(userInfo, Cookie._CHANNEL_ID);
+        }
+        Long wechatUserId = Cookie.getId(userInfo, Cookie._WECHAT_USER_ID);
+        Boolean result = bookAuthUserBiz.checkIsHaveAuth(bookId, channelId, adviserId, wechatUserId, 1);
+        return new ResponseDto<>(result);
+    }
 }

pcloud-service-book/src/main/java/com/pcloud/book/copyright/service/impl/BookAuthInfoServiceImpl.java

 package com.pcloud.book.copyright.service.impl;
 
 import com.pcloud.book.copyright.biz.BookAuthInfoBiz;
+import com.pcloud.book.copyright.biz.BookAuthUserBiz;
 import com.pcloud.book.copyright.dto.BookAuthInfoCountDTO;
 import com.pcloud.book.copyright.dto.BookAuthTotalCountDTO;
+import com.pcloud.book.copyright.dto.CheckUserAuthDTO;
 import com.pcloud.book.copyright.service.BookAuthInfoService;
 import com.pcloud.common.dto.ResponseDto;
 import com.pcloud.common.exceptions.BizException;
@@ -27,17 +29,20 @@ import java.util.List;
 public class BookAuthInfoServiceImpl implements BookAuthInfoService {
     @Autowired
     private BookAuthInfoBiz bookAuthInfoBiz;
+    @Autowired
+    private BookAuthUserBiz bookAuthUserBiz;
 
     @Override
     @RequestMapping(value = "/getBookAuthPrice", method = RequestMethod.GET)
     public ResponseEntity<ResponseDto<BigDecimal>> getBookAuthPrice(@RequestParam("bookId") Long bookId,
          @RequestParam("channelId")Long channelId, @RequestParam("adviserId")Long adviserId) throws BizException {
-        return ResponseHandleUtil.toResponse(bookAuthInfoBiz.getBookAuthPrice(bookId, channelId, adviserId));
+        return ResponseHandleUtil.toResponse(bookAuthInfoBiz.getBookAuthPrice(bookId, channelId, adviserId, null));
     }
 
     @Override
     @RequestMapping(value = "/getBookAuthInfoCount", method = RequestMethod.GET)
-    public ResponseEntity<ResponseDto<BookAuthInfoCountDTO>> getBookAuthInfoCount(@RequestParam("bookId") Long bookId, @RequestParam("channelId") Long channelId, @RequestParam("adviserId") Long adviserId, @RequestParam(value = "monthDate", required = false) String monthDate) throws BizException {
+    public ResponseEntity<ResponseDto<BookAuthInfoCountDTO>> getBookAuthInfoCount(@RequestParam("bookId") Long bookId, @RequestParam("channelId") Long channelId,
+                                                                                  @RequestParam("adviserId") Long adviserId, @RequestParam(value = "monthDate", required = false) String monthDate) throws BizException {
         BookAuthInfoCountDTO bookAuthInfoCountDTO = bookAuthInfoBiz.getBookAuthInfoCount(bookId, channelId, adviserId, monthDate);
         return ResponseHandleUtil.toResponse(bookAuthInfoCountDTO);
     }
@@ -55,4 +60,17 @@ public class BookAuthInfoServiceImpl implements BookAuthInfoService {
         BookAuthTotalCountDTO bookAuthTotalCountDTO = bookAuthInfoBiz.getBookAuthTotalCount(adviserIds);
         return ResponseHandleUtil.toResponse(bookAuthTotalCountDTO);
     }
+
+    @Override
+    @RequestMapping(value = "/checkUserIsHaveAuth", method = RequestMethod.POST)
+    public ResponseEntity<ResponseDto<Boolean>> checkUserIsHaveAuth(@RequestBody CheckUserAuthDTO checkUserAuthDTO) throws BizException {
+        return ResponseHandleUtil.toResponse(bookAuthUserBiz.checkUserIsHaveAuth(checkUserAuthDTO));
+    }
+
+    @Override
+    @RequestMapping(value = "/getGroupBookAuthPrice", method = RequestMethod.GET)
+    public ResponseEntity<ResponseDto<BigDecimal>> getGroupBookAuthPrice(@RequestParam("bookId") Long bookId,
+                                                                    @RequestParam("channelId")Long channelId, @RequestParam("adviserId")Long adviserId) throws BizException {
+        return ResponseHandleUtil.toResponse(bookAuthInfoBiz.getBookAuthPrice(bookId, channelId, adviserId, 1));
+    }
 }

pcloud-service-book/src/main/java/com/pcloud/book/copyright/vo/CheckCodeParam.java

@@ -30,6 +30,9 @@ public class CheckCodeParam implements Serializable {
     @ApiModelProperty("运营标识")
     private Long channelId;
 
+    @ApiModelProperty("书刊类型：0-现代纸书 1-社群书")
+    private Integer authBookType;
+
     public Long getChannelId() {
         return channelId;
     }
@@ -69,6 +72,14 @@ public class CheckCodeParam implements Serializable {
         this.adviserId = adviserId;
     }
 
+    public Integer getAuthBookType() {
+        return authBookType;
+    }
+
+    public void setAuthBookType(Integer authBookType) {
+        this.authBookType = authBookType;
+    }
+
     @Override
     public String toString() {
         return "CheckCodeParam{" +
@@ -76,6 +87,8 @@ public class CheckCodeParam implements Serializable {
                 ", sceneId=" + sceneId +
                 ", bookId=" + bookId +
                 ", adviserId=" + adviserId +
+                ", channelId=" + channelId +
+                ", authBookType=" + authBookType +
                 '}';
     }
 }

pcloud-service-book/src/main/java/com/pcloud/book/copyright/vo/CheckUserParam.java

+package com.pcloud.book.copyright.vo;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+import java.io.Serializable;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * @author lily
+ * @date 2018/12/5 14:08
+ */
+@ApiModel
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class CheckUserParam implements Serializable {
+
+    @ApiModelProperty("图书标识")
+    private Long bookId;
+
+    @ApiModelProperty("编辑标识")
+    private Long adviserId;
+
+    @ApiModelProperty("运营标识")
+    private Long channelId;
+
+    public Long getChannelId() {
+        return channelId;
+    }
+
+    public void setChannelId(Long channelId) {
+        this.channelId = channelId;
+    }
+
+    public Long getBookId() {
+        return bookId;
+    }
+
+    public void setBookId(Long bookId) {
+        this.bookId = bookId;
+    }
+
+    public Long getAdviserId() {
+        return adviserId;
+    }
+
+    public void setAdviserId(Long adviserId) {
+        this.adviserId = adviserId;
+    }
+
+
+    @Override
+    public String toString() {
+        return "CheckCodeParam{" +
+                ", bookId=" + bookId +
+                ", adviserId=" + adviserId +
+                ", channelId=" + channelId +
+                '}';
+    }
+}

pcloud-service-book/src/main/java/com/pcloud/book/copyright/vo/FileVO.java

@@ -15,6 +15,8 @@ public class FileVO implements Serializable {
 
     private String fileName;
 
+    private Integer authBookType;
+
     public String getFileName() {
         return fileName;
     }
@@ -47,12 +49,22 @@ public class FileVO implements Serializable {
         this.fileUrl = fileUrl;
     }
 
+    public Integer getAuthBookType() {
+        return authBookType;
+    }
+
+    public void setAuthBookType(Integer authBookType) {
+        this.authBookType = authBookType;
+    }
+
     @Override
     public String toString() {
         return "FileVO{" +
                 "fileUrl='" + fileUrl + '\'' +
                 ", bookId=" + bookId +
                 ", channelId=" + channelId +
+                ", fileName='" + fileName + '\'' +
+                ", authBookType=" + authBookType +
                 '}';
     }
 }

pcloud-service-book/src/main/java/com/pcloud/book/copyright/vo/GetAuthInfoParam.java

@@ -22,6 +22,9 @@ public class GetAuthInfoParam implements Serializable {
     @ApiModelProperty("编辑标识")
     private Long adviserId;
 
+    @ApiModelProperty("书刊类型：0-现代纸书 1-社群书")
+    private Integer authBookType;
+
     public Long getSceneId() {
         return sceneId;
     }
@@ -46,12 +49,21 @@ public class GetAuthInfoParam implements Serializable {
         this.adviserId = adviserId;
     }
 
+    public Integer getAuthBookType() {
+        return authBookType;
+    }
+
+    public void setAuthBookType(Integer authBookType) {
+        this.authBookType = authBookType;
+    }
+
     @Override
     public String toString() {
         return "GetAuthInfoParam{" +
                 "sceneId=" + sceneId +
                 ", bookId=" + bookId +
                 ", adviserId=" + adviserId +
+                ", authBookType=" + authBookType +
                 '}';
     }
 }

pcloud-service-book/src/main/java/com/pcloud/book/copyright/vo/ListHaveAuthGroupBookParam.java

+package com.pcloud.book.copyright.vo;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+import java.io.Serializable;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * @author lihao
+ * @date 2018/8/26 14:27
+ */
+@ApiModel
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class ListHaveAuthGroupBookParam implements Serializable {
+
+    @ApiModelProperty("isbn/issn/图书名称")
+    private String name;
+
+    @ApiModelProperty("运营标识")
+    private Long channelId;
+
+    @ApiModelProperty("图书类型标识")
+    private Long templetId;
+
+    @ApiModelProperty("第二级图书类型标识")
+    private Long secondTempletId;
+
+    @ApiModelProperty("当前页")
+    private Integer currentPage;
+
+    @ApiModelProperty("每页条数")
+    private Integer numPerPage;
+
+    @ApiModelProperty("类型")
+    private String typeCode;
+
+    @ApiModelProperty("社群书状态")
+    private Integer bookStatus;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Long getChannelId() {
+        return channelId;
+    }
+
+    public void setChannelId(Long channelId) {
+        this.channelId = channelId;
+    }
+
+    public Long getTempletId() {
+        return templetId;
+    }
+
+    public void setTempletId(Long templetId) {
+        this.templetId = templetId;
+    }
+
+    public Long getSecondTempletId() {
+        return secondTempletId;
+    }
+
+    public void setSecondTempletId(Long secondTempletId) {
+        this.secondTempletId = secondTempletId;
+    }
+
+    public Integer getCurrentPage() {
+        return currentPage;
+    }
+
+    public void setCurrentPage(Integer currentPage) {
+        this.currentPage = currentPage;
+    }
+
+    public Integer getNumPerPage() {
+        return numPerPage;
+    }
+
+    public void setNumPerPage(Integer numPerPage) {
+        this.numPerPage = numPerPage;
+    }
+
+    public String getTypeCode() {
+        return typeCode;
+    }
+
+    public void setTypeCode(String typeCode) {
+        this.typeCode = typeCode;
+    }
+
+    public Integer getBookStatus() {
+        return bookStatus;
+    }
+
+    public void setBookStatus(Integer bookStatus) {
+        this.bookStatus = bookStatus;
+    }
+
+    @Override
+    public String toString() {
+        return "ListHaveAuthGroupBookParam{" +
+                "name='" + name + '\'' +
+                ", channelId=" + channelId +
+                ", templetId=" + templetId +
+                ", secondTempletId=" + secondTempletId +
+                ", currentPage=" + currentPage +
+                ", numPerPage=" + numPerPage +
+                ", typeCode='" + typeCode + '\'' +
+                ", bookStatus=" + bookStatus +
+                '}';
+    }
+}

pcloud-service-book/src/main/java/com/pcloud/book/copyright/vo/SetAuthOpenParam.java

@@ -46,6 +46,9 @@ public class SetAuthOpenParam implements Serializable {
     @ApiModelProperty("是否包含条形码  C1001121 添加二维码，故该字段2为二维码")
     private Integer isHaveBarCode;
 
+    @ApiModelProperty("书刊类型：0-现代纸书 1-社群书")
+    private Integer authBookType;
+
     public List<ServeVO> getServes() {
         return serves;
     }
@@ -126,9 +129,17 @@ public class SetAuthOpenParam implements Serializable {
         this.isHaveBarCode = isHaveBarCode;
     }
 
+    public Integer getAuthBookType() {
+        return authBookType;
+    }
+
+    public void setAuthBookType(Integer authBookType) {
+        this.authBookType = authBookType;
+    }
+
     @Override
     public String toString() {
-        return "SetAuthOpenVO{" +
+        return "SetAuthOpenParam{" +
                 "bookId=" + bookId +
                 ", channelId=" + channelId +
                 ", price=" + price +
@@ -138,6 +149,8 @@ public class SetAuthOpenParam implements Serializable {
                 ", bookStatus=" + bookStatus +
                 ", checkType=" + checkType +
                 ", serves=" + serves +
+                ", isHaveBarCode=" + isHaveBarCode +
+                ", authBookType=" + authBookType +
                 '}';
     }
 }

pcloud-service-book/src/main/java/com/pcloud/book/copyright/vo/SetAuthStatusParam.java

@@ -25,6 +25,9 @@ public class SetAuthStatusParam implements Serializable {
     @ApiModelProperty("图书状态")
     private Integer bookStatus;
 
+    @ApiModelProperty("书刊类型：0-现代纸书 1-社群书")
+    private Integer authBookType;
+
     public Integer getBookStatus() {
         return bookStatus;
     }
@@ -49,12 +52,21 @@ public class SetAuthStatusParam implements Serializable {
         this.channelId = channelId;
     }
 
+    public Integer getAuthBookType() {
+        return authBookType;
+    }
+
+    public void setAuthBookType(Integer authBookType) {
+        this.authBookType = authBookType;
+    }
+
     @Override
     public String toString() {
         return "SetAuthStatusParam{" +
                 "bookId=" + bookId +
                 ", channelId=" + channelId +
                 ", bookStatus=" + bookStatus +
+                ", authBookType=" + authBookType +
                 '}';
     }
 }

pcloud-service-book/src/main/java/com/pcloud/book/copyright/vo/SetLocationDescVO.java

@@ -23,6 +23,9 @@ public class SetLocationDescVO implements Serializable {
     @ApiModelProperty("位置描述")
     private String locationDesc;
 
+    @ApiModelProperty("书刊类型：0-现代纸书 1-社群书")
+    private Integer authBookType;
+
     public Long getBookId() {
         return bookId;
     }
@@ -47,12 +50,21 @@ public class SetLocationDescVO implements Serializable {
         this.locationDesc = locationDesc;
     }
 
+    public Integer getAuthBookType() {
+        return authBookType;
+    }
+
+    public void setAuthBookType(Integer authBookType) {
+        this.authBookType = authBookType;
+    }
+
     @Override
     public String toString() {
-        return "SetLocationDesc{" +
+        return "SetLocationDescVO{" +
                 "bookId=" + bookId +
                 ", channelId=" + channelId +
                 ", locationDesc='" + locationDesc + '\'' +
+                ", authBookType=" + authBookType +
                 '}';
     }
 }

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

@@ -10,6 +10,7 @@ import com.pcloud.book.consumer.resource.ProductConsr;
 import com.pcloud.book.consumer.settlement.SettlementConsr;
 import com.pcloud.book.consumer.trade.TradeConsr;
 import com.pcloud.book.consumer.wechatgroup.WechatGroupConsr;
+import com.pcloud.book.copyright.biz.BookAuthUserBiz;
 import com.pcloud.book.group.biz.BookGroupBiz;
 import com.pcloud.book.group.biz.BookGroupClassifyBiz;
 import com.pcloud.book.group.biz.GroupAnnouncementBiz;
@@ -146,6 +147,9 @@ public class BookGroupClassifyBizImpl implements BookGroupClassifyBiz {
     @Autowired
     private JoinGroupCipherDao joinGroupCipherDao;
 
+    @Autowired
+    private BookAuthUserBiz bookAuthUserBiz;
+
 
     @Override
     @ParamLog("新增分类")
@@ -544,10 +548,14 @@ public class BookGroupClassifyBizImpl implements BookGroupClassifyBiz {
             throw new BookBizException(BookBizException.PARAM_IS_NULL, "社群码不存在，请刷新后重试");
         }
         if (new BigDecimal(0).compareTo(classify.getPrice()) < 0) {
-            //校验用户是否购买
-            Boolean isBuy = bookClassifyBuyRecordDao.checkUserBuy(wechatUserId, classifyId);
-            if (!isBuy) {
-                throw new BookBizException(BookBizException.PARAM_IS_NULL, "您还未购买，请购买后使用！");
+            //校验用户是否正版授权
+            Boolean isAuth = bookAuthUserBiz.checkIsHaveAuth(classify.getBookId(), classify.getChannelId(), classify.getCreateUser(), wechatUserId, 1);
+            if(!isAuth) {
+                //校验用户是否购买
+                Boolean isBuy = bookClassifyBuyRecordDao.checkUserBuy(wechatUserId, classifyId);
+                if (!isBuy) {
+                    throw new BookBizException(BookBizException.PARAM_IS_NULL, "您还未购买，请购买后使用！");
+                }
             }
         }
 

pcloud-service-book/src/main/java/com/pcloud/book/group/vo/ClassifyVO.java

@@ -51,6 +51,9 @@ public class ClassifyVO implements Serializable {
     @ApiModelProperty("排序")
     private Integer rank;
 
+    @ApiModelProperty("创建人")
+    private Long createUser;
+
     public Integer getRank() {
         return rank;
     }
@@ -147,6 +150,14 @@ public class ClassifyVO implements Serializable {
         this.productSpecId = productSpecId;
     }
 
+    public Long getCreateUser() {
+        return createUser;
+    }
+
+    public void setCreateUser(Long createUser) {
+        this.createUser = createUser;
+    }
+
     @Override
     public String toString() {
         return "ClassifyVO{" +
@@ -162,6 +173,7 @@ public class ClassifyVO implements Serializable {
                 ", productId=" + productId +
                 ", productSpecId=" + productSpecId +
                 ", rank=" + rank +
+                ", createUser=" + createUser +
                 '}';
     }
 }

pcloud-service-book/src/main/resources/mapper/book/Book.Mapper.xml

@@ -1640,7 +1640,7 @@
 		LEFT JOIN
 			BOOK_FUND BF ON BF.BOOK_ID = A.BOOK_ID AND BF.END_TIME <![CDATA[ > ]]> NOW()  AND BF.START_TIME <![CDATA[ < ]]> NOW()
 		</if>
-		LEFT JOIN book_auth_info I ON I.BOOK_ID = B.BOOK_ID AND I.ADVISER_ID = #{adviserId}
+		LEFT JOIN book_auth_info I ON I.BOOK_ID = B.BOOK_ID AND I.ADVISER_ID = #{adviserId} AND I.is_paper_book = 1
 		WHERE
 		I.ID IS NULL
 		<if test="typeCode!=null">
@@ -1679,4 +1679,59 @@
 		A.LAST_MODIFIED_DATE DESC , A.BOOK_ADVISER_ID DESC
 	</select>
 
+	<select id="listNoAuthGroupBook" resultType="noAuthBookVO" parameterType="map">
+		SELECT
+			A.book_id AS bookId,
+			A.channel_id AS channelId,
+			A.adviser_id AS adviserId,
+			B.type_code AS typeCode,
+			T.type_name AS typeName,
+			B.isbn,
+			B.book_name AS bookName,
+			B.cover_img AS coverImg,
+			B.serial_number AS serialNumber,
+			A.templet_id AS templetId
+		FROM
+			book_group G
+		INNER JOIN book B ON G.book_id = B.book_id
+			AND G.create_user = #{adviserId}
+			AND G.is_delete = 0
+			AND B.is_delete = 0
+		INNER JOIN BOOK_ADVISER A ON A.BOOK_ID = B.BOOK_ID
+			AND A.ADVISER_ID = #{adviserId}
+			AND A.IS_DELETE = 0
+			AND B.IS_DELETE = 0
+		LEFT JOIN BOOK_TYPE T ON B.TYPE_CODE = T.TYPE_CODE
+		LEFT JOIN book_auth_info I ON I.BOOK_ID = B.BOOK_ID
+			AND I.ADVISER_ID = #{adviserId} AND I.is_group_book = 1
+		WHERE
+		I.ID IS NULL
+		AND
+		<if test="typeCode!=null">
+			AND
+			B.TYPE_CODE = #{typeCode}
+		</if>
+		<if test="channelId!=null">
+			AND
+			G.CHANNEL_ID = #{channelId}
+		</if>
+		<if test="name != null">
+			AND
+			(B.BOOK_NAME LIKE CONCAT('%', #{name}, '%') OR  B.ISBN LIKE CONCAT(#{name},'%'))
+		</if>
+		<if test="templetId != null">
+			AND
+			A.TEMPLET_ID = #{templetId}
+		</if>
+		<if test="secondTempletIds!=null and secondTempletIds.size()>0">
+			AND
+			A.SECOND_TEMPLET_ID in
+			<foreach collection="secondTempletIds" item="item" open="(" separator="," close=")">
+				${item}
+			</foreach>
+		</if>
+		GROUP BY G.book_id, G.channel_id
+		ORDER BY
+			G.update_time DESC , G.id DESC
+	</select>
 </mapper>
\ No newline at end of file

pcloud-service-book/src/main/resources/mapper/copyright/BookAuthCode.Mapper.xml

@@ -4,13 +4,14 @@
 
 	<insert id="batchInsert" useGeneratedKeys="true" parameterType="java.util.List">
 		INSERT INTO BOOK_AUTH_CODE (
-		BOOK_ID, CHANNEL_ID,ADVISER_ID,BATCH_NUM,AUTH_CODE,FULL_CODE,CREATE_TYPE,CREATED_USER, CREATED_DATE
+		BOOK_ID, CHANNEL_ID,ADVISER_ID,BATCH_NUM,AUTH_CODE,FULL_CODE,CREATE_TYPE,CREATED_USER, CREATED_DATE,IS_PAPER_BOOK,IS_GROUP_BOOK
 		)
 		VALUES
 		<foreach collection="list" item="item" index="index" separator="," >
 			(#{item.bookId,jdbcType=BIGINT}, #{item.channelId,jdbcType=BIGINT}, #{item.adviserId,jdbcType=BIGINT},
 			#{item.batchNum,jdbcType=VARCHAR},#{item.authCode,jdbcType=VARCHAR},#{item.fullCode,jdbcType=VARCHAR},
-			#{item.createType,jdbcType=TINYINT},#{item.adviserId,jdbcType=BIGINT}, NOW())
+			#{item.createType,jdbcType=TINYINT},#{item.adviserId,jdbcType=BIGINT}, NOW(),#{item.isPaperBook,jdbcType=TINYINT},
+			#{item.isGroupBook,jdbcType=TINYINT})
 		</foreach>
 	</insert>
 
@@ -26,6 +27,14 @@
 			CHANNEL_ID = #{channelId, jdbcType=BIGINT}
 		AND
 			ADVISER_ID = #{adviserId, jdbcType=BIGINT}
+		<if test="isPaperBook != null">
+			AND
+			is_paper_book = #{isPaperBook}
+		</if>
+		<if test="isGroupBook!=null">
+			AND
+			is_group_book = #{isGroupBook}
+		</if>
 	</select>
 
 	<update id="updateUseCount" parameterType="map" flushCache="true">
@@ -44,6 +53,14 @@
 		 	FULL_CODE = #{code}
 		AND
 			use_count <![CDATA[ < ]]>  #{codeUseCount}
+		<if test="isPaperBook != null">
+			AND
+			is_paper_book = #{isPaperBook}
+		</if>
+		<if test="isGroupBook!=null">
+			AND
+			is_group_book = #{isGroupBook}
+		</if>
     </update>
 
 	<select id="getIsHaveCode" resultType="Boolean" parameterType="map">
@@ -59,6 +76,14 @@
 			ADVISER_ID = #{adviserId, jdbcType=BIGINT}
 		AND
 		    FULL_CODE = #{code}
+		<if test="isPaperBook != null">
+			AND
+			is_paper_book = #{isPaperBook}
+		</if>
+		<if test="isGroupBook!=null">
+			AND
+			is_group_book = #{isGroupBook}
+		</if>
 	</select>
 
 	<select id="getCodeList" parameterType="map" resultType="com.pcloud.book.copyright.dto.BookAuthCodeDTO">
@@ -92,6 +117,14 @@
 				</otherwise>
 			</choose>
 		</if>
+		<if test="isPaperBook != null">
+			AND
+			is_paper_book = #{isPaperBook}
+		</if>
+		<if test="isGroupBook!=null">
+			AND
+			is_group_book = #{isGroupBook}
+		</if>
 		order by created_date desc
 	</select>
 
@@ -117,6 +150,14 @@
 			created_date createdDate
 		from book_auth_code
 		where book_id= #{bookId,jdbcType=BIGINT} and channel_id = #{channelId} and adviser_id = #{adviserId}
+		<if test="isPaperBook != null">
+			AND
+			is_paper_book = #{isPaperBook}
+		</if>
+		<if test="isGroupBook!=null">
+			AND
+			is_group_book = #{isGroupBook}
+		</if>
 		LIMIT  #{currentPage},#{numPerPage}
 	</select>
 

pcloud-service-book/src/main/resources/mapper/copyright/BookAuthCodeImportRecord.Mapper.xml

@@ -4,12 +4,12 @@
 
 	<insert id="insert" useGeneratedKeys="true"  keyProperty="id" parameterType="BookAuthCodeImportRecord">
 		INSERT INTO BOOK_AUTH_CODE_IMPORT_RECORD (
-		BOOK_ID, CHANNEL_ID,ADVISER_ID,FILE_NAME,FILE_URL,CREATE_USER, CREATE_TIME
+		BOOK_ID, CHANNEL_ID,ADVISER_ID,FILE_NAME,FILE_URL,CREATE_USER, CREATE_TIME, is_paper_book, is_group_book
 		)
 		VALUES
 			(#{bookId,jdbcType=BIGINT}, #{channelId,jdbcType=BIGINT}, #{adviserId,jdbcType=BIGINT},
 			#{fileName,jdbcType=VARCHAR},#{fileUrl,jdbcType=VARCHAR},#{createUser,jdbcType=BIGINT},
-			NOW())
+			NOW(), #{isPaperBook}, #{isGroupBook})
 	</insert>
 
 	<select id="importCodeRecord" resultType="importRecordVO" parameterType="map">
@@ -23,6 +23,14 @@
            CHANNEL_ID = #{channelId, jdbcType=BIGINT}
         AND
            ADVISER_ID = #{adviserId, jdbcType=BIGINT}
+        <if test="isPaperBook != null">
+            AND
+            is_paper_book = #{isPaperBook}
+        </if>
+        <if test="isGroupBook!=null">
+            AND
+            is_group_book = #{isGroupBook}
+        </if>
     </select>
 
     <update id="updateState" parameterType="map">

pcloud-service-book/src/main/resources/mapper/copyright/BookAuthInfo.Mapper.xml

@@ -17,12 +17,14 @@
 
     <insert id="insert" useGeneratedKeys="true" parameterType="bookAuthInfo">
       INSERT INTO BOOK_AUTH_INFO(
-			BOOK_ID, CHANNEL_ID,ADVISER_ID,PRICE,CODE_USE_COUNT,BUY_URL,CHECK_TYPE, CREATED_USER, CREATED_DATE,LAST_MODIFIED_DATE,OPEN_TIME
+			BOOK_ID, CHANNEL_ID,ADVISER_ID,PRICE,CODE_USE_COUNT,BUY_URL,CHECK_TYPE, CREATED_USER, CREATED_DATE,LAST_MODIFIED_DATE,OPEN_TIME,
+			is_paper_book, is_group_book
 		)
 	    VALUES 
        (#{bookId,jdbcType=BIGINT}, #{channelId,jdbcType=BIGINT}, #{adviserId,jdbcType=BIGINT},
 		 #{price}, #{codeUseCount,jdbcType=BIGINT}, #{buyUrl}, #{checkType},
-        #{adviserId,jdbcType=BIGINT}, NOW(), NOW(), NOW())
+        #{adviserId,jdbcType=BIGINT}, NOW(), NOW(), NOW(),
+        #{isPaperBook}, #{isGroupBook})
     </insert>
 
     <select id="getInfoByBook" resultMap="BookAuthInfoMap" parameterType="map">
@@ -36,6 +38,14 @@
            CHANNEL_ID = #{channelId, jdbcType=BIGINT}
         AND
            ADVISER_ID = #{adviserId, jdbcType=BIGINT}
+        <if test="isPaperBook != null">
+           AND
+            is_paper_book = #{isPaperBook}
+        </if>
+        <if test="isGroupBook!=null">
+           AND
+            is_group_book = #{isGroupBook}
+        </if>
     </select>
 
     <select id="getIsHaveAuthBook" resultType="Boolean" parameterType="Long">
@@ -49,6 +59,7 @@
            ADVISER_ID = #{_parameter, jdbcType=BIGINT}
     </select>
 
+    <!-- 获取设置过正版授权的图书 -->
     <select id="listHaveSetAuthBook" resultType="haveSetAuthBook" parameterType="map">
         SELECT
         I.ID,A.BOOK_ID as bookId,
@@ -68,7 +79,7 @@
         <if test="isFundSupport != null">
         LEFT JOIN BOOK_FUND BF  ON  BF.BOOK_ID = A.BOOK_ID AND BF.END_TIME <![CDATA[ > ]]> NOW()  AND BF.START_TIME <![CDATA[ < ]]> NOW()
         </if>
-        WHERE 1=1
+        WHERE I.is_paper_book = 1
         <if test="typeCode!=null">
             AND
             B.TYPE_CODE = #{typeCode}
@@ -83,7 +94,14 @@
         </if>
         <if test="name != null">
             AND
-            (B.BOOK_NAME LIKE CONCAT('%', #{name}, '%') OR  B.ISBN LIKE CONCAT(#{name},'%'))
+            ((B.BOOK_NAME LIKE CONCAT('%', #{name}, '%') OR  B.ISBN LIKE CONCAT(#{name},'%'))
+            <if test="nameList != null and nameList.size > 0">
+                <foreach collection="nameList" close=" " separator=" " open=" " item="item">
+                    OR
+                    (B.BOOK_NAME LIKE CONCAT('%', '${item}', '%') OR  B.ISBN LIKE CONCAT('${item}','%'))
+                </foreach>
+            </if>
+            )
         </if>
         <if test="isMainEditor != null">
             AND
@@ -108,6 +126,65 @@
         I.LAST_MODIFIED_DATE DESC
     </select>
 
+    <!-- 获取设置过正版授权的社群书 -->
+    <select id="listHaveSetAuthGroupBook" resultType="haveSetAuthBook" parameterType="map">
+        SELECT
+            I.id,
+            I.book_id AS bookId,
+            I.channel_id AS channelId,
+            I.price,
+            I.adviser_id AS adviserId,
+            I.book_status AS bookStatus,
+            B.isbn,
+            B.book_name AS bookName,
+            B.cover_img AS coverImg,
+            B.serial_number AS serialNumber
+        FROM
+            book_auth_info I
+        INNER JOIN book_adviser A ON A.book_id = I.book_id
+            AND A.channel_id = I.channel_id
+            AND A.created_user = I.adviser_id
+            AND A.is_delete = 0
+        INNER JOIN book_group G ON G.book_id = I.book_id
+            AND G.channel_id = I.channel_id
+            AND G.create_user = I.adviser_id
+            AND G.is_delete = 0
+        INNER JOIN book B ON I.book_id = B.book_id
+            AND B.is_delete = 0
+        WHERE I.is_group_book = 1
+        AND I.adviser_id = #{adviserId}
+        <if test="typeCode!=null">
+            AND
+            B.type_code = #{typeCode}
+        </if>
+        <if test="bookStatus!=null">
+            AND
+            I.book_status = #{bookStatus}
+        </if>
+        <if test="channelId!=null">
+            AND
+            I.channel_id = #{channelId}
+        </if>
+        <if test="name != null">
+            AND
+            (B.BOOK_NAME LIKE CONCAT('%', #{name}, '%') OR  B.ISBN LIKE CONCAT(#{name},'%'))
+        </if>
+        <if test="templetId != null">
+            AND
+            A.TEMPLET_ID = #{templetId}
+        </if>
+        <if test="secondTempletIds != null and secondTempletIds.size() > 0">
+            AND
+            A.SECOND_TEMPLET_ID in
+            <foreach collection="secondTempletIds" item="item" open="(" separator="," close=")">
+                ${item}
+            </foreach>
+        </if>
+        GROUP BY A.BOOK_ID, A.CHANNEL_ID
+        ORDER BY
+              I.LAST_MODIFIED_DATE DESC
+    </select>
+
     <update id="updateBookStatus" parameterType="map" flushCache="true">
         UPDATE BOOK_AUTH_INFO
         SET
@@ -131,7 +208,18 @@
             LAST_MODIFIED_DATE = NOW(),
             LAST_MODIFIED_USER = #{adviserId}
         WHERE
-           BOOK_ID = #{bookId} AND CHANNEL_ID = #{channelId} AND ADVISER_ID = #{adviserId}
+           BOOK_ID = #{bookId}
+        AND CHANNEL_ID = #{channelId}
+        AND ADVISER_ID = #{adviserId}
+        <if test="isPaperBook != null">
+            AND
+            is_paper_book = #{isPaperBook}
+        </if>
+        <if test="isGroupBook!=null">
+            AND
+            is_group_book = #{isGroupBook}
+        </if>
+
     </update>
     <update id="updateBaseInfo" parameterType="bookAuthInfo" flushCache="true">
         UPDATE BOOK_AUTH_INFO
@@ -167,6 +255,8 @@
            CHANNEL_ID = #{channelId, jdbcType=BIGINT}
         AND
            ADVISER_ID = #{adviserId, jdbcType=BIGINT}
+        AND
+           is_paper_book = 1
     </select>
 
     <select id="getTotalNum" resultType="Integer" parameterType="map">

pcloud-service-book/src/main/resources/mapper/copyright/BookAuthOrder.Mapper.xml

@@ -4,9 +4,9 @@
 
 	<insert id="insert" useGeneratedKeys="true" parameterType="bookAuthOrder">
       INSERT INTO BOOK_AUTH_ORDER(
-			BOOK_ID, CHANNEL_ID,ADVISER_ID,WECHAT_USER_ID,MONEY,ACCOUNT_SETTING_ID,ORDER_NUM,PAYMENT_SOURCE, CREATED_USER, CREATED_DATE)
+			BOOK_ID, CHANNEL_ID,ADVISER_ID,WECHAT_USER_ID,MONEY,ACCOUNT_SETTING_ID,ORDER_NUM,PAYMENT_SOURCE, CREATED_USER, CREATED_DATE, is_paper_book, is_group_book)
 	    VALUES
        (#{bookId,jdbcType=BIGINT}, #{channelId,jdbcType=BIGINT}, #{adviserId,jdbcType=BIGINT},
-		 #{wechatUserId}, #{money}, #{accountSettingId}, #{orderNum}, #{paymentSource}, #{adviserId}, NOW())
+		 #{wechatUserId}, #{money}, #{accountSettingId}, #{orderNum}, #{paymentSource}, #{adviserId}, NOW(), #{isPaperBook}, #{isGroupBook})
     </insert>
 </mapper>
\ No newline at end of file

pcloud-service-book/src/main/resources/mapper/copyright/BookAuthUser.Mapper.xml

@@ -4,10 +4,10 @@
 
 	<insert id="insert" useGeneratedKeys="true" parameterType="bookAuthUser">
       INSERT INTO BOOK_AUTH_USER(
-			BOOK_ID, CHANNEL_ID,ADVISER_ID,WECHAT_USER_ID,MONTHS,province,city,IS_AUTH_CODE, CREATED_DATE,CREATED_USER, CREATED_TIME)
+			BOOK_ID, CHANNEL_ID,ADVISER_ID,WECHAT_USER_ID,MONTHS,province,city,IS_AUTH_CODE, CREATED_DATE,CREATED_USER, CREATED_TIME, is_paper_book, is_group_book)
 	    VALUES
        (#{bookId,jdbcType=BIGINT}, #{channelId,jdbcType=BIGINT}, #{adviserId,jdbcType=BIGINT},
-		 #{wechatUserId}, #{months}, #{province}, #{city}, #{isAuthCode},NOW(), #{adviserId}, NOW())
+		 #{wechatUserId}, #{months}, #{province}, #{city}, #{isAuthCode},NOW(), #{adviserId}, NOW(), #{isPaperBook}, #{isGroupBook})
     </insert>
 
 	<select id="getAuthUserCount" resultType="bookAuthCodeUserVO" parameterType="map">
@@ -22,6 +22,14 @@
 			CHANNEL_ID = #{channelId, jdbcType=BIGINT}
 		AND
 			ADVISER_ID = #{adviserId, jdbcType=BIGINT}
+		<if test="isPaperBook != null">
+			AND
+			is_paper_book = #{isPaperBook}
+		</if>
+		<if test="isGroupBook!=null">
+			AND
+			is_group_book = #{isGroupBook}
+		</if>
 	</select>
 
 	<select id="getAuthUserCountByMonth" resultType="bookAuthCodeUserVO" parameterType="map">
@@ -39,7 +47,6 @@
 		<if test="monthDate!=null">
 		AND MONTHS = #{monthDate}
 		</if>
-
 	</select>
 
 
@@ -56,6 +63,14 @@
 			ADVISER_ID = #{adviserId, jdbcType=BIGINT}
 		AND
 			WECHAT_USER_ID = #{wechatUserId}
+		<if test="isPaperBook != null">
+			AND
+			is_paper_book = #{isPaperBook}
+		</if>
+		<if test="isGroupBook!=null">
+			AND
+			is_group_book = #{isGroupBook}
+		</if>
 	</select>
 
 
@@ -76,6 +91,14 @@
 		<if test="province!=null">
 			AND PROVINCE = #{province}
 		</if>
+		<if test="isPaperBook != null">
+			AND
+			is_paper_book = #{isPaperBook}
+		</if>
+		<if test="isGroupBook!=null">
+			AND
+			is_group_book = #{isGroupBook}
+		</if>
 		GROUP BY created_date
 	</select>
 
@@ -146,7 +169,35 @@
 		<if test="province!=null">
 			AND PROVINCE = #{province}
 		</if>
+		<if test="isPaperBook != null">
+			AND
+			is_paper_book = #{isPaperBook}
+		</if>
+		<if test="isGroupBook!=null">
+			AND
+			is_group_book = #{isGroupBook}
+		</if>
 		GROUP BY months
 	</select>
 
+	<select id="checkUserIsHaveAuth" resultType="Boolean" parameterType="map">
+		SELECT
+			COUNT(1)
+		FROM
+			BOOK_AUTH_USER
+		WHERE
+			is_group_book = 1
+		AND
+			BOOK_ID = #{bookId, jdbcType=BIGINT}
+		AND
+			CHANNEL_ID = #{channelId, jdbcType=BIGINT}
+		AND
+			ADVISER_ID = #{adviserId, jdbcType=BIGINT}
+		AND
+			WECHAT_USER_ID IN
+		<foreach collection="wechatUserIds" item="item" open="(" separator="," close=")">
+			#{item}
+		</foreach>
+	</select>
+
 </mapper>
\ No newline at end of file

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

@@ -176,7 +176,7 @@
             classify_introduce classifyIntroduce,
             price,
             change_number changeNumber,
-            create_user
+            create_user createUser
         from
             book_group_classify
         where