合并

pcloud-facade-book/src/main/java/com/pcloud/book/book/constant/BookConstant.java

@@ -17,6 +17,11 @@ import java.util.Map;
 public class BookConstant {
 
     /**
+     * 微信小号每天拉人次数缓存前缀
+     */
+    public static final String WXGROUP_ADD_USER_NUM = CacheConstant.BOOK + "WXGROUP_ADD_USER_NUM:";
+
+    /**
      * 图书基础缓存前缀名称
      */
     public static final String BOOK_CACHE = CacheConstant.BOOK + "BOOK:";

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

+package com.pcloud.book.group.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @Author ruansiyuan
+ * @Date 2019/8/12 14:57
+ **/
+public class GroupCipherDTO implements Serializable {
+
+    private static final long serialVersionUID = 4254978072223600943L;
+
+    @ApiModelProperty("密码")
+    private String cipher;
+
+    @ApiModelProperty("分类id")
+    private Long classifyId;
+
+    @ApiModelProperty("创建人")
+    private Long wechatUserId;
+
+    @ApiModelProperty("使用人微信id")
+    private String wxId;
+
+    @ApiModelProperty("是否使用")
+    private Boolean hasUsed;
+
+    @ApiModelProperty("机器人id")
+    private String altId;
+
+    public String getCipher() {
+        return cipher;
+    }
+
+    public void setCipher(String cipher) {
+        this.cipher = cipher;
+    }
+
+    public Long getClassifyId() {
+        return classifyId;
+    }
+
+    public void setClassifyId(Long classifyId) {
+        this.classifyId = classifyId;
+    }
+
+    public Long getWechatUserId() {
+        return wechatUserId;
+    }
+
+    public void setWechatUserId(Long wechatUserId) {
+        this.wechatUserId = wechatUserId;
+    }
+
+    public String getWxId() {
+        return wxId;
+    }
+
+    public void setWxId(String wxId) {
+        this.wxId = wxId;
+    }
+
+    public Boolean getHasUsed() {
+        return hasUsed;
+    }
+
+    public void setHasUsed(Boolean hasUsed) {
+        this.hasUsed = hasUsed;
+    }
+
+    public String getAltId() {
+        return altId;
+    }
+
+    public void setAltId(String altId) {
+        this.altId = altId;
+    }
+
+    @Override
+    public String toString() {
+        return "GroupCipherDTO{" +
+                "cipher='" + cipher + '\'' +
+                ", classifyId=" + classifyId +
+                ", wechatUserId=" + wechatUserId +
+                ", wxId='" + wxId + '\'' +
+                ", hasUsed=" + hasUsed +
+                ", altId='" + altId + '\'' +
+                '}';
+    }
+}

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

@@ -54,6 +54,10 @@ public class GroupClassifyQrcodeDTO implements Serializable {
      * 是否开启群学习报告
      */
     private Boolean hasOpenLearningReport;
+    /**
+     * 进群方式：1群二维码，2客服机器人
+     */
+    private Integer joinGroupType;
 
     public Long getBookId() {
         return bookId;
@@ -135,6 +139,14 @@ public class GroupClassifyQrcodeDTO implements Serializable {
         this.hasOpenLearningReport = hasOpenLearningReport;
     }
 
+    public Integer getJoinGroupType() {
+        return joinGroupType;
+    }
+
+    public void setJoinGroupType(Integer joinGroupType) {
+        this.joinGroupType = joinGroupType;
+    }
+
     @Override
     public String toString() {
         return "GroupClassifyQrcodeDTO{" +
@@ -148,6 +160,7 @@ public class GroupClassifyQrcodeDTO implements Serializable {
                 ", price=" + price +
                 ", qrCodeUrl='" + qrCodeUrl + '\'' +
                 ", hasOpenLearningReport=" + hasOpenLearningReport +
+                ", joinGroupType=" + joinGroupType +
                 '}';
     }
 }

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

+package com.pcloud.book.group.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @Author ruansiyuan
+ * @Date 2019/8/7 9:26
+ **/
+@ApiModel("群使用情况模型")
+public class GroupUseDTO implements Serializable {
+
+    @ApiModelProperty("已使用")
+    private Integer hasUsed;
+
+    @ApiModelProperty("未使用")
+    private Integer notUsed;
+
+    public Integer getHasUsed() {
+        return hasUsed;
+    }
+
+    public void setHasUsed(Integer hasUsed) {
+        this.hasUsed = hasUsed;
+    }
+
+    public Integer getNotUsed() {
+        return notUsed;
+    }
+
+    public void setNotUsed(Integer notUsed) {
+        this.notUsed = notUsed;
+    }
+
+    @Override
+    public String toString() {
+        return "GroupUseDTO{" +
+                "hasUsed=" + hasUsed +
+                ", notUsed=" + notUsed +
+                '}';
+    }
+}

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

+package com.pcloud.book.group.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @Author ruansiyuan
+ * @Date 2019/8/7 11:23
+ **/
+public class LargeTempletDTO implements Serializable {
+    private static final long serialVersionUID = -5982946901202138966L;
+
+    @ApiModelProperty("大类")
+    private Integer largeTemplet;
+
+    @ApiModelProperty("名称")
+    private String name;
+
+    public Integer getLargeTemplet() {
+        return largeTemplet;
+    }
+
+    public void setLargeTemplet(Integer largeTemplet) {
+        this.largeTemplet = largeTemplet;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    @Override
+    public String toString() {
+        return "LargeTempletDTO{" +
+                "largeTemplet=" + largeTemplet +
+                ", name='" + name + '\'' +
+                '}';
+    }
+}

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

+package com.pcloud.book.group.dto;
+
+import java.io.Serializable;
+
+/**
+ * @author 戴兴
+ * @description TODO
+ * @date 2019/8/7 17:13
+ */
+public class PersonalQrcodeDTO implements Serializable {
+
+    private String newQrcodeUrl;
+
+    private String oldQrcodeUrl;
+
+    public String getNewQrcodeUrl() {
+        return newQrcodeUrl;
+    }
+
+    public void setNewQrcodeUrl(String newQrcodeUrl) {
+        this.newQrcodeUrl = newQrcodeUrl;
+    }
+
+    public String getOldQrcodeUrl() {
+        return oldQrcodeUrl;
+    }
+
+    public void setOldQrcodeUrl(String oldQrcodeUrl) {
+        this.oldQrcodeUrl = oldQrcodeUrl;
+    }
+
+    @Override
+    public String toString() {
+        return "PersonalQrcodeDTO{" +
+                "newQrcodeUrl='" + newQrcodeUrl + '\'' +
+                ", oldQrcodeUrl='" + oldQrcodeUrl + '\'' +
+                '}';
+    }
+}
\ No newline at end of file

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

@@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
@@ -54,4 +55,8 @@ public interface BookGroupClassifyService {
     @ApiOperation("过滤被删除的群分类、群二维码")
     @PostMapping("filterDeleteId")
     ResponseEntity<ResponseDto<List<Long>>> filterDeleteId(@RequestBody List<String >wxGroupIdList);
+
+    @ApiOperation("获取用户支付金额")
+    @GetMapping("getPayPrice")
+    ResponseEntity<ResponseDto<BigDecimal>> getPayPrice(@RequestParam("qrcodeId") Long qrcodeId, @RequestParam("wxUserId") String wxUserId);
 }

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

@@ -2,15 +2,19 @@ package com.pcloud.book.group.service;
 
 import java.util.List;
 import java.util.Map;
+
+import com.pcloud.book.group.dto.PersonalQrcodeDTO;
+import com.pcloud.book.group.dto.GroupCipherDTO;
+import com.pcloud.book.group.dto.GroupUseDTO;
 import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.RequestBody;
-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.*;
 import com.pcloud.book.group.dto.BookGroupDTO;
 import com.pcloud.common.dto.ResponseDto;
+import com.pcloud.common.dto.StoreFlowInfoDto;
 import com.pcloud.common.exceptions.BizException;
+import com.pcloud.common.page.PageBeanNew;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
@@ -30,8 +34,42 @@ public interface BookGroupService {
     @RequestMapping(value = "getBookGroupInfoByIds", method = RequestMethod.POST)
     ResponseEntity<ResponseDto<Map<Long, BookGroupDTO>>> getBookGroupInfoByIds(@RequestBody List<Long> bookGroupIds) throws BizException;
 
+    @ApiOperation("为信息流批量获取社群书基本信息")
+    @RequestMapping(value = "getFlowInfoByBookGroupIds", method = RequestMethod.POST)
+    ResponseEntity<ResponseDto<Map<Long, StoreFlowInfoDto>>> getFlowInfoByBookGroupIds(@RequestBody List<Long> bookGroupIds) throws BizException;
+
+    @ApiOperation("获取指定条数社群书基本信息")
+    @RequestMapping(value = "getBookGroupInfoByChannelId",method = RequestMethod.GET)
+    ResponseEntity<ResponseDto<Map<Long, StoreFlowInfoDto>>> getBookGroupInfoByChannelId(@RequestParam("channelId")Long channelId, @RequestParam("itemNum")Integer itemNum) throws BizException;
+
+    @ApiOperation(value = "知识商城获取社群书信息")
+    @RequestMapping(value = "listBookGroup4KnowledgeMall",method = RequestMethod.GET)
+    ResponseEntity<ResponseDto<PageBeanNew<StoreFlowInfoDto>>> listBookGroup4KnowledgeMall(@RequestParam(value="channelId",required = false)Long channelId,
+                                                                                       @RequestParam("currentPage")int currentPage,
+                                                                                       @RequestParam("numPerPage") int numPerPage) throws BizException;
+
     @ApiOperation("获取社群书基本信息")
     @RequestMapping(value = "getBaseInfoBySceneId",method = RequestMethod.GET)
     ResponseEntity<ResponseDto<BookGroupDTO>> getBaseInfoBySceneId(@RequestParam("sceneId")Long sceneId) throws BizException;
 
+    @ApiOperation("更新个人二维码")
+    @RequestMapping(value = "updatePersonQrcode",method = RequestMethod.POST)
+    void updatePersonQrcode(@RequestBody PersonalQrcodeDTO personalQrcodeDTO) throws BizException;
+
+    @ApiOperation("获取暗号状态")
+    @GetMapping("/getCipherState")
+    ResponseEntity<ResponseDto<Integer>> getCipherState(@RequestParam("cipher")String cipher) throws BizException;
+
+    @ApiOperation("更新暗号状态为已使用")
+    @GetMapping("/updateCipherStateToUsed")
+    void updateCipherStateToUsed(@RequestParam("cipher")String cipher, @RequestParam("wxId")String wxId) throws BizException;
+
+    @ApiOperation("获取个人二维码方式群已使用和未使用数量")
+    @PostMapping("/getGroupUse")
+    ResponseEntity<ResponseDto<GroupUseDTO>> getGroupUse(@RequestBody List<String> altIds) throws BizException;
+
+    @ApiOperation("获取暗号基本信息")
+    @GetMapping("/getJoinGroupCipher")
+    ResponseEntity<ResponseDto<GroupCipherDTO>> getJoinGroupCipher(@RequestParam("cipher")String cipher) throws BizException;
+
 }

pcloud-service-book/src/main/java/com/pcloud/book/BookApplication.java

@@ -198,4 +198,17 @@ public class BookApplication {
     public Binding wxGroupLearningReportBind() {
         return RabbitMQFactory.bindingExchange(wxGroupLearningReportQueue(), MQTopicProducer.WXGROUP_LEARNING_REPORT);
     }
+
+    /**
+     * 微信个人机器人同意加好友
+     */
+    @Bean
+    public Queue wxGroupAgreeAddUserQueue() {
+        return RabbitMQFactory.queueBuilder(MQTopicConumer.WX_AGREE_ADD_USER);
+    }
+
+    @Bean
+    public Binding wxGroupAgreeAddUserBind() {
+        return RabbitMQFactory.bindingExchange(wxGroupAgreeAddUserQueue(), MQTopicProducer.WX_AGREE_ADD_USER);
+    }
 }

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

 package com.pcloud.book.adnews.biz;
 
-import com.pcloud.book.adnews.entity.AdNews;
-import com.pcloud.book.adnews.entity.AdNewsSet;
+import com.pcloud.book.adnews.entity.*;
+import com.pcloud.book.adnews.dto.AdNewsListParam;
+import com.pcloud.book.adnews.vo.AdNewsGroupRecordVO;
+import com.pcloud.book.adnews.vo.AdNewsMessageStatisticVO;
 import com.pcloud.common.page.PageBeanNew;
 
 import java.util.List;
@@ -40,10 +42,86 @@ public interface AdNewsBiz {
     /**
      * 获取素材库列表
      */
-    PageBeanNew<AdNews> getAdNewsList(String title, Long partyId, Integer currentPage, Integer numPerPage);
+    PageBeanNew<AdNews> getAdNewsList(AdNewsListParam adNewsListParam);
+
 
     /**
      * 获取编辑已选取的素材库列表
      */
     PageBeanNew<AdNews> getAdNewsChooseList(Long partyId, String title, Boolean hasUsed, Integer currentPage, Integer numPerPage);
+
+    /**
+     * 禁用/允许推送
+     * @param partyId
+     * @param adNewsId
+     * @param hasBan
+     */
+    void saveAdNewsBan( Long partyId, Long adNewsId, Integer hasBan);
+
+    /**
+     * 增加公众号反馈
+     * @param adNewsWechat
+     * @return
+     */
+    Long addAdNewsWechat(AdNewsWechat adNewsWechat);
+
+    /**
+     * 获取所有的公众号列表
+     * @param currentPage
+     * @param numPerPage
+     * @return
+     */
+    PageBeanNew<AdNewsWechat> getAdNewsWechatList(Integer currentPage, Integer numPerPage);
+
+    /**
+     * 获取编辑已选择的公众号列表
+     * @param partyId
+     * @param currentPage
+     * @param numPerPage
+     */
+    PageBeanNew<AdNewsWechat> getAdNewsWechatChooseList(Long partyId, Integer currentPage, Integer numPerPage);
+
+    /**
+     * 编辑添加选择的公众号
+     * @param adNewsWechatIds
+     * @param partyId
+     */
+    void createAdNewsWechatChooseBatch(List<Long> adNewsWechatIds, Long partyId);
+
+    /**
+     * 编辑移除选择的公众号
+     * @param adNewsWechatId
+     * @param partyId
+     */
+    void deleteAdNewsWechatChoose(Long adNewsWechatId, Long partyId);
+
+    /**
+     * 获取早晚报发送记录
+     * @param partyId
+     * @param title
+     * @param beginTime
+     * @param endTime
+     * @param proLabelId 专业
+     * @param depLabelId 深度
+     * @param purLabelId 目的
+     * @param currentPage
+     * @param numPerPage
+     * @return
+     */
+    PageBeanNew<AdNewsMessageStatisticVO> getAdNewsMessageStatistic(Long partyId, String title, String beginTime, String endTime, Long proLabelId, Long depLabelId, Long purLabelId, Integer currentPage, Integer numPerPage);
+
+    /**
+     * 查询早晚报发送详情
+     * @param partyId
+     * @param messageStatisticId
+     * @return
+     */
+    List<AdNewsGroupRecordVO> getAdNewsGroupRecord(Long partyId, Long messageStatisticId);
+
+    /**
+     * 记录用户点击量
+     * @param adNewsClickRecord
+     * @return
+     */
+    Long addAdNewsClickRecord(AdNewsClickRecord adNewsClickRecord);
 }

pcloud-service-book/src/main/java/com/pcloud/book/adnews/check/AdNewsCheck.java

 package com.pcloud.book.adnews.check;
 
+import com.google.common.base.Enums;
 import com.pcloud.book.adnews.entity.AdNewsGroup;
 import com.pcloud.book.adnews.entity.AdNewsSet;
+import com.pcloud.book.adnews.enums.AdContentFromEnum;
 import com.pcloud.book.base.exception.BookBizException;
 import com.pcloud.common.utils.ListUtils;
+import com.pcloud.common.utils.NumberUtil;
 import com.pcloud.common.utils.string.StringUtil;
 import org.springframework.stereotype.Component;
 
@@ -16,49 +19,52 @@ import org.springframework.stereotype.Component;
 public class AdNewsCheck {
 
 
-    public void createAdNewsSetCheck(AdNewsSet adNewsSet){
-        if (adNewsSet==null){
-            throw new BookBizException(BookBizException.PARAM_IS_ERROR,"参数错误");
+    public void createAdNewsSetCheck(AdNewsSet adNewsSet) {
+        if (adNewsSet == null) {
+            throw new BookBizException(BookBizException.PARAM_IS_ERROR, "参数错误");
         }
-        if (ListUtils.isEmpty(adNewsSet.getAdNewsGroups())){
-            throw new BookBizException(BookBizException.PARAM_IS_ERROR,"发送群分类不能为空！");
+        if (ListUtils.isEmpty(adNewsSet.getAdNewsGroups())) {
+            throw new BookBizException(BookBizException.PARAM_IS_ERROR, "发送群分类不能为空！");
         }
-        if (adNewsSet.getSendCount()==null||adNewsSet.getSendCount()<=0){
-            throw new BookBizException(BookBizException.PARAM_IS_ERROR,"推送条数不能为空且必须大于0！");
+        if (adNewsSet.getSendCount() == null || adNewsSet.getSendCount() <= 0) {
+            throw new BookBizException(BookBizException.PARAM_IS_ERROR, "推送条数不能为空且必须大于0！");
         }
-        if (adNewsSet.getHasMorningOpen()==null){
-            throw new BookBizException(BookBizException.PARAM_IS_ERROR,"是否开启早报不能为空！");
+        if (adNewsSet.getHasMorningOpen() == null) {
+            throw new BookBizException(BookBizException.PARAM_IS_ERROR, "是否开启早报不能为空！");
         }
-        if (adNewsSet.getHasEveningOpen()==null){
-            throw new BookBizException(BookBizException.PARAM_IS_ERROR,"是否开启晚报不能为空！");
+        if (adNewsSet.getHasEveningOpen() == null) {
+            throw new BookBizException(BookBizException.PARAM_IS_ERROR, "是否开启晚报不能为空！");
         }
-        if (adNewsSet.getHasStartContent()==null){
-            throw new BookBizException(BookBizException.PARAM_IS_ERROR,"是否开启开场语不能为空！");
+        if (adNewsSet.getHasStartContent() == null) {
+            throw new BookBizException(BookBizException.PARAM_IS_ERROR, "是否开启开场语不能为空！");
         }
-        if (adNewsSet.getHasEndContent()==null){
-            throw new BookBizException(BookBizException.PARAM_IS_ERROR,"是否开启结束语不能为空！");
+        if (adNewsSet.getHasEndContent() == null) {
+            throw new BookBizException(BookBizException.PARAM_IS_ERROR, "是否开启结束语不能为空！");
         }
-        if (adNewsSet.getHasMorningOpen()&&StringUtil.isEmpty(adNewsSet.getMorningTime())){
-            throw new BookBizException(BookBizException.PARAM_IS_ERROR,"早报时间不能为空！");
+        if (adNewsSet.getHasMorningOpen() && StringUtil.isEmpty(adNewsSet.getMorningTime())) {
+            throw new BookBizException(BookBizException.PARAM_IS_ERROR, "早报时间不能为空！");
         }
-        if (adNewsSet.getHasEveningOpen()&&StringUtil.isEmpty(adNewsSet.getEveningTime())){
-            throw new BookBizException(BookBizException.PARAM_IS_ERROR,"晚报时间不能为空！");
+        if (adNewsSet.getHasEveningOpen() && StringUtil.isEmpty(adNewsSet.getEveningTime())) {
+            throw new BookBizException(BookBizException.PARAM_IS_ERROR, "晚报时间不能为空！");
         }
-        if (adNewsSet.getHasStartContent()&&StringUtil.isEmpty(adNewsSet.getStartContent())){
-            throw new BookBizException(BookBizException.PARAM_IS_ERROR,"开场语不能为空！");
+        if (adNewsSet.getHasStartContent() && StringUtil.isEmpty(adNewsSet.getStartContent())) {
+            throw new BookBizException(BookBizException.PARAM_IS_ERROR, "开场语不能为空！");
         }
-        if (adNewsSet.getHasEndContent()&&StringUtil.isEmpty(adNewsSet.getEndContent())){
-            throw new BookBizException(BookBizException.PARAM_IS_ERROR,"结束语不能为空！");
+        if (adNewsSet.getHasEndContent() && StringUtil.isEmpty(adNewsSet.getEndContent())) {
+            throw new BookBizException(BookBizException.PARAM_IS_ERROR, "结束语不能为空！");
         }
-        for(AdNewsGroup adNewsGroup:adNewsSet.getAdNewsGroups()){
-            if (adNewsGroup==null){
-                throw new BookBizException(BookBizException.PARAM_IS_ERROR,"早晚报关联不能为空！");
+        if (adNewsSet.getContentFrom() != AdContentFromEnum.WECHAT.key && adNewsSet.getContentFrom() != AdContentFromEnum.CUSTOM.key) {
+            throw new BookBizException(BookBizException.PARAM_IS_ERROR, "请选择早晚报内容来源！");
         }
-            if (adNewsGroup.getClassifyId()==null){
-                throw new BookBizException(BookBizException.PARAM_IS_ERROR,"群分类id不能为空！");
+        for (AdNewsGroup adNewsGroup : adNewsSet.getAdNewsGroups()) {
+            if (adNewsGroup == null) {
+                throw new BookBizException(BookBizException.PARAM_IS_ERROR, "早晚报关联不能为空！");
             }
-            if (adNewsGroup.getBookGroupId()==null){
-                throw new BookBizException(BookBizException.PARAM_IS_ERROR,"社群码id不能为空！");
+            if (adNewsGroup.getClassifyId() == null) {
+                throw new BookBizException(BookBizException.PARAM_IS_ERROR, "群分类id不能为空！");
+            }
+            if (adNewsGroup.getBookGroupId() == null) {
+                throw new BookBizException(BookBizException.PARAM_IS_ERROR, "社群码id不能为空！");
             }
         }
 

pcloud-service-book/src/main/java/com/pcloud/book/adnews/dao/AdNewsBanDao.java

+package com.pcloud.book.adnews.dao;
+
+import com.pcloud.book.adnews.entity.AdNewsBan;
+import com.pcloud.common.core.dao.BaseDao;
+
+/**
+ * @author zhengyongqiang
+ * @date 2019/8/12 15:12
+ */
+public interface AdNewsBanDao extends BaseDao<AdNewsBan> {
+    void deleteByAdNewsId(Long partyId,Long adNewsId);
+}

pcloud-service-book/src/main/java/com/pcloud/book/adnews/dao/AdNewsClickRecordDao.java

+package com.pcloud.book.adnews.dao;
+
+import com.pcloud.book.adnews.entity.AdNewsClickRecord;
+import com.pcloud.common.core.dao.BaseDao;
+
+/**
+ * @author zhengyongqiang
+ * @date 2019/8/15 11:10
+ */
+public interface AdNewsClickRecordDao extends BaseDao<AdNewsClickRecord> {
+}

pcloud-service-book/src/main/java/com/pcloud/book/adnews/dao/AdNewsGroupDao.java

@@ -6,9 +6,15 @@ import com.pcloud.common.core.dao.BaseDao;
 import java.util.List;
 
 public interface AdNewsGroupDao extends BaseDao<AdNewsGroup> {
+
     Integer batchInsert(List<AdNewsGroup> adNewsGroups);
 
     void deleteByAdNewsSetId(Long adNewsSetId);
 
+    /**
+     * 获取勾选关联的社群
+     * @param adNewsSetId
+     * @return
+     */
     List<AdNewsGroup> getListByAdNewsSetId(Long adNewsSetId);
 }

pcloud-service-book/src/main/java/com/pcloud/book/adnews/dao/AdNewsGroupRecordDao.java

 package com.pcloud.book.adnews.dao;
 
 import com.pcloud.book.adnews.entity.AdNewsGroupRecord;
+import com.pcloud.book.adnews.vo.AdNewsGroupRecordVO;
 import com.pcloud.common.core.dao.BaseDao;
 
 import java.util.List;
@@ -12,4 +13,6 @@ import java.util.List;
  **/
 public interface AdNewsGroupRecordDao extends BaseDao<AdNewsGroupRecord> {
     Integer batchInsert(List<AdNewsGroupRecord> adNewsGroupRecords);
+
+    List<AdNewsGroupRecordVO> getAdNewsGroupRecord(Long partyId, Long messageStatisticId);
 }

pcloud-service-book/src/main/java/com/pcloud/book/adnews/dao/AdNewsMessageStatisticDao.java

+package com.pcloud.book.adnews.dao;
+
+import com.pcloud.book.adnews.entity.AdNewsMessageStatistic;
+import com.pcloud.common.core.dao.BaseDao;
+import com.pcloud.common.page.PageBeanNew;
+
+import java.util.List;
+
+/**
+ * @author zhengyongqiang
+ * @date 2019/8/13 19:05
+ */
+public interface AdNewsMessageStatisticDao extends BaseDao<AdNewsMessageStatistic> {
+    Integer batchInsert(List<AdNewsMessageStatistic> list);
+}

pcloud-service-book/src/main/java/com/pcloud/book/adnews/dao/AdNewsWechatChooseDao.java

+package com.pcloud.book.adnews.dao;
+
+import com.pcloud.book.adnews.entity.AdNewsChoose;
+import com.pcloud.book.adnews.entity.AdNewsWechatChoose;
+import com.pcloud.common.core.dao.BaseDao;
+
+import java.util.List;
+
+/**
+ * @author zhengyongqiang
+ * @date 2019/8/7 11:47
+ */
+public interface AdNewsWechatChooseDao extends BaseDao<AdNewsWechatChoose> {
+
+    Integer batchInsert(List<AdNewsWechatChoose> adNewsWechatChooses);
+
+    void deleteAdNewsWechatChooseById(Long adNewsWechatId, Long partyId);
+
+    void deleteAdNewsWechatChooseByPartyId(Long partyId);
+
+    Integer getCountByAdNewsWechatIdsAndPartyId(List<Long> adNewsIds, Long partyId);
+}

pcloud-service-book/src/main/java/com/pcloud/book/adnews/dao/AdNewsWechatDao.java

+package com.pcloud.book.adnews.dao;
+
+import com.pcloud.book.adnews.entity.AdNewsWechat;
+import com.pcloud.common.core.dao.BaseDao;
+
+/**
+ * @author zhengyongqiang
+ * @date 2019/8/7 11:46
+ */
+public interface AdNewsWechatDao extends BaseDao<AdNewsWechat> {
+
+}

pcloud-service-book/src/main/java/com/pcloud/book/adnews/dao/impl/AdNewsBanDaoImpl.java

+package com.pcloud.book.adnews.dao.impl;
+
+import com.pcloud.book.adnews.dao.AdNewsBanDao;
+import com.pcloud.book.adnews.entity.AdNewsBan;
+import com.pcloud.common.core.dao.BaseDaoImpl;
+import org.springframework.stereotype.Repository;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author zhengyongqiang
+ * @date 2019/8/12 15:11
+ */
+@Repository("adnewsBanDao")
+public class AdNewsBanDaoImpl extends BaseDaoImpl<AdNewsBan> implements AdNewsBanDao {
+
+    @Override
+    public void deleteByAdNewsId(Long partyId, Long adNewsId) {
+        Map<String,Object> map = new HashMap<>();
+        map.put("partyId",partyId);
+        map.put("adNewsId",adNewsId);
+        super.getSqlSession().delete(getStatement("deleteByAdNewsId"),map);
+    }
+}

pcloud-service-book/src/main/java/com/pcloud/book/adnews/dao/impl/AdNewsClickRecordDaoImpl.java

+package com.pcloud.book.adnews.dao.impl;
+
+import com.pcloud.book.adnews.dao.AdNewsClickRecordDao;
+import com.pcloud.book.adnews.entity.AdNewsClickRecord;
+import com.pcloud.common.core.dao.BaseDaoImpl;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @author zhengyongqiang
+ * @date 2019/8/15 11:10
+ */
+@Repository("adNewsClickRecordDao")
+public class AdNewsClickRecordDaoImpl extends BaseDaoImpl<AdNewsClickRecord> implements AdNewsClickRecordDao {
+}

pcloud-service-book/src/main/java/com/pcloud/book/adnews/dao/impl/AdNewsGroupRecordDaoImpl.java

@@ -2,10 +2,13 @@ package com.pcloud.book.adnews.dao.impl;
 
 import com.pcloud.book.adnews.dao.AdNewsGroupRecordDao;
 import com.pcloud.book.adnews.entity.AdNewsGroupRecord;
+import com.pcloud.book.adnews.vo.AdNewsGroupRecordVO;
 import com.pcloud.common.core.dao.BaseDaoImpl;
 import org.springframework.stereotype.Repository;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description
@@ -18,4 +21,12 @@ public class AdNewsGroupRecordDaoImpl extends BaseDaoImpl<AdNewsGroupRecord> imp
     public Integer batchInsert(List<AdNewsGroupRecord> list) {
         return super.getSqlSession().insert(getStatement("batchInsert"), list);
     }
+
+    @Override
+    public List<AdNewsGroupRecordVO> getAdNewsGroupRecord(Long partyId, Long messageStatisticId) {
+        Map<String,Object> map = new HashMap<>();
+        map.put("partyId",partyId );
+        map.put("messageStatisticId",messageStatisticId );
+        return super.getSqlSession().selectList(getStatement("getAdNewsGroupRecord"),map);
+    }
 }

pcloud-service-book/src/main/java/com/pcloud/book/adnews/dao/impl/AdNewsMessageStatisticDaoImpl.java

+package com.pcloud.book.adnews.dao.impl;
+
+import com.pcloud.book.adnews.dao.AdNewsMessageStatisticDao;
+import com.pcloud.book.adnews.entity.AdNewsGroupRecord;
+import com.pcloud.book.adnews.entity.AdNewsMessageStatistic;
+import com.pcloud.common.core.dao.BaseDaoImpl;
+import com.pcloud.common.page.PageBeanNew;
+import org.springframework.stereotype.Repository;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author zhengyongqiang
+ * @date 2019/8/13 19:05
+ */
+@Repository("adNewsMessageStatisticDao")
+public class AdNewsMessageStatisticDaoImpl extends BaseDaoImpl<AdNewsMessageStatistic> implements AdNewsMessageStatisticDao {
+    @Override
+    public Integer batchInsert(List<AdNewsMessageStatistic> list) {
+        return super.getSqlSession().insert(getStatement("batchInsert"), list);
+    }
+}

pcloud-service-book/src/main/java/com/pcloud/book/adnews/dao/impl/AdNewsWechatChooseDaoImpl.java

+package com.pcloud.book.adnews.dao.impl;
+
+import com.pcloud.book.adnews.dao.AdNewsWechatChooseDao;
+import com.pcloud.book.adnews.entity.AdNewsWechatChoose;
+import com.pcloud.common.core.dao.BaseDaoImpl;
+import org.springframework.stereotype.Repository;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author zhengyongqiang
+ * @date 2019/8/7 11:52
+ */
+@Repository("adNewsWechatChooseDao")
+public class AdNewsWechatChooseDaoImpl extends BaseDaoImpl<AdNewsWechatChoose> implements AdNewsWechatChooseDao {
+
+    @Override
+    public Integer batchInsert(List<AdNewsWechatChoose> adNewsWechatChooses) {
+        return super.getSqlSession().insert(getStatement("batchInsert"),adNewsWechatChooses);
+    }
+
+    @Override
+    public void deleteAdNewsWechatChooseById(Long adNewsWechatId, Long partyId) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("adNewsWechatId", adNewsWechatId);
+        map.put("partyId", partyId);
+        super.getSqlSession().delete(getStatement("deleteAdNewsWechatChooseById"), map);
+    }
+
+    @Override
+    public void deleteAdNewsWechatChooseByPartyId(Long partyId) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("partyId", partyId);
+        super.getSqlSession().delete(getStatement("deleteAdNewsWechatChooseByPartyId"), map);
+    }
+
+    @Override
+    public Integer getCountByAdNewsWechatIdsAndPartyId(List<Long> adNewsWechatIds, Long partyId) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("adNewsWechatIds", adNewsWechatIds);
+        map.put("partyId", partyId);
+        return super.getSqlSession().selectOne(getStatement("getCountByAdNewsWechatIdsAndPartyId"), map);
+    }
+}

pcloud-service-book/src/main/java/com/pcloud/book/adnews/dao/impl/AdNewsWechatDaoImpl.java

+package com.pcloud.book.adnews.dao.impl;
+
+import com.pcloud.book.adnews.dao.AdNewsWechatDao;
+import com.pcloud.book.adnews.entity.AdNewsWechat;
+import com.pcloud.common.core.dao.BaseDaoImpl;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @author zhengyongqiang
+ * @date 2019/8/7 11:52
+ */
+@Repository("adNewsWechatDao")
+public class AdNewsWechatDaoImpl extends BaseDaoImpl<AdNewsWechat> implements AdNewsWechatDao {
+}

pcloud-service-book/src/main/java/com/pcloud/book/adnews/dto/AdNewsListParam.java

+package com.pcloud.book.adnews.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author zhengyongqiang
+ * @date 2019/8/12 11:33
+ */
+@Data
+@ApiModel("查询素材列表")
+public class AdNewsListParam {
+
+    @ApiModelProperty("当前人")
+    private Long partyId;
+
+    @ApiModelProperty ("标题")
+    private String title;
+
+    @ApiModelProperty("开始时间")
+    private String beginTime;
+
+    @ApiModelProperty("结束时间")
+    private String endTime;
+
+    @ApiModelProperty ("公众号id")
+    private List<Long> adNewsWechatIds;
+
+    @ApiModelProperty("已被禁用；0:没禁用; 1:已禁用;")
+    private Integer hasBan;
+
+    @ApiModelProperty("使用状态；0:未使用; 1:已使用;")
+    private Integer hasUsed;
+
+    @ApiModelProperty("当前页")
+    private Integer currentPage;
+
+    @ApiModelProperty("每页展示条数")
+    private Integer numPerPage;
+}

pcloud-service-book/src/main/java/com/pcloud/book/adnews/entity/AdNews.java

@@ -38,6 +38,12 @@ public class AdNews extends BaseEntity {
     @ApiModelProperty("是否使用")
     private Boolean hasUsed;
 
+    @ApiModelProperty("是否禁用")
+    private Boolean hasBan ;
+
+    @ApiModelProperty("公众号")
+    private String wechatName;
+
     public String getType() {
         return type;
     }
@@ -102,6 +108,22 @@ public class AdNews extends BaseEntity {
         this.hasUsed = hasUsed;
     }
 
+    public Boolean getHasBan() {
+        return hasBan;
+    }
+
+    public void setHasBan(Boolean hasBan) {
+        this.hasBan = hasBan;
+    }
+
+    public String getWechatName() {
+        return wechatName;
+    }
+
+    public void setWechatName(String wechatName) {
+        this.wechatName = wechatName;
+    }
+
     @Override
     public String toString() {
         return "AdNews{" +
@@ -113,6 +135,8 @@ public class AdNews extends BaseEntity {
                 ", shortUrl='" + shortUrl + '\'' +
                 ", newsDate='" + newsDate + '\'' +
                 ", hasUsed=" + hasUsed +
-                "} " + super.toString();
+                ", hasBan=" + hasBan +
+                ", wechatName='" + wechatName + '\'' +
+                '}';
     }
 }

pcloud-service-book/src/main/java/com/pcloud/book/adnews/entity/AdNewsBan.java

+package com.pcloud.book.adnews.entity;
+
+import com.pcloud.common.entity.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author zhengyongqiang
+ * @date 2019/8/12 15:13
+ */
+@ApiModel("禁止推送")
+@Data
+public class AdNewsBan extends BaseEntity {
+
+    private static final long serialVersionUID = -5102664638916548405L;
+
+    @ApiModelProperty("编辑id")
+    private Long adviserId;
+
+    @ApiModelProperty("新闻id")
+    private Long adNewsId;
+
+}

pcloud-service-book/src/main/java/com/pcloud/book/adnews/entity/AdNewsClickRecord.java

+package com.pcloud.book.adnews.entity;
+
+import com.pcloud.common.entity.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author zhengyongqiang
+ * @date 2019/8/15 11:02
+ */
+@Data
+@ApiModel("记录点击量")
+public class AdNewsClickRecord extends BaseEntity {
+
+    private static final long serialVersionUID = -3879628889314992714L;
+
+    @ApiModelProperty("微信统计记录id")
+    private Long messageStatisticId;
+
+    @ApiModelProperty("微信记录详情id")
+    private Long groupRecordId;
+
+    @ApiModelProperty("微信用户id")
+    private Long wechatUserId;
+}

pcloud-service-book/src/main/java/com/pcloud/book/adnews/entity/AdNewsGroup.java

@@ -3,12 +3,14 @@ package com.pcloud.book.adnews.entity;
 import com.pcloud.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 /**
  * @Description
  * @Author ruansiyuan
  * @Date 2019/7/17 15:20
  **/
+@Data
 @ApiModel("编辑新闻群关联")
 public class AdNewsGroup extends BaseEntity {
 
@@ -32,63 +34,7 @@ public class AdNewsGroup extends BaseEntity {
     @ApiModelProperty("修改人")
     private Long updateUser;
 
-    public Long getClassifyId() {
-        return classifyId;
-    }
+    @ApiModelProperty("分类")
+    private String classify;
 
-    public void setClassifyId(Long classifyId) {
-        this.classifyId = classifyId;
-    }
-
-    public Long getBookGroupId() {
-        return bookGroupId;
-    }
-
-    public void setBookGroupId(Long bookGroupId) {
-        this.bookGroupId = bookGroupId;
-    }
-
-    public Long getAdNewsSetId() {
-        return adNewsSetId;
-    }
-
-    public void setAdNewsSetId(Long adNewsSetId) {
-        this.adNewsSetId = adNewsSetId;
-    }
-
-    public Boolean getIsDelete() {
-        return isDelete;
-    }
-
-    public void setIsDelete(Boolean isDelete) {
-        this.isDelete = isDelete;
-    }
-
-    public Long getCreateUser() {
-        return createUser;
-    }
-
-    public void setCreateUser(Long createUser) {
-        this.createUser = createUser;
-    }
-
-    public Long getUpdateUser() {
-        return updateUser;
-    }
-
-    public void setUpdateUser(Long updateUser) {
-        this.updateUser = updateUser;
-    }
-
-    @Override
-    public String toString() {
-        return "AdNewsGroup{" +
-                "classifyId=" + classifyId +
-                ", bookGroupId=" + bookGroupId +
-                ", adNewsSetId=" + adNewsSetId +
-                ", isDelete=" + isDelete +
-                ", createUser=" + createUser +
-                ", updateUser=" + updateUser +
-                "} " + super.toString();
-    }
 }

pcloud-service-book/src/main/java/com/pcloud/book/adnews/entity/AdNewsGroupRecord.java

@@ -3,6 +3,7 @@ package com.pcloud.book.adnews.entity;
 import com.pcloud.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 /**
  * @Description
@@ -10,10 +11,14 @@ import io.swagger.annotations.ApiModelProperty;
  * @Date 2019/7/17 15:55
  **/
 @ApiModel("编辑新闻发送记录")
+@Data
 public class AdNewsGroupRecord extends BaseEntity{
 
     private static final long serialVersionUID = -3271071194854381077L;
 
+    @ApiModelProperty("消息统计表id")
+    private Long messageStatisticId;
+
     @ApiModelProperty("群id")
     private Long qrcodeId;
 
@@ -35,72 +40,12 @@ public class AdNewsGroupRecord extends BaseEntity{
     @ApiModelProperty("修改人")
     private Long updateUser;
 
-    public Long getQrcodeId() {
-        return qrcodeId;
-    }
-
-    public void setQrcodeId(Long qrcodeId) {
-        this.qrcodeId = qrcodeId;
-    }
-
-    public Long getClassifyId() {
-        return classifyId;
-    }
-
-    public void setClassifyId(Long classifyId) {
-        this.classifyId = classifyId;
-    }
-
-    public Long getBookGroupId() {
-        return bookGroupId;
-    }
-
-    public void setBookGroupId(Long bookGroupId) {
-        this.bookGroupId = bookGroupId;
-    }
-
-    public Long getAdNewsId() {
-        return adNewsId;
-    }
-
-    public void setAdNewsId(Long adNewsId) {
-        this.adNewsId = adNewsId;
-    }
-
-    public Long getAdNewsSetId() {
-        return adNewsSetId;
-    }
-
-    public void setAdNewsSetId(Long adNewsSetId) {
-        this.adNewsSetId = adNewsSetId;
-    }
-
-    public Long getCreateUser() {
-        return createUser;
-    }
-
-    public void setCreateUser(Long createUser) {
-        this.createUser = createUser;
-    }
-
-    public Long getUpdateUser() {
-        return updateUser;
-    }
+    @ApiModelProperty("自定义内容")
+    private String customContent;
 
-    public void setUpdateUser(Long updateUser) {
-        this.updateUser = updateUser;
-    }
+    @ApiModelProperty("内容类型，0：早报；1：晚报")
+    private Integer contentType;
 
-    @Override
-    public String toString() {
-        return "AdNewsGroupRecord{" +
-                "qrcodeId=" + qrcodeId +
-                ", classifyId=" + classifyId +
-                ", bookGroupId=" + bookGroupId +
-                ", adNewsId=" + adNewsId +
-                ", adNewsSetId=" + adNewsSetId +
-                ", createUser=" + createUser +
-                ", updateUser=" + updateUser +
-                "} " + super.toString();
-    }
+    @ApiModelProperty("insert时父子表标识")
+    Integer insertMark;
 }

pcloud-service-book/src/main/java/com/pcloud/book/adnews/entity/AdNewsMessageStatistic.java

+package com.pcloud.book.adnews.entity;
+
+import com.pcloud.common.entity.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author zhengyongqiang
+ * @date 2019/8/13 18:51
+ */
+@ApiModel("消息记录统计表")
+@Data
+public class AdNewsMessageStatistic extends BaseEntity {
+
+    private static final long serialVersionUID = 5892129036072748567L;
+
+    @ApiModelProperty("群id")
+    private Long qrcodeId;
+
+    @ApiModelProperty("分类id")
+    private Long classifyId;
+
+    @ApiModelProperty("社群码id")
+    private Long bookGroupId;
+
+    @ApiModelProperty("编辑新闻设置id")
+    private Long adNewsSetId;
+
+    @ApiModelProperty("内容来源")
+    private Integer contentFrom;
+
+    @ApiModelProperty("发送消息数")
+    private Integer messageCount;
+
+    @ApiModelProperty("创建人")
+    private Long createUser;
+
+
+    @ApiModelProperty("insert时父子表标识")
+    private Integer insertMark;
+}

pcloud-service-book/src/main/java/com/pcloud/book/adnews/entity/AdNewsSet.java

@@ -3,6 +3,7 @@ package com.pcloud.book.adnews.entity;
 import com.pcloud.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 import java.util.List;
 
@@ -11,6 +12,7 @@ import java.util.List;
  * @Author ruansiyuan
  * @Date 2019/7/17 16:13
  **/
+@Data
 @ApiModel("编辑新闻发送记录")
 public class AdNewsSet extends BaseEntity {
 
@@ -49,132 +51,21 @@ public class AdNewsSet extends BaseEntity {
     @ApiModelProperty("修改人")
     private Long updateUser;
 
+    @ApiModelProperty("内容来源")
+    private Integer contentFrom;
+
+    @ApiModelProperty("早报内容")
+    private String morningContent;
+
+    @ApiModelProperty("晚报内容")
+    private String eveningContent;
+
+    @ApiModelProperty("内容类型")
+    private Integer contentType;
+
     @ApiModelProperty("分类关联集合")
     private List<AdNewsGroup> adNewsGroups;
 
     @ApiModelProperty("分类id集合")
     private List<Long> classifyIds;
-
-    public String getMorningTime() {
-        return morningTime;
-    }
-
-    public void setMorningTime(String morningTime) {
-        this.morningTime = morningTime;
-    }
-
-    public String getEveningTime() {
-        return eveningTime;
-    }
-
-    public void setEveningTime(String eveningTime) {
-        this.eveningTime = eveningTime;
-    }
-
-    public Boolean getHasMorningOpen() {
-        return hasMorningOpen;
-    }
-
-    public void setHasMorningOpen(Boolean hasMorningOpen) {
-        this.hasMorningOpen = hasMorningOpen;
-    }
-
-    public Boolean getHasEveningOpen() {
-        return hasEveningOpen;
-    }
-
-    public void setHasEveningOpen(Boolean hasEveningOpen) {
-        this.hasEveningOpen = hasEveningOpen;
-    }
-
-    public Integer getSendCount() {
-        return sendCount;
-    }
-
-    public void setSendCount(Integer sendCount) {
-        this.sendCount = sendCount;
-    }
-
-    public String getStartContent() {
-        return startContent;
-    }
-
-    public void setStartContent(String startContent) {
-        this.startContent = startContent;
-    }
-
-    public String getEndContent() {
-        return endContent;
-    }
-
-    public void setEndContent(String endContent) {
-        this.endContent = endContent;
-    }
-
-    public Boolean getHasStartContent() {
-        return hasStartContent;
-    }
-
-    public void setHasStartContent(Boolean hasStartContent) {
-        this.hasStartContent = hasStartContent;
-    }
-
-    public Boolean getHasEndContent() {
-        return hasEndContent;
-    }
-
-    public void setHasEndContent(Boolean hasEndContent) {
-        this.hasEndContent = hasEndContent;
-    }
-
-    public Long getCreateUser() {
-        return createUser;
-    }
-
-    public void setCreateUser(Long createUser) {
-        this.createUser = createUser;
-    }
-
-    public Long getUpdateUser() {
-        return updateUser;
-    }
-
-    public void setUpdateUser(Long updateUser) {
-        this.updateUser = updateUser;
-    }
-
-    public List<AdNewsGroup> getAdNewsGroups() {
-        return adNewsGroups;
-    }
-
-    public void setAdNewsGroups(List<AdNewsGroup> adNewsGroups) {
-        this.adNewsGroups = adNewsGroups;
-    }
-
-    public List<Long> getClassifyIds() {
-        return classifyIds;
-    }
-
-    public void setClassifyIds(List<Long> classifyIds) {
-        this.classifyIds = classifyIds;
-    }
-
-    @Override
-    public String toString() {
-        return "AdNewsSet{" +
-                "morningTime='" + morningTime + '\'' +
-                ", eveningTime='" + eveningTime + '\'' +
-                ", hasMorningOpen=" + hasMorningOpen +
-                ", hasEveningOpen=" + hasEveningOpen +
-                ", sendCount=" + sendCount +
-                ", startContent='" + startContent + '\'' +
-                ", endContent='" + endContent + '\'' +
-                ", hasStartContent=" + hasStartContent +
-                ", hasEndContent=" + hasEndContent +
-                ", createUser=" + createUser +
-                ", updateUser=" + updateUser +
-                ", adNewsGroups=" + adNewsGroups +
-                ", classifyIds=" + classifyIds +
-                "} " + super.toString();
-    }
 }

pcloud-service-book/src/main/java/com/pcloud/book/adnews/entity/AdNewsWechat.java

+package com.pcloud.book.adnews.entity;
+
+import com.pcloud.common.entity.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * @author zhengyongqiang
+ * @date 2019/8/7 11:23
+ */
+@ApiModel("新闻微信公众号")
+public class AdNewsWechat extends BaseEntity {
+
+    private static final long serialVersionUID = 454065623001378319L;
+
+    public AdNewsWechat() {
+    }
+
+    public AdNewsWechat(String newsFrom, String wechatName, Long adviserId, Boolean isDelete) {
+        this.newsFrom = newsFrom;
+        this.wechatName = wechatName;
+        this.adviserId = adviserId;
+        this.isDelete = isDelete;
+    }
+
+    @ApiModelProperty("微信公众号唯一标识")
+    private String newsFrom;
+
+    @ApiModelProperty("微信公众号名称")
+    private String wechatName;
+
+    @ApiModelProperty("编辑id")
+    private Long adviserId;
+
+    @ApiModelProperty("是否删除")
+    private Boolean isDelete;
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public String getNewsFrom() {
+        return newsFrom;
+    }
+
+    public void setNewsFrom(String newsFrom) {
+        this.newsFrom = newsFrom;
+    }
+
+    public String getWechatName() {
+        return wechatName;
+    }
+
+    public void setWechatName(String wechatName) {
+        this.wechatName = wechatName;
+    }
+
+    public Long getAdviserId() {
+        return adviserId;
+    }
+
+    public void setAdviserId(Long adviserId) {
+        this.adviserId = adviserId;
+    }
+
+    public Boolean getDelete() {
+        return isDelete;
+    }
+
+    public void setDelete(Boolean delete) {
+        isDelete = delete;
+    }
+
+    @Override
+    public String toString() {
+        return "AdNewsWechat{" +
+                "newsFrom='" + newsFrom + '\'' +
+                ", wechatName='" + wechatName + '\'' +
+                ", adviserId=" + adviserId +
+                ", isDelete=" + isDelete +
+                ", createTime=" + createTime +
+                ", updateTime=" + updateTime +
+                '}';
+    }
+}

pcloud-service-book/src/main/java/com/pcloud/book/adnews/entity/AdNewsWechatChoose.java

+package com.pcloud.book.adnews.entity;
+
+import com.pcloud.common.entity.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * @author zhengyongqiang
+ * @date 2019/8/7 11:32
+ */
+@ApiModel("新闻公众号选择关联")
+public class AdNewsWechatChoose extends BaseEntity {
+
+    private static final long serialVersionUID = 209558478794921448L;
+
+    @ApiModelProperty("编辑id")
+    private Long adviserId;
+
+    @ApiModelProperty("公众号id")
+    private Long adNewsWechatId;
+
+    @ApiModelProperty("是否删除")
+    private Boolean isDelete;
+
+    @ApiModelProperty("创建人")
+    private Long createUser;
+
+    @ApiModelProperty("修改人")
+    private Long updateUser;
+
+    public Long getAdviserId() {
+        return adviserId;
+    }
+
+    public void setAdviserId(Long adviserId) {
+        this.adviserId = adviserId;
+    }
+
+    public Long getAdNewsWechatId() {
+        return adNewsWechatId;
+    }
+
+    public void setAdNewsWechatId(Long adNewsWechatId) {
+        this.adNewsWechatId = adNewsWechatId;
+    }
+
+    public Boolean getDelete() {
+        return isDelete;
+    }
+
+    public void setDelete(Boolean delete) {
+        isDelete = delete;
+    }
+
+    public Long getCreateUser() {
+        return createUser;
+    }
+
+    public void setCreateUser(Long createUser) {
+        this.createUser = createUser;
+    }
+
+    public Long getUpdateUser() {
+        return updateUser;
+    }
+
+    public void setUpdateUser(Long updateUser) {
+        this.updateUser = updateUser;
+    }
+
+    @Override
+    public String toString() {
+        return "AdNewsWechatChoose{" +
+                "adviserId=" + adviserId +
+                ", adNewsWechatId=" + adNewsWechatId +
+                ", isDelete=" + isDelete +
+                ", createUser=" + createUser +
+                ", updateUser=" + updateUser +
+                ", createTime=" + createTime +
+                ", updateTime=" + updateTime +
+                '}';
+    }
+}

pcloud-service-book/src/main/java/com/pcloud/book/adnews/enums/AdContentFromEnum.java

+package com.pcloud.book.adnews.enums;
+
+import com.pcloud.book.advertising.enums.AdDetailModeEnum;
+import org.springframework.amqp.rabbit.support.PublisherCallbackChannelImpl;
+
+/**
+ * 早晚报内容来源
+ *
+ * @author zhengyongqiang
+ * @date 2019/8/6 17:50
+ */
+public enum AdContentFromEnum {
+
+    WECHAT(0, "微信公众号"),
+    CUSTOM(1, "自定义内容 ");
+
+    public final Integer key;
+
+    public final String name;
+
+    AdContentFromEnum(Integer key, String name) {
+        this.key = key;
+        this.name = name;
+    }
+
+    public static String getNameByKey(String key) {
+        AdContentFromEnum[] var1 = values();
+        int var2 = var1.length;
+        for (int var3 = 0; var3 < var2; ++var3) {
+            AdContentFromEnum methodEnum = var1[var3];
+            if (methodEnum.key.equals(key)) {
+                return methodEnum.name;
+            }
+        }
+        return null;
+    }
+}

pcloud-service-book/src/main/java/com/pcloud/book/adnews/enums/AdNewsBanEnum.java

+package com.pcloud.book.adnews.enums;
+
+/**
+ * 禁止推送/允许推送
+ * @author zhengyongqiang
+ * @date 2019/8/12 14:42
+ */
+public enum AdNewsBanEnum {
+    NONBAN(0),  // 不禁止推送
+    BAN(1);     // 禁止推送
+
+    public final Integer key;
+
+    AdNewsBanEnum(Integer key){
+        this.key=key;
+    }
+}

pcloud-service-book/src/main/java/com/pcloud/book/adnews/enums/AdNewsContentTypeEnum.java

+package com.pcloud.book.adnews.enums;
+
+import java.security.Key;
+
+/**
+ * 内容类型
+ *
+ * @author zhengyongqiang
+ * @date 2019/8/16 17:25
+ */
+public enum AdNewsContentTypeEnum {
+
+    MORNING(0, "早报"),
+    EVENING(1, "晚报");
+
+    public final Integer key;
+    public final String description;
+
+    AdNewsContentTypeEnum(Integer key, String description) {
+        this.key = key;
+        this.description = description;
+    }
+
+    public static String getDescriptionByKey(Integer key) {
+        AdNewsContentTypeEnum[] var1 = values();
+        int var2 = var1.length;
+        for (int var3 = 0; var3 < var2; ++var3) {
+            AdNewsContentTypeEnum methodEnum = var1[var3];
+            if (methodEnum.key.equals(key)) {
+                return methodEnum.description;
+            }
+        }
+        return null;
+    }
+}

pcloud-service-book/src/main/java/com/pcloud/book/adnews/enums/AdNewsWechatEnum.java

+package com.pcloud.book.adnews.enums;
+
+/**
+ * 公众号状态
+ * @author zhengyongqiang
+ * @date 2019/8/7 11:37
+ */
+public enum AdNewsWechatEnum {
+
+    EXAMINING(0),   //  审核中
+    ENABLE(1);      // 已启用
+
+    public final Integer key;
+
+    AdNewsWechatEnum(Integer key){
+        this.key=key;
+    }
+}

pcloud-service-book/src/main/java/com/pcloud/book/adnews/facade/AdNewsFacade.java

 package com.pcloud.book.adnews.facade;
 
+import com.pcloud.book.adnews.entity.AdNewsClickRecord;
 import com.pcloud.book.adnews.entity.AdNewsSet;
+import com.pcloud.book.adnews.dto.AdNewsListParam;
 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 io.swagger.annotations.ApiParam;
+import io.swagger.annotations.*;
 import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
-@FeignClient(value = "pcloud-service-book",qualifier = "adNewsFacadeCloud",path = "adNews")
+@FeignClient(value = "pcloud-service-book", qualifier = "adNewsFacadeCloud", path = "adNews")
 @Api(description = "推送群消息外部接口")
 public interface AdNewsFacade {
 
-
     @ApiOperation("新增编辑端早晚报设置")
     @PostMapping("/createAdNewsSet")
     ResponseDto<?> createAdNewsSet(
@@ -37,6 +36,7 @@ public interface AdNewsFacade {
             @RequestHeader("token") @ApiParam("token信息") String token
     ) throws BizException, PermissionException;
 
+    @Deprecated
     @ApiOperation("编辑添加选择的早晚报素材")
     @PostMapping("/createAdNewsChooseBatch")
     ResponseDto<?> createAdNewsChooseBatch(
@@ -44,6 +44,7 @@ public interface AdNewsFacade {
             @RequestBody @ApiParam("新闻id集合") List<Long> adNewsIds
     ) throws BizException, PermissionException;
 
+    @Deprecated
     @ApiOperation("编辑移除选择的早晚报素材")
     @GetMapping("/deleteAdNewsChoose")
     ResponseDto<?> deleteAdNewsChoose(
@@ -51,23 +52,91 @@ public interface AdNewsFacade {
             @RequestParam @ApiParam("adNewsChooseId") Long adNewsChooseId
     ) throws BizException, PermissionException;
 
-    @ApiOperation("获取早晚报素材库")
-    @GetMapping("/getAdNewsList")
+    @Deprecated
+    @ApiOperation("获取编辑选择的早晚报素材库")
+    @GetMapping("/getAdNewsChooseList")
+    ResponseDto<?> getAdNewsChooseList(
+            @RequestHeader("token") @ApiParam("token信息") String token,
+            @RequestParam(value = "title", required = false) @ApiParam("标题") String title,
+            @RequestParam(value = "hasUsed", required = false) @ApiParam("标题") Boolean hasUsed,
+            @RequestParam("currentPage") @ApiParam("当前页") Integer currentPage,
+            @RequestParam("numPerPage") @ApiParam("每页条数") Integer numPerPage
+    ) throws BizException, PermissionException;
+
+    @ApiOperation("早晚报素材库")
+    @PostMapping("/getAdNewsList")
     ResponseDto<?> getAdNewsList(
             @RequestHeader("token") @ApiParam("token信息") String token,
-            @RequestParam(value = "title",required = false) @ApiParam("标题") String title,
+            @RequestBody @ApiParam("查询参数") AdNewsListParam adNewsListParam
+    ) throws BizException, PermissionException;
+
+    @ApiOperation("禁用/解除禁用")
+    @GetMapping("/saveAdNewsBan")
+    ResponseDto<?> saveAdNewsBan(
+            @RequestHeader("token") @ApiParam("token信息") String token,
+            @RequestParam("adNewsId") @ApiParam("新闻id") Long adNewsId,
+            @RequestParam("hasBan") @ApiParam("禁止推送") Integer hasBan
+    ) throws BizException, PermissionException;
+
+    @ApiOperation("添加编辑选择的公众号")
+    @PostMapping("/createAdNewsWechatChooseBatch")
+    ResponseDto<?> createAdNewsWechatChooseBatch(
+            @RequestHeader("token") @ApiParam("token信息") String token,
+            @RequestBody @ApiParam("选择的公众号主键") List<Long> adNewsWechatIds
+    ) throws BizException, PermissionException;
+
+    @ApiOperation("移除编辑已选择的公众号")
+    @GetMapping("/deleteAdNewsWechatChoose")
+    ResponseDto<?> deleteAdNewsWechatChoose(
+            @RequestHeader("token") @ApiParam("token信息") String token,
+            @RequestParam(value = "adNewsWechatId") @ApiParam("公众号主键") Long adNewsWechatId
+    ) throws BizException, PermissionException;
+
+    @ApiOperation("获取编辑已选择的公众号")
+    @GetMapping("/getAdNewsWechatChooseList")
+    ResponseDto<?> getAdNewsWechatChooseList(
+            @RequestHeader("token") @ApiParam("token信息") String token,
             @RequestParam("currentPage") @ApiParam("当前页") Integer currentPage,
             @RequestParam("numPerPage") @ApiParam("每页条数") Integer numPerPage
     ) throws BizException, PermissionException;
 
-    @ApiOperation("获取编辑选择的早晚报素材库")
-    @GetMapping("/getAdNewsChooseList")
-    ResponseDto<?> getAdNewsChooseList(
+    @ApiOperation("获取所有的公众号列表")
+    @GetMapping("/getAdNewsWechatList")
+    ResponseDto<?> getAdNewsWechatList(
             @RequestHeader("token") @ApiParam("token信息") String token,
-            @RequestParam(value = "title",required = false) @ApiParam("标题") String title,
-            @RequestParam(value = "hasUsed",required = false) @ApiParam("标题") Boolean hasUsed,
             @RequestParam("currentPage") @ApiParam("当前页") Integer currentPage,
             @RequestParam("numPerPage") @ApiParam("每页条数") Integer numPerPage
     ) throws BizException, PermissionException;
 
+    @ApiOperation("获取早晚报发送记录")
+    @GetMapping("/getAdNewsMessageStatistic")
+    ResponseDto<?> getAdNewsMessageStatistic(
+            @RequestHeader("token") @ApiParam("token信息") String token,
+            @RequestParam(value = "title", required = false) @ApiParam("群名称、群分类、社群码、社群书") String title,
+            @RequestParam(value = "beginTime", required = false) @ApiParam("开始日期") String beginTime,
+            @RequestParam(value = "endTime", required = false) @ApiParam("结束日期") String endTime,
+            @RequestParam(value = "proLabelId", required = false) @ApiParam("专业") Long proLabelId,
+            @RequestParam(value = "depLabelId", required = false) @ApiParam("深度") Long depLabelId,
+            @RequestParam(value = "purLabelId", required = false) @ApiParam("目的") Long purLabelId,
+            @RequestParam(value = "currentPage", required = false, defaultValue = "0") @ApiParam("当前页") Integer currentPage,
+            @RequestParam(value = "numPerPage", required = false, defaultValue = "10") @ApiParam("每页条数") Integer numPerPage
+    ) throws BizException, PermissionException;
+
+
+    @ApiOperation("查询早晚报发送详情")
+    @GetMapping("/getAdNewsGroupRecord")
+    ResponseDto<?> getAdNewsGroupRecord(
+            @RequestHeader("token") @ApiParam("token信息") String token,
+            @RequestParam("messageStatisticId") @ApiParam("统计表id") Long messageStatisticId
+    ) throws BizException, PermissionException;
+
+    @ApiOperation("记录用户点击量")
+    @PostMapping("/addAdNewsClickRecord")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "userInfo", value = "Cookie", dataType = "String", paramType = "header"),
+            @ApiImplicitParam(name = "adNewsClickRecord", value = "用户点击量对象", dataType = "AdNewsClickRecord", paramType = "body")})
+    ResponseDto<?> addAdNewsClickRecord(
+        @CookieValue("userInfo") @ApiParam("用户信息") String userInfo,
+        @RequestBody @ApiParam("用户点击量对象") AdNewsClickRecord adNewsClickRecord
+    ) throws BizException, PermissionException;
 }

pcloud-service-book/src/main/java/com/pcloud/book/adnews/vo/AdNewsGroupRecordVO.java

+package com.pcloud.book.adnews.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author zhengyongqiang
+ * @date 2019/8/14 14:41
+ */
+@ApiModel
+@Data
+public class AdNewsGroupRecordVO {
+
+    @ApiModelProperty("主键id")
+    private Long id;
+
+    @ApiModelProperty("新闻id")
+    private Long adNewsId;
+
+    @ApiModelProperty("公众号名称")
+    private String wechatName;
+
+    @ApiModelProperty("新闻标题")
+    private String title;
+
+    @ApiModelProperty("新闻短链接")
+    private String shortUrl;
+
+    @ApiModelProperty("自定义早晚报内容")
+    private String customContent;
+
+    @ApiModelProperty("内容类型，0：早报；1：晚报")
+    private Integer contentType;
+
+}

pcloud-service-book/src/main/java/com/pcloud/book/adnews/vo/AdNewsMessageStatisticVO.java

+package com.pcloud.book.adnews.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * @author zhengyongqiang
+ * @date 2019/8/14 10:43
+ */
+@Data
+public class AdNewsMessageStatisticVO {
+
+    @ApiModelProperty("主键id")
+    private Long id;
+
+    @ApiModelProperty("微信群名称")
+    private String groupName;
+
+    @ApiModelProperty("分类")
+    private String classify;
+
+    @ApiModelProperty("社群码名称")
+    private String groupQrcodeName;
+
+    @ApiModelProperty("社群书名称")
+    private String bookName;
+
+    @ApiModelProperty("专业")
+    private String depLabelName;
+
+    @ApiModelProperty("深度")
+    private String proLabelName;
+
+    @ApiModelProperty("目的")
+    private String purLabelName;
+
+    @ApiModelProperty("专业Id")
+    private Long depLabelId;
+
+    @ApiModelProperty("深度Id")
+    private Long proLabelId;
+
+    @ApiModelProperty("目的Id")
+    private Long purLabelId;
+
+    @ApiModelProperty("内容来源")
+    private Integer contentFrom;
+
+    @ApiModelProperty("发送消息数")
+    private Integer messageCount;
+
+    @ApiModelProperty("发送时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createTime;
+
+    @ApiModelProperty("点击次数")
+    private Long clickCount;
+
+    @ApiModelProperty("点击人数")
+    private Long userCount;
+}

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

@@ -758,7 +758,7 @@ public class AdvertisingSpaceBizImpl implements AdvertisingSpaceBiz {
                     }
                 }
                 SendTextMessageVO sendTextMessageVO = new SendTextMessageVO();
-                sendTextMessageVO.setGroupId(groupId);
+                sendTextMessageVO.setWxGroupId(groupId);
                 sendTextMessageVO.setAltId(altId);
                 sendTextMessageVO.setContent(adTitle);
                 sendTextMessageVO.setIp(findIp(groupId));
@@ -769,7 +769,7 @@ public class AdvertisingSpaceBizImpl implements AdvertisingSpaceBiz {
                 sendArticleMessageVO.setAltId(altId);
                 sendArticleMessageVO.setTitle(advertisingSpace.getAdTitle());
                 sendArticleMessageVO.setDescription(advertisingSpace.getAdSlogan());
-                sendArticleMessageVO.setGroupId(groupId);
+                sendArticleMessageVO.setWxGroupId(groupId);
                 String adLink = "";
                 if (!StringUtil.isEmpty(advertisingSpace.getAdLink())) {
                     if (advertisingSpace.getAdLink().contains("?")) {
@@ -791,7 +791,7 @@ public class AdvertisingSpaceBizImpl implements AdvertisingSpaceBiz {
             } else if (AdPositionModeEnum.JUST_PIC.modeCode.equals(advertisingSpace.getAdPositionMode())) {
                 SendPicMessageVO sendPicMessageVO = new SendPicMessageVO();
                 sendPicMessageVO.setAltId(altId);
-                sendPicMessageVO.setGroupId(groupId);
+                sendPicMessageVO.setWxGroupId(groupId);
                 sendPicMessageVO.setPicUrl(advertisingSpace.getAdPic());
                 sendPicMessageVO.setIp(findIp(groupId));
                 LOGGER.info("发送微信消息-纯图片" + sendPicMessageVO.toString());

pcloud-service-book/src/main/java/com/pcloud/book/book/set/BookSet.java

@@ -1317,8 +1317,10 @@ public class BookSet {
         Map<Long, Long> bookIdsMap = new HashMap<>();
         for (Object object : bookList) {
             BookDto bookDto = (BookDto) object;
+            if (bookDto != null && bookDto.getBookId() != null) {
                 bookIdsMap.put(bookDto.getBookId(), bookDto.getBookId());
             }
+        }
         List<Long> bookIds = Lists.newArrayList(bookIdsMap.values());
         if (CollectionUtils.isEmpty(bookIds)) {
             return;

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

@@ -377,7 +377,7 @@ public class BookClockBizImpl implements BookClockBiz {
                             //获取机器人微信号
                             String altId = wechatGroupConsr.getRobotIdByGroupId(weixinGroupId);
                             SendTextMessageVO sendTextMessageVO = new SendTextMessageVO();
-                            sendTextMessageVO.setGroupId(weixinGroupId);
+                            sendTextMessageVO.setWxGroupId(weixinGroupId);
                             sendTextMessageVO.setAltId(altId);
                             sendTextMessageVO.setContent(bookClockInfoDTO.getNoticeContent());
                             if(!MapUtils.isEmpty(wxQrcodeDTOMap) && wxQrcodeDTOMap.containsKey(weixinGroupId)){

pcloud-service-book/src/main/java/com/pcloud/book/consumer/trade/TradeConsr.java

@@ -126,4 +126,16 @@ public class TradeConsr {
         return amount;
     }
 
+    @ParamLog("获取用户购买或者参与过的社群码ID")
+    public List<Long> getBuyBookGroupIdList(Long channelId, Long wechatUserId) throws BizException {
+        List<Long> results = new ArrayList<>();
+        try {
+            ResponseEntity<ResponseDto<List<Long>>> responseEntity = orderFormService.getBuyBookGroupIdList(wechatUserId, channelId);
+            results = ResponseHandleUtil.parseListResponse(responseEntity, Long.class);
+        } catch (Exception e) {
+            LOGGER.error("获取用户购买或者参与过的社群码ID详情:" + e.getMessage(), e);
+        }
+        return results;
+    }
+
 }

pcloud-service-book/src/main/java/com/pcloud/book/consumer/wechatgroup/WechatGroupConsr.java

@@ -15,7 +15,10 @@ import com.pcloud.wechatgroup.group.service.GroupMemberService;
 import com.pcloud.wechatgroup.message.dto.GroupChatCountDTO;
 import com.pcloud.wechatgroup.message.service.MessageService;
 import com.pcloud.wechatgroup.monitor.service.MonitorService;
+import com.pcloud.wechatgroup.selfrobot.service.SelfRobotService;
 
+import com.pcloud.wechatgroup.selfrobot.dto.SelfRobotDTO;
+import com.pcloud.wechatgroup.selfrobot.service.SelfRobotService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
@@ -38,6 +41,44 @@ public class WechatGroupConsr {
     private MessageService messageService;
     @Autowired
     private MonitorService monitorService;
+    @Autowired
+    private SelfRobotService selfRobotService;
+
+    @ParamLog("根据机器人id和用户微信id获取最新暗号")
+    public String getCipherByRobotAndUserWxId(String robotWxId, String userWxId) {
+        if (StringUtil.isBlank(robotWxId) || StringUtil.isBlank(userWxId)) {
+            return null;
+        }
+        try {
+            return ResponseHandleUtil.parseResponse(selfRobotService.getCipherByRobotAndUserWxId(robotWxId, userWxId), String.class);
+        } catch (BizException e) {
+            log.warn("根据机器人id和用户微信id获取最新暗号失败:" + e.getMessage(), e);
+            throw new BizException(e.getCode(), e.getMessage());
+        } catch (Exception e) {
+            log.error("根据机器人id和用户微信id获取最新暗号.[getCipherByRobotAndUserWxId]:" + e.getMessage(), e);
+            throw new BookBizException(BookBizException.INVOKE_RES_ERROR, "服务内部错误，请稍后重试");
+        } finally {
+            log.info("【根据机器人id和用户微信id获取最新暗号,<END>");
+        }
+    }
+
+    @ParamLog("是否群机器人")
+    public Boolean isGroupRobot(String robotWxId) {
+        if (StringUtil.isBlank(robotWxId)) {
+            return null;
+        }
+        try {
+            return ResponseHandleUtil.parseResponse(selfRobotService.isGroupRobot(robotWxId), Boolean.class);
+        } catch (BizException e) {
+            log.warn("是否群机器人失败:" + e.getMessage(), e);
+            throw new BizException(e.getCode(), e.getMessage());
+        } catch (Exception e) {
+            log.error("是否群机器人.[isGroupRobot]:" + e.getMessage(), e);
+            throw new BookBizException(BookBizException.INVOKE_RES_ERROR, "服务内部错误，请稍后重试");
+        } finally {
+            log.info("【是否群机器人,<END>");
+        }
+    }
 
     /**
      * 是否黑名单
@@ -271,6 +312,16 @@ public class WechatGroupConsr {
         return map;
     }
 
+    @ParamLog(value = "获取可用机器人")
+    public SelfRobotDTO getAvailableRobot(Long wechatUserId, Integer largeTemplet, Long classifyId) {
+        SelfRobotDTO selfRobotDTO = null;
+        try {
+            selfRobotDTO = ResponseHandleUtil.parseResponse(selfRobotService.getAvailableRobot(wechatUserId, largeTemplet, classifyId), SelfRobotDTO.class);
+        } catch (Exception e) {
+            log.error("获取可用机器人.[getAvailableRobot]:" + e.getMessage(), e);
+        }
+        return selfRobotDTO;
+    }
     @ParamLog("根据用户微信ID获取用户信息")
     public GroupUserDTO getWxUserInfoByWxUserId(String wxUserId) {
         GroupUserDTO dto = new GroupUserDTO();

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

 package com.pcloud.book.group.biz;
 
 import com.pcloud.book.book.dto.BookDto;
+import com.pcloud.book.group.dto.*;
 import com.pcloud.book.group.dto.AppStatisticsDTO;
 import com.pcloud.book.group.dto.BookGroupDTO;
 import com.pcloud.book.group.dto.ClassifyKeywordDTO;
+import com.pcloud.book.group.dto.GroupStoreMyPayDto;
 import com.pcloud.book.group.dto.QrcodeNameAndProIdDTO;
 import com.pcloud.book.group.entity.BookGroup;
+import com.pcloud.book.group.vo.*;
 import com.pcloud.book.group.vo.StatisticVO;
+import com.pcloud.common.dto.StoreFlowInfoDto;
 import com.pcloud.common.exceptions.BizException;
 import com.pcloud.common.page.PageBean;
 import com.pcloud.common.page.PageBeanNew;
@@ -126,6 +130,13 @@ public interface BookGroupBiz {
     PageBean listBookGroup4Adviser(Map<String, Object> paramMap, PageParam pageParam, Long adviserId) throws BizException;
 
     /**
+    * @description 获取社群书列表(运营)
+    * @author 戴兴
+    * @date 2019/7/23 15:39
+    */
+    PageBean listBookGroup4Channel(Long channelId, ListBookGroup4ChannelParamVO listBookGroup4ChannelParamVO);
+
+    /**
      * 获取社群书列表(编辑)
      * @param paramMap 参数Map
      * @return
@@ -196,6 +207,13 @@ public interface BookGroupBiz {
     BookGroupDTO getBaseInfoBySceneId(Long sceneId);
 
     /**
+    * @description 更新个人二维码
+    * @author 戴兴
+    * @date 2019/8/7 16:30
+    */
+    void updatePersonQrcode(PersonalQrcodeDTO personalQrcodeDTO);
+
+    /**
      * @Author:lili
      * @Desr:是否是特殊的出版社
      * @Date:2019/5/28 11:14
@@ -250,4 +268,58 @@ public interface BookGroupBiz {
      * 删除社群码
      */
     void deleteBookGroup(Long bookGroupId);
+
+    /**
+     * 根据分类id获取个人二维码信息
+     */
+    OwnAltQrcodeInfoDTO getOwnAltQrcodeInfoDTOByClassifyId(Long wechatUserId, Long classifyId);
+
+    /**
+     * 获取暗号状态
+     */
+    Integer getCipherState(String cipher);
+
+    /**
+     * 更新状态为已使用
+     */
+    void updateCipherStateToUsed(String cipher, String wxId);
+
+    /**
+     * 获取个人二维码方式群已使用和未使用数量
+     */
+    GroupUseDTO getGroupUse(List<String> altIds);
+
+    /**
+     * 获取所有的大类分类
+     */
+    List<LargeTempletDTO> getAllLargTemplet();
+
+    /**
+     * 根据微信id和机器人id获取分类集合
+     */
+    List<JoinGroupCipherDTO> getClassifyIdsByWxIdAndAltId(String wxId,String altId);
+
+    /**
+     * 获取暗号基本信息
+     */
+    GroupCipherDTO getJoinGroupCipher(String cipher);
+
+    /**
+     * 为信息流批量获取社群书基本信息
+     */
+    Map<Long, StoreFlowInfoDto> getFlowInfoByBookGroupIds(List<Long> bookGroupIds);
+
+    /**
+     * 获取指定条数社群书基本信息
+     */
+    Map<Long, StoreFlowInfoDto> getBookGroupInfoByChannelId(Long channelId, Integer itemNum);
+
+    /**
+     * 知识商城获取社群书信息
+     */
+    PageBeanNew<StoreFlowInfoDto> listBookGroup4KnowledgeMall(Long channelId, int currentPage, int numPerPage);
+    /**
+     * 获取用户购买或者参与过的社群书信息
+     */
+    PageBeanNew<GroupStoreMyPayDto> getUserBrowseGroup4KnowLedgeMall(Long channelId, Long wechatUserId, Integer currentPage, Integer numPerPage);
 }

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

 package com.pcloud.book.group.biz;
 
-import com.pcloud.book.group.dto.*;
+import com.pcloud.book.group.dto.BookGroupStatisticDTO;
+import com.pcloud.book.group.dto.ClassifyDTO;
+import com.pcloud.book.group.dto.ClassifyLearningReportDto;
+import com.pcloud.book.group.dto.GroupClassifyQrcodeDTO;
+import com.pcloud.book.group.dto.GroupNameAndMaxSeqDTO;
+import com.pcloud.book.group.dto.GroupQrcodeBaseDTO;
+import com.pcloud.book.group.dto.ProAssocGroupAndUserNumberDTO;
 import com.pcloud.book.group.entity.BookGroupClassify;
-import com.pcloud.book.group.vo.*;
+import com.pcloud.book.group.vo.AddClassifyVO;
+import com.pcloud.book.group.vo.AdviserClassifyParam;
+import com.pcloud.book.group.vo.AdviserClassifyVO;
+import com.pcloud.book.group.vo.BookGroupClassifyVO;
+import com.pcloud.book.group.vo.BookGroupQrcodeStatisticVO;
+import com.pcloud.book.group.vo.ClassifyAndGroupCountVO;
+import com.pcloud.book.group.vo.ClassifyAndUserCountVO;
+import com.pcloud.book.group.vo.ClassifyNameVO;
+import com.pcloud.book.group.vo.ClassifyVO;
+import com.pcloud.book.group.vo.GroupQrcode4ClassifyVO;
+import com.pcloud.book.group.vo.ListBookGroupQrcodeParamVO;
+import com.pcloud.book.group.vo.ListClassify4WechatVO;
+import com.pcloud.book.group.vo.ListClassifyVO;
+import com.pcloud.book.group.vo.ListGroupClassifyParam;
+import com.pcloud.book.group.vo.StatisticVO;
+import com.pcloud.book.group.vo.UpdateClassifyVO;
+import com.pcloud.book.group.vo.UpdateRankVO;
 import com.pcloud.common.page.PageBeanNew;
 import com.pcloud.common.page.PageParam;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
@@ -106,6 +129,11 @@ public interface BookGroupClassifyBiz {
     List<ListClassify4WechatVO> listClassify4Wechat(Long bookGroupId, Long wechatUserId);
 
     /**
+     * 批量获取分类信息
+     */
+    List<GroupClassifyQrcodeDTO> listClassifyQrcodeInfo(List<Long> classifyIds);
+
+    /**
      * @Author:lili
      * @Desr:客户端根据群分类获取二维码
      * @Date:2019/4/29 17:21
@@ -113,6 +141,11 @@ public interface BookGroupClassifyBiz {
     GroupQrcode4ClassifyVO getGroupQrcode4ClassifyWechat(Long classifyId, Long wechatUserId);
 
     /**
+     * 用户获取具体进群id
+     */
+    String getWxGroupIdByClassifyIdAndWechatId(Long classifyId, Long wechatUserId);
+
+    /**
      * @Author:lili
      * @Desr:获取编辑所有的分类
      * @Date:2019/4/30 15:33
@@ -180,6 +213,14 @@ public interface BookGroupClassifyBiz {
     PageBeanNew<ClassifyLearningReportDto> listClassifyForLearningReport(Integer currentPage, Integer numPerPage, String keyword, Long partyId);
 
     /**
+     * 用户支付金额
+     * @param qrcodeId
+     * @param wxId
+     * @return
+     */
+    public BigDecimal getPayPrice(Long qrcodeId, String wxId);
+
+    /**
      * 拖动排序
      */
     void dragSortClassify(List<Long> classifyIds);

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

@@ -22,7 +22,7 @@ public interface WeixinQrcodeBiz {
      * @Desr:从二维码获取一个二维码
      * @Date:2019/4/17 16:17
      */
-    WeixinQrcodeDTO getOneQrcode();
+    WeixinQrcodeDTO getOneQrcode(Integer generation);
 
     /**
      * @Author:lili
@@ -107,6 +107,11 @@ public interface WeixinQrcodeBiz {
     QrStatisticsVO getQrStatistics();
 
     /**
+     * 根据版本分类统计平台端二维码数据
+     */
+    List<QrStatisticsVO> getQrStatisticsByVersion();
+
+    /**
      * 分页获取可用微信群
      * @param currentPage
      * @param numPerPage

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

@@ -10,25 +10,60 @@ 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.group.biz.*;
-
+import com.pcloud.book.group.biz.BookGroupBiz;
+import com.pcloud.book.group.biz.BookGroupClassifyBiz;
+import com.pcloud.book.group.biz.GroupAnnouncementBiz;
+import com.pcloud.book.group.biz.GroupQrcodeBiz;
+import com.pcloud.book.group.biz.WeixinQrcodeBiz;
 import com.pcloud.book.group.dao.BookClassifyBuyRecordDao;
 import com.pcloud.book.group.dao.BookGroupClassifyDao;
 import com.pcloud.book.group.dao.BookQrcodeUserDao;
-
-import com.pcloud.book.group.dao.*;
-
-import com.pcloud.book.group.dto.*;
+import com.pcloud.book.group.dao.JoinGroupCipherDao;
+import com.pcloud.book.group.dao.LearningReportBrowseRecordDao;
+import com.pcloud.book.group.dao.LearningReportTouchRecordDao;
+import com.pcloud.book.group.dto.BookGroupDTO;
+import com.pcloud.book.group.dto.BookGroupStatisticDTO;
+import com.pcloud.book.group.dto.BookWxQrcodeDTO;
+import com.pcloud.book.group.dto.ClassifyDTO;
+import com.pcloud.book.group.dto.ClassifyLearningCountDto;
+import com.pcloud.book.group.dto.ClassifyLearningReportDto;
+import com.pcloud.book.group.dto.GroupAndUserNumberDTO;
+import com.pcloud.book.group.dto.GroupClassifyQrcodeDTO;
+import com.pcloud.book.group.dto.GroupNameAndMaxSeqDTO;
+import com.pcloud.book.group.dto.GroupQrcodeBaseDTO;
+import com.pcloud.book.group.dto.GroupQrcodeInfoDTO;
+import com.pcloud.book.group.dto.ProAssocGroupAndUserNumberDTO;
+import com.pcloud.book.group.dto.QrcodeNameAndProIdDTO;
+import com.pcloud.book.group.dto.WeixinQrcodeDTO;
 import com.pcloud.book.group.entity.BookGroupClassify;
 import com.pcloud.book.group.entity.BookQrcodeUser;
 import com.pcloud.book.group.entity.GroupQrcode;
 import com.pcloud.book.group.enums.RankTypeEnum;
 import com.pcloud.book.group.set.GroupSet;
 import com.pcloud.book.group.tools.SendWeixinRequestTools;
-import com.pcloud.book.group.vo.*;
+import com.pcloud.book.group.vo.AddClassifyVO;
+import com.pcloud.book.group.vo.AdviserClassifyParam;
+import com.pcloud.book.group.vo.AdviserClassifyVO;
+import com.pcloud.book.group.vo.BookGroupClassifyVO;
+import com.pcloud.book.group.vo.BookGroupQrcodeStatisticVO;
+import com.pcloud.book.group.vo.ClassifyAndGroupCountVO;
+import com.pcloud.book.group.vo.ClassifyAndUserCountVO;
+import com.pcloud.book.group.vo.ClassifyNameVO;
+import com.pcloud.book.group.vo.ClassifyVO;
+import com.pcloud.book.group.vo.GroupQrcode4ClassifyVO;
+import com.pcloud.book.group.vo.GroupQrcodeBaseInfoVO;
+import com.pcloud.book.group.vo.ListBookGroupQrcodeParamVO;
+import com.pcloud.book.group.vo.ListClassify4WechatVO;
+import com.pcloud.book.group.vo.ListClassifyVO;
+import com.pcloud.book.group.vo.ListGroupClassifyParam;
+import com.pcloud.book.group.vo.StatisticVO;
+import com.pcloud.book.group.vo.SyncKeyworsVO;
+import com.pcloud.book.group.vo.UpdateClassifyVO;
+import com.pcloud.book.group.vo.UpdateRankVO;
 import com.pcloud.book.keywords.dao.BookKeywordDao;
 import com.pcloud.book.keywords.entity.BookKeyword;
 import com.pcloud.book.util.common.ThreadPoolUtils;
+import com.pcloud.book.util.properties.BookProps;
 import com.pcloud.common.core.aspect.ParamLog;
 import com.pcloud.common.core.constant.SystemCode;
 import com.pcloud.common.core.enums.NotifyOriginTypeEnum;
@@ -64,6 +99,7 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 import lombok.extern.slf4j.Slf4j;
@@ -120,6 +156,8 @@ public class BookGroupClassifyBizImpl implements BookGroupClassifyBiz {
     private LearningReportBrowseRecordDao learningReportBrowseRecordDao;
     @Autowired
     private LearningReportTouchRecordDao learningReportTouchRecordDao;
+    @Autowired
+    private JoinGroupCipherDao joinGroupCipherDao;
 
 
     @Override
@@ -144,18 +182,24 @@ public class BookGroupClassifyBizImpl implements BookGroupClassifyBiz {
         if (qrcodeNameAndProId == null) {
             throw new BookBizException(BookBizException.PARAM_IS_NULL, "请先填写社群码信息！");
         }
-        String groupName = qrcodeNameAndProId.getGroupQrcodeName();
         bookGroupClassify.setProductId(qrcodeNameAndProId.getProductId());
         bookGroupClassify.setCreateUser(partyId);
         Integer rank = bookGroupClassifyDao.getMaxRank(addClassifyVO.getBookGroupId());
         bookGroupClassify.setRank(rank);
         bookGroupClassifyDao.insert(bookGroupClassify);
         final Long wechatGroupNum = weixinQrcodeBiz.countWechatGroup();
+        // 只有生产环境才有30个限制
+        if ("pro".equalsIgnoreCase(BookProps.getSystemEnv())) {
             if(null == wechatGroupNum || wechatGroupNum <= 30) {
                 log.info("[新增分类] : 可用微信群数量：{}个", wechatGroupNum);
                 throw new BookBizException(BookBizException.PARAM_IS_NULL, "群二维码数量不足，您可以明天再创建群。");
             }
-        WeixinQrcodeDTO oneQrcode = weixinQrcodeBiz.getOneQrcode();
+        }
+        Integer generation = null;
+        if (new Integer(2).equals(qrcodeNameAndProId.getJoinGroupType())) {
+            generation = 3;
+        }
+        WeixinQrcodeDTO oneQrcode = weixinQrcodeBiz.getOneQrcode(generation);
         if (oneQrcode == null) {
             throw new BookBizException(BookBizException.PARAM_IS_NULL, "系统二维码数量不足，请联系客服人员补充二维码数量！");
         }
@@ -166,7 +210,16 @@ public class BookGroupClassifyBizImpl implements BookGroupClassifyBiz {
         groupQrcode.setWeixinQrcodeId(oneQrcode.getId());
         groupQrcode.setUserNumber(oneQrcode.getUserNumber());
         groupQrcode.setGroupSeq(1);
-        groupQrcode.setGroupName(groupName + addClassifyVO.getClassify() + "1群");
+        // 群长度超过16部分会被截取，导致群名称重复
+        final String s = "1群";
+        String groupName = qrcodeNameAndProId.getGroupQrcodeName() + addClassifyVO.getClassify() + s;
+        if (groupName.length() > 15) {
+            groupName = addClassifyVO.getClassify() + s;
+            if (groupName.length() > 15) {
+                groupName = addClassifyVO.getClassify().substring(0, 16 - s.length()) + s;
+            }
+        }
+        groupQrcode.setGroupName(groupName);
         groupQrcode.setClassifyId(bookGroupClassify.getId());
         groupQrcode.setQrcodeHeadUrl(readerConsr.getNineHeadUrl());
         groupQrcodeBiz.insert(groupQrcode);
@@ -201,7 +254,10 @@ public class BookGroupClassifyBizImpl implements BookGroupClassifyBiz {
             bookKeywords.add(bookKeyword);
         });
         bookKeywordDao.insert(bookKeywords);
-        SendWeixinRequestTools.changeGroupName(oneQrcode.getRobotWxId(), oneQrcode.getWeixinGroupId(), groupQrcode.getGroupName());
+        final String wechatGroupId = oneQrcode.getWeixinGroupId();
+        Map<String, BookWxQrcodeDTO> groupVersion = weixinQrcodeBiz.getGroupVersion(Collections.singletonList(wechatGroupId));
+        String ip = Optional.ofNullable(groupVersion.get(wechatGroupId)).orElse(new BookWxQrcodeDTO()).getWechatGroupIp();
+        SendWeixinRequestTools.changeGroupName(oneQrcode.getRobotWxId(), oneQrcode.getWeixinGroupId(), groupQrcode.getGroupName(), ip);
     }
 
     @ParamLog("新增商品对应规格")
@@ -430,6 +486,12 @@ public class BookGroupClassifyBizImpl implements BookGroupClassifyBiz {
     }
 
     @Override
+    @ParamLog("获取分类二维码相关标识")
+    public List<GroupClassifyQrcodeDTO> listClassifyQrcodeInfo(List<Long> classifyIds) {
+        return bookGroupClassifyDao.listClassifyQrcodeInfo(classifyIds);
+    }
+
+    @Override
     @ParamLog("客户端获取分类信息")
     public List<ListClassify4WechatVO> listClassify4Wechat(Long bookGroupId, Long wechatUserId) {
         //获取排序方式
@@ -511,6 +573,19 @@ public class BookGroupClassifyBizImpl implements BookGroupClassifyBiz {
         return groupQrcode4ClassifyVO;
     }
 
+    @Override
+    public String getWxGroupIdByClassifyIdAndWechatId(Long classifyId, Long wechatUserId) {
+        if(null == classifyId || null == wechatUserId) {
+            return null;
+        }
+        final GroupQrcode4ClassifyVO wechat = this.getGroupQrcode4ClassifyWechat(classifyId, wechatUserId);
+        if(null == wechat) {
+            return null;
+        }
+        final GroupQrcodeBaseInfoVO baseById = this.groupQrcodeBiz.getBaseById(wechat.getGroupQrcodeId());
+        return (null == baseById) ? null : baseById.getWeixinGroupId();
+    }
+
     @ParamLog("获取备用二维码")
     private String getSpareQr(Long bookGroupId) {
         //获取备用二维码
@@ -964,6 +1039,11 @@ public class BookGroupClassifyBizImpl implements BookGroupClassifyBiz {
 
     }
 
+    @Override
+    public BigDecimal getPayPrice(Long qrcodeId, String wxId) {
+        return joinGroupCipherDao.getPayPrice(wxId, qrcodeId);
+    }
+
     @ParamLog("拖动排序")
     @Transactional(rollbackFor = Exception.class)
     @Override

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

@@ -30,7 +30,6 @@ import com.pcloud.common.utils.cache.redis.JedisClusterUtils;
 import com.pcloud.common.utils.string.StringUtil;
 import com.pcloud.wechatgroup.group.dto.GroupRobotDTO;
 import com.sdk.wxgroup.AddToGroupVO;
-import com.sdk.wxgroup.GroupInfoVO;
 import com.sdk.wxgroup.QrcodeVO;
 import com.sdk.wxgroup.WxGroupSDK;
 
@@ -49,8 +48,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 import java.util.stream.Collectors;
 
 /**
@@ -84,8 +81,8 @@ public class WeixinQrcodeBizImpl implements WeixinQrcodeBiz {
     @Override
     @ParamLog("从二维码库获取一个二维码")
     @Transactional(propagation = Propagation.NOT_SUPPORTED)
-    public WeixinQrcodeDTO getOneQrcode() {
-        WeixinQrcodeDTO qrcodeVO = weixinQrcodeDao.getOneWechatGroup();
+    public WeixinQrcodeDTO getOneQrcode(Integer generation) {
+        WeixinQrcodeDTO qrcodeVO = weixinQrcodeDao.getOneWechatGroup(generation);
         if (qrcodeVO == null) {
             return null;
         }
@@ -220,7 +217,10 @@ public class WeixinQrcodeBizImpl implements WeixinQrcodeBiz {
         }
         for (ChangeGroupNameDTO changeGroupNameDTO : changeGroupNameDTOS) {
             String robotId = wechatGroupConsr.getRobotIdByGroupId(changeGroupNameDTO.getWxGroupId());
-            SendWeixinRequestTools.changeGroupName(robotId, changeGroupNameDTO.getWxGroupId(), changeGroupNameDTO.getWxGroupName());
+            final String wechatGroupId = changeGroupNameDTO.getWxGroupId();
+            Map<String, BookWxQrcodeDTO> groupVersion = weixinQrcodeBiz.getGroupVersion(Collections.singletonList(wechatGroupId));
+            String ip = Optional.ofNullable(groupVersion.get(wechatGroupId)).orElse(new BookWxQrcodeDTO()).getWechatGroupIp();
+            SendWeixinRequestTools.changeGroupName(robotId, changeGroupNameDTO.getWxGroupId(), changeGroupNameDTO.getWxGroupName(), ip);
         }
     }
 
@@ -324,6 +324,35 @@ public class WeixinQrcodeBizImpl implements WeixinQrcodeBiz {
     }
 
     @Override
+    @ParamLog("按照版本分类获取平台端统计数据")
+    public List<QrStatisticsVO> getQrStatisticsByVersion() {
+        List<QrStatisticsVO> qrStatistics = weixinQrcodeDao.getQrStatisticsByVersion();
+        List<QrStatisticsVO> counts = weixinQrcodeDao.getQrcodeCountByVersion();
+        if (ListUtils.isEmpty(qrStatistics)) {
+            qrStatistics = new ArrayList<>();
+            QrStatisticsVO qr = new QrStatisticsVO();
+            qr.setAllCount(0);
+            qr.setInUseCount(0);
+            qr.setNotUseCount(0);
+            qr.setVersion(0);
+            qrStatistics.add(qr);
+            return qrStatistics;
+        }
+
+        // 组合两部分数据
+        for(QrStatisticsVO qr:qrStatistics){
+            for(QrStatisticsVO c: counts){
+                if(qr.getVersion().equals(c.getVersion())){
+                    qr.setAllCount(c.getAllCount());
+                    break;
+                }
+            }
+        }
+
+        return qrStatistics;
+    }
+
+    @Override
     @ParamLog("分页获取可用微信群")
     public List<BookWxQrcodeDTO> listAvailableGroupByPage(Integer currentPage, Integer numPerPage) {
         Map<String, Object> paramMap = new HashMap<>();

pcloud-service-book/src/main/java/com/pcloud/book/group/constants/BookBusinessConstants.java

+package com.pcloud.book.group.constants;
+
+import com.pcloud.book.group.dto.AutoUpdateGroupNumDTO;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * book业务常量类
+ */
+public class BookBusinessConstants {
+
+    /**
+     * 需更新微信群信息
+     */
+    public static final Map<String, AutoUpdateGroupNumDTO> GROUP_NUM_DTO_MAP = new ConcurrentHashMap<>(128);
+
+}

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

@@ -132,6 +132,11 @@ public interface BookGroupClassifyDao extends BaseDao<BookGroupClassify> {
     GroupClassifyQrcodeDTO getClassifyQrcodeInfo(String weixinGroupId);
 
     /**
+     * 批量获取分类信息
+     */
+    List<GroupClassifyQrcodeDTO> listClassifyQrcodeInfo(List<Long> classifyIds);
+
+    /**
      * @Author:lili
      * @Desr:获取所有的分类
      * @Date:2019/4/29 11:23

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

@@ -4,6 +4,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.pcloud.book.group.dto.BookGroupDTO;
+import com.pcloud.book.group.dto.PersonalQrcodeDTO;
 import com.pcloud.book.group.dto.QrcodeNameAndProIdDTO;
 import com.pcloud.book.group.entity.BookGroup;
 import com.pcloud.common.core.dao.BaseDao;
@@ -120,6 +121,13 @@ public interface BookGroupDao extends BaseDao<BookGroup> {
     Boolean isSpecialAgent(Long agentId);
 
     /**
+    * @description 更新个人二维码
+    * @author 戴兴
+    * @date 2019/8/7 16:49
+    */
+    void updatePersonQrcode(PersonalQrcodeDTO personalQrcodeDTO);
+
+    /**
      * 获取社群书基本信息(包括书籍封面isbn号)
      * @param paramMap
      * @return

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

+package com.pcloud.book.group.dao;
+
+import com.pcloud.book.group.dto.JoinGroupCipherDTO;
+import com.pcloud.book.group.entity.JoinGroupCipher;
+import com.pcloud.common.core.dao.BaseDao;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+public interface JoinGroupCipherDao extends BaseDao<JoinGroupCipher> {
+    JoinGroupCipher getByWechatUserId(Long wechatUserId,Long classifyId);
+
+    JoinGroupCipher getByCipher(String cipher);
+
+    JoinGroupCipherDTO getDTOByCipher(String cipher);
+
+    void updateCipherStateToUsed(String cipher, String wxId);
+
+    List<JoinGroupCipherDTO> getClassifyIdsByWxIdAndAltId(String wxId, String altId);
+
+    void updateQrcodeId(String cipher, String wxId, Long qrcodeId);
+
+    /**
+     * 用户支付金额
+     * @param wxId
+     * @param qrcodeId
+     * @return
+     */
+    BigDecimal getPayPrice(String wxId, Long qrcodeId);
+}

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

+package com.pcloud.book.group.dao;
+
+import com.pcloud.book.group.entity.TempletRelevance;
+import com.pcloud.common.core.dao.BaseDao;
+
+public interface TempletRelevanceDao extends BaseDao<TempletRelevance> {
+    TempletRelevance getByTempletId(Long templetId);
+}

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

@@ -24,7 +24,7 @@ public interface WeixinQrcodeDao extends BaseDao<WeixinQrcode> {
      * @Desr:获取一个微信群
      * @Date:2019/3/12 18:04
      */
-    WeixinQrcodeDTO getOneWechatGroup();
+    WeixinQrcodeDTO getOneWechatGroup(Integer generation);
 
     /**
      * @Author:lili
@@ -41,6 +41,12 @@ public interface WeixinQrcodeDao extends BaseDao<WeixinQrcode> {
     QrStatisticsVO getQrStatistics();
 
     /**
+     * 获取依据版本分类的二维码统计数据
+     * @return 依据版本分类的二维码统计数据
+     */
+    List<QrStatisticsVO> getQrStatisticsByVersion();
+
+    /**
      * @Author:lili
      * @Desr:将处理中的二维码修改为处理失败
      * @Date:2019/3/7 15:21
@@ -117,6 +123,8 @@ public interface WeixinQrcodeDao extends BaseDao<WeixinQrcode> {
      */
     Integer getQrcodeCount();
 
+    List<QrStatisticsVO> getQrcodeCountByVersion();
+
     /**
      * @Author:lili
      * @Desr:校验存在性
@@ -155,4 +163,9 @@ public interface WeixinQrcodeDao extends BaseDao<WeixinQrcode> {
     Map<String, BookWxQrcodeDTO> listByWxGroupIds(List<String> wxGroupIds);
 
     String getVirtualIp(Integer generation);
+
+    /**
+     * 根据状态获取群数量
+     */
+    Integer countByState(Integer state, List<String> altIds);
 }

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

@@ -110,6 +110,11 @@ public class BookGroupClassifyDaoImpl extends BaseDaoImpl<BookGroupClassify> imp
     }
 
     @Override
+    public List<GroupClassifyQrcodeDTO> listClassifyQrcodeInfo(List<Long> classifyIds) {
+        return this.getSqlSession().selectList(this.getStatement("listClassifyQrcodeInfo"), classifyIds);
+    }
+
+    @Override
     public List<ListClassify4WechatVO> listClassify4Wechat(Long bookGroupId, Integer rankType) {
         Map<String, Object> paramMap = new HashMap();
         paramMap.put("bookGroupId", bookGroupId);

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

@@ -3,6 +3,8 @@ package com.pcloud.book.group.dao.impl;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
+import com.pcloud.book.group.dto.PersonalQrcodeDTO;
 import org.springframework.stereotype.Repository;
 import com.pcloud.book.group.dao.BookGroupDao;
 import com.pcloud.book.group.dto.BookGroupDTO;
@@ -124,6 +126,14 @@ public class BookGroupDaoImpl extends BaseDaoImpl<BookGroup> implements BookGrou
     }
 
     @Override
+    public void updatePersonQrcode(PersonalQrcodeDTO personalQrcodeDTO) {
+        Map<String,Object> map = new HashMap<>();
+        map.put("newQrcodeUrl",personalQrcodeDTO.getNewQrcodeUrl());
+        map.put("oldQrcodeUrl",personalQrcodeDTO.getOldQrcodeUrl());
+        this.getSqlSession().update(this.getStatement("updatePersonQrcode"), map);
+    }
+
+    @Override
     public List<BookGroupDTO> getBookInfoByIdsWithBookClockInfoId(Map<String,Object> paramMap) {
         return this.getSqlSession().selectList(this.getStatement("getBookInfoByIdsWithBookClockInfoId"), paramMap);
     }

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

+package com.pcloud.book.group.dao.impl;
+
+import com.pcloud.book.group.dao.JoinGroupCipherDao;
+import com.pcloud.book.group.dto.JoinGroupCipherDTO;
+import com.pcloud.book.group.entity.JoinGroupCipher;
+import com.pcloud.common.core.dao.BaseDaoImpl;
+
+import org.springframework.stereotype.Component;
+
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description
+ * @Author ruansiyuan
+ * @Date 2019/8/5 16:18
+ **/
+@Component("joinGroupCipherDao")
+public class JoinGroupCipherDaoImpl extends BaseDaoImpl<JoinGroupCipher> implements JoinGroupCipherDao {
+    @Override
+    public JoinGroupCipher getByWechatUserId(Long wechatUserId,Long classifyId) {
+        Map<String,Object> map=new HashMap<>();
+        map.put("wechatUserId",wechatUserId);
+        map.put("classifyId",classifyId);
+        return this.getSqlSession().selectOne(this.getStatement("getByWechatUserId"), map);
+    }
+
+    @Override
+    public JoinGroupCipher getByCipher(String cipher) {
+        return this.getSqlSession().selectOne(this.getStatement("getByCipher"), cipher);
+    }
+
+    @Override
+    public JoinGroupCipherDTO getDTOByCipher(String cipher) {
+        return this.getSqlSession().selectOne(this.getStatement("getDTOByCipher"), cipher);
+    }
+
+    @Override
+    public void updateCipherStateToUsed(String cipher, String wxId) {
+        Map<String,Object> map=new HashMap<>();
+        map.put("cipher",cipher);
+        map.put("wxId",wxId);
+        this.getSqlSession().update(this.getStatement("updateCipherStateToUsed"), map);
+    }
+
+    @Override
+    public List<JoinGroupCipherDTO> getClassifyIdsByWxIdAndAltId(String wxId, String altId) {
+        Map<String,Object> map=new HashMap<>();
+        map.put("wxId",wxId);
+        map.put("altId",altId);
+        return this.getSqlSession().selectList(this.getStatement("getClassifyIdsByWxIdAndAltId"), map);
+    }
+
+    @Override
+    public void updateQrcodeId(String cipher, String wxId, Long qrcodeId) {
+        Map<String,Object> map=new HashMap<>();
+        map.put("cipher",cipher);
+        map.put("wxId",wxId);
+        map.put("qrcodeId",qrcodeId);
+        this.getSqlSession().update(this.getStatement("updateQrcodeId"), map);
+    }
+
+    @Override
+    public BigDecimal getPayPrice(String wxId, Long qrcodeId) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("wxId", wxId);
+        map.put("qrcodeId", qrcodeId);
+        return getSessionTemplate().selectOne(getStatement("getPayPrice"), map);
+    }
+}

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

+package com.pcloud.book.group.dao.impl;
+
+import com.pcloud.book.group.dao.TempletRelevanceDao;
+import com.pcloud.book.group.entity.TempletRelevance;
+import com.pcloud.common.core.dao.BaseDaoImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description
+ * @Author ruansiyuan
+ * @Date 2019/8/5 16:19
+ **/
+@Component("templetRelevanceDao")
+public class TempletRelevanceDaoImpl extends BaseDaoImpl<TempletRelevance> implements TempletRelevanceDao {
+    @Override
+    public TempletRelevance getByTempletId(Long templetId) {
+        return this.getSqlSession().selectOne(this.getStatement("getByTempletId"), templetId);
+    }
+}

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

@@ -25,8 +25,10 @@ import java.util.Map;
 @Component("WeixinQrcodeDao")
 public class WeixinQrcodeDaoImpl extends BaseDaoImpl<WeixinQrcode> implements WeixinQrcodeDao {
     @Override
-    public WeixinQrcodeDTO getOneWechatGroup() {
-        return this.getSqlSession().selectOne(this.getStatement("getOneWechatGroup"));
+    public WeixinQrcodeDTO getOneWechatGroup(Integer generation) {
+        Map<String, Object> paramMap = new HashMap();
+        paramMap.put("generation", generation);
+        return this.getSqlSession().selectOne(this.getStatement("getOneWechatGroup"),paramMap);
     }
 
     @Override
@@ -45,6 +47,11 @@ public class WeixinQrcodeDaoImpl extends BaseDaoImpl<WeixinQrcode> implements We
     }
 
     @Override
+    public List<QrStatisticsVO> getQrStatisticsByVersion() {
+        return this.getSessionTemplate().selectList(this.getStatement("getQrStatisticsByVersion"));
+    }
+
+    @Override
     public void updateStatusToError() {
         this.getSqlSession().update(this.getStatement("updateStatusToError"));
     }
@@ -116,6 +123,11 @@ public class WeixinQrcodeDaoImpl extends BaseDaoImpl<WeixinQrcode> implements We
     }
 
     @Override
+    public List<QrStatisticsVO> getQrcodeCountByVersion() {
+        return this.getSqlSession().selectList(this.getStatement("getQrcodeCountByVersion"));
+    }
+
+    @Override
     public Boolean checkExist(String weixinGroupId) {
         return this.getSqlSession().selectOne(this.getStatement("checkExist"), weixinGroupId);
     }
@@ -154,4 +166,12 @@ public class WeixinQrcodeDaoImpl extends BaseDaoImpl<WeixinQrcode> implements We
     public String getVirtualIp(Integer generation) {
         return this.getSessionTemplate().selectOne("getVirtualIp", generation);
     }
+
+    @Override
+    public Integer countByState(Integer state, List<String> altIds) {
+        Map<String, Object> paramMap = new HashMap<>();
+        paramMap.put("state", state);
+        paramMap.put("altIds", altIds);
+        return this.getSessionTemplate().selectOne("countByState", paramMap);
+    }
 }

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

+package com.pcloud.book.group.dto;
+
+import java.util.Date;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import lombok.Data;
+
+/**
+ * 自动更新群人数DTO
+ */
+@Data
+public class AutoUpdateGroupNumDTO {
+
+    /**
+     * 群id
+     */
+    private String wxGroupId;
+    /**
+     * 机器人id
+     */
+    private String robotId;
+    /**
+     * wxGroupIp
+     */
+    private String ip;
+    /**
+     * 当前触发次数
+     */
+    private AtomicInteger num = new AtomicInteger(1);
+
+    /**
+     * 开始更新时间（犹豫微信有延迟，所以新用户进群之后30s再次更新群人数）
+     */
+    private Date startTime;
+
+    public AutoUpdateGroupNumDTO() {
+
+    }
+
+    public AutoUpdateGroupNumDTO(String wxGroupId, String robotId, String ip, Date startTime) {
+        this.wxGroupId = wxGroupId;
+        this.robotId = robotId;
+        this.ip = ip;
+        this.num = new AtomicInteger(1);
+        this.startTime = startTime;
+    }
+}

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

@@ -142,6 +142,11 @@ public class BookGroupDTO extends BaseDto {
      */
     private Boolean isShowBookName;
 
+    /**
+     * 进群方式：1群二维码，2客服机器人
+     */
+    private Integer joinGroupType;
+
     public String getUrl() {
         return url;
     }
@@ -359,6 +364,14 @@ public class BookGroupDTO extends BaseDto {
         this.isShowBookName = isShowBookName;
     }
 
+    public Integer getJoinGroupType() {
+        return joinGroupType;
+    }
+
+    public void setJoinGroupType(Integer joinGroupType) {
+        this.joinGroupType = joinGroupType;
+    }
+
     @Override
     public String toString() {
         return "BookGroupDTO{" +
@@ -388,7 +401,8 @@ public class BookGroupDTO extends BaseDto {
                 ", bookName='" + bookName + '\'' +
                 ", url='" + url + '\'' +
                 ", bookClockInfoId=" + bookClockInfoId +
-                ", isShowBookName='" + isShowBookName + '\'' +
+                ", isShowBookName=" + isShowBookName +
+                ", joinGroupType=" + joinGroupType +
                 "} " + super.toString();
     }
 }
\ No newline at end of file

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

@@ -82,6 +82,8 @@ public class ClassifyDTO implements Serializable {
 
     private Long bookClockInfoId;
 
+    private Long createUser;
+
     public Integer getRank() {
         return rank;
     }
@@ -194,6 +196,14 @@ public class ClassifyDTO implements Serializable {
         this.bookClockInfoId = bookClockInfoId;
     }
 
+    public Long getCreateUser() {
+        return createUser;
+    }
+
+    public void setCreateUser(Long createUser) {
+        this.createUser = createUser;
+    }
+
     @Override
     public String toString() {
         return "ClassifyDTO{" +
@@ -211,6 +221,7 @@ public class ClassifyDTO implements Serializable {
                 ", changeNumber=" + changeNumber +
                 ", rank=" + rank +
                 ", bookClockInfoId=" + bookClockInfoId +
+                ", createUser=" + createUser +
                 '}';
     }
 }

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

+package com.pcloud.book.group.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * @author 杨涛
+ * @description 商城用户已购买的社群码dto
+ * @date 2019/8/9 10:30
+ */
+@ApiModel("商城用户已购买的社群码dto")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class GroupStoreMyPayDto {
+
+    @ApiModelProperty("标识(appId/productId/bookGroupId)")
+    private Long originId;
+
+    @ApiModelProperty("类型(APP/PRODUCT/BOOK_GROUP)")
+    private String originType;
+
+    @ApiModelProperty("标题")
+    private String originName;
+
+    @ApiModelProperty("封面图片")
+    private String coverImg;
+
+    @ApiModelProperty("已经购买的资源数量")
+    private Integer resourceNum;
+
+    @ApiModelProperty("已经购买的资源数量")
+    private Integer resourceItemNum;
+
+    public Long getOriginId() {
+        return originId;
+    }
+
+    public void setOriginId(Long originId) {
+        this.originId = originId;
+    }
+
+    public String getOriginType() {
+        return originType;
+    }
+
+    public void setOriginType(String originType) {
+        this.originType = originType;
+    }
+
+    public String getOriginName() {
+        return originName;
+    }
+
+    public void setOriginName(String originName) {
+        this.originName = originName;
+    }
+
+    public String getCoverImg() {
+        return coverImg;
+    }
+
+    public void setCoverImg(String coverImg) {
+        this.coverImg = coverImg;
+    }
+
+    public Integer getResourceNum() {
+        return resourceNum;
+    }
+
+    public void setResourceNum(Integer resourceNum) {
+        this.resourceNum = resourceNum;
+    }
+
+    public Integer getResourceItemNum() {
+        return resourceItemNum;
+    }
+
+    public void setResourceItemNum(Integer resourceItemNum) {
+        this.resourceItemNum = resourceItemNum;
+    }
+
+    @Override
+    public String toString() {
+        return "GroupStoreMyPayDto{" +
+                "originId=" + originId +
+                ", originType='" + originType + '\'' +
+                ", originName='" + originName + '\'' +
+                ", coverImg='" + coverImg + '\'' +
+                ", resourceNum=" + resourceNum +
+                ", resourceItemNum=" + resourceItemNum +
+                '}';
+    }
+}

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

+package com.pcloud.book.group.dto;
+
+import lombok.Data;
+
+@Data
+public class JoinGroupCipherDTO {
+
+    private String cipher;
+
+    private Long classifyId;
+
+    private Long qrcodeId;
+
+    private Long wechatUserId;
+
+    private String wxId;
+
+    private Boolean hasUsed;
+
+    private Long bookGroupId;
+
+}

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

+package com.pcloud.book.group.dto;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @Author ruansiyuan
+ * @Date 2019/8/5 17:14
+ **/
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class OwnAltQrcodeInfoDTO implements Serializable {
+
+    @ApiModelProperty("小号id")
+    private String altId;
+
+    @ApiModelProperty("小号昵称")
+    private String altNickName;
+
+    @ApiModelProperty("小号头像")
+    private String altHeadUrl;
+
+    @ApiModelProperty("小号二维码地址")
+    private String altQrcodeUrl;
+
+    @ApiModelProperty("暗号")
+    private String cipher;
+
+    public String getAltId() {
+        return altId;
+    }
+
+    public void setAltId(String altId) {
+        this.altId = altId;
+    }
+
+    public String getAltNickName() {
+        return altNickName;
+    }
+
+    public void setAltNickName(String altNickName) {
+        this.altNickName = altNickName;
+    }
+
+    public String getAltHeadUrl() {
+        return altHeadUrl;
+    }
+
+    public void setAltHeadUrl(String altHeadUrl) {
+        this.altHeadUrl = altHeadUrl;
+    }
+
+    public String getAltQrcodeUrl() {
+        return altQrcodeUrl;
+    }
+
+    public void setAltQrcodeUrl(String altQrcodeUrl) {
+        this.altQrcodeUrl = altQrcodeUrl;
+    }
+
+    public String getCipher() {
+        return cipher;
+    }
+
+    public void setCipher(String cipher) {
+        this.cipher = cipher;
+    }
+
+    @Override
+    public String toString() {
+        return "OwnAltQrcodeInfoDTO{" +
+                "altId='" + altId + '\'' +
+                ", altNickName='" + altNickName + '\'' +
+                ", altHeadUrl='" + altHeadUrl + '\'' +
+                ", altQrcodeUrl='" + altQrcodeUrl + '\'' +
+                ", cipher='" + cipher + '\'' +
+                '}';
+    }
+}

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

@@ -18,6 +18,11 @@ public class QrcodeNameAndProIdDTO {
      */
     private Long productId;
 
+    /**
+     * 进群方式：1群二维码，2客服机器人
+     */
+    private Integer joinGroupType;
+
     public Long getBookGroupId() {
         return bookGroupId;
     }
@@ -42,12 +47,21 @@ public class QrcodeNameAndProIdDTO {
         this.productId = productId;
     }
 
+    public Integer getJoinGroupType() {
+        return joinGroupType;
+    }
+
+    public void setJoinGroupType(Integer joinGroupType) {
+        this.joinGroupType = joinGroupType;
+    }
+
     @Override
     public String toString() {
         return "QrcodeNameAndProIdDTO{" +
                 "bookGroupId=" + bookGroupId +
                 ", groupQrcodeName='" + groupQrcodeName + '\'' +
                 ", productId=" + productId +
+                ", joinGroupType=" + joinGroupType +
                 '}';
     }
 }

pcloud-service-book/src/main/java/com/pcloud/book/group/entity/BookGroup.java

@@ -102,6 +102,11 @@ public class BookGroup extends BaseEntity {
      */
     private Boolean isShowBookName;
 
+    /**
+     * 进群方式：1群二维码，2客服机器人
+     */
+    private Integer joinGroupType;
+
     public Long getId() {
         return id;
     }
@@ -246,6 +251,14 @@ public class BookGroup extends BaseEntity {
         this.isShowBookName = isShowBookName;
     }
 
+    public Integer getJoinGroupType() {
+        return joinGroupType;
+    }
+
+    public void setJoinGroupType(Integer joinGroupType) {
+        this.joinGroupType = joinGroupType;
+    }
+
     @Override
     public String toString() {
         return "BookGroup{" +
@@ -267,6 +280,7 @@ public class BookGroup extends BaseEntity {
                 ", updateTime=" + updateTime +
                 ", isDelete=" + isDelete +
                 ", isShowBookName=" + isShowBookName +
+                ", joinGroupType=" + joinGroupType +
                 "} " + super.toString();
     }
 }
\ No newline at end of file

pcloud-service-book/src/main/java/com/pcloud/book/group/entity/JoinGroupCipher.java

+package com.pcloud.book.group.entity;
+
+import com.pcloud.common.entity.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * @Description
+ * @Author ruansiyuan
+ * @Date 2019/8/5 15:59
+ **/
+public class JoinGroupCipher extends BaseEntity {
+    private static final long serialVersionUID = -8724831387632496417L;
+
+    @ApiModelProperty("密码")
+    private String cipher;
+
+    @ApiModelProperty("分类id")
+    private Long classifyId;
+
+    @ApiModelProperty("群id")
+    private Long qrcodeId;
+
+    @ApiModelProperty("创建人")
+    private Long wechatUserId;
+
+    @ApiModelProperty("使用人微信id")
+    private String wxId;
+
+    @ApiModelProperty("是否使用")
+    private Boolean hasUsed;
+
+    @ApiModelProperty("机器人id")
+    private String altId;
+
+    public String getCipher() {
+        return cipher;
+    }
+
+    public void setCipher(String cipher) {
+        this.cipher = cipher;
+    }
+
+    public Long getClassifyId() {
+        return classifyId;
+    }
+
+    public void setClassifyId(Long classifyId) {
+        this.classifyId = classifyId;
+    }
+
+    public Long getQrcodeId() {
+        return qrcodeId;
+    }
+
+    public void setQrcodeId(Long qrcodeId) {
+        this.qrcodeId = qrcodeId;
+    }
+
+    public Long getWechatUserId() {
+        return wechatUserId;
+    }
+
+    public void setWechatUserId(Long wechatUserId) {
+        this.wechatUserId = wechatUserId;
+    }
+
+    public String getWxId() {
+        return wxId;
+    }
+
+    public void setWxId(String wxId) {
+        this.wxId = wxId;
+    }
+
+    public Boolean getHasUsed() {
+        return hasUsed;
+    }
+
+    public void setHasUsed(Boolean hasUsed) {
+        this.hasUsed = hasUsed;
+    }
+
+    public String getAltId() {
+        return altId;
+    }
+
+    public void setAltId(String altId) {
+        this.altId = altId;
+    }
+
+    @Override
+    public String toString() {
+        return "JoinGroupCipher{" +
+                "cipher='" + cipher + '\'' +
+                ", classifyId=" + classifyId +
+                ", qrcodeId=" + qrcodeId +
+                ", wechatUserId=" + wechatUserId +
+                ", wxId='" + wxId + '\'' +
+                ", hasUsed=" + hasUsed +
+                ", altId='" + altId + '\'' +
+                "} " + super.toString();
+    }
+}

pcloud-service-book/src/main/java/com/pcloud/book/group/entity/TempletRelevance.java

+package com.pcloud.book.group.entity;
+
+import com.pcloud.common.entity.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * @Description 分类关联表
+ * @Author ruansiyuan
+ * @Date 2019/8/5 15:47
+ **/
+public class TempletRelevance extends BaseEntity {
+    private static final long serialVersionUID = 5014986282950538055L;
+
+    @ApiModelProperty("分类id")
+    private Long templetId;
+
+    @ApiModelProperty("大类id")
+    private Integer largeTemplet;
+
+    public Long getTempletId() {
+        return templetId;
+    }
+
+    public void setTempletId(Long templetId) {
+        this.templetId = templetId;
+    }
+
+    public Integer getLargeTemplet() {
+        return largeTemplet;
+    }
+
+    public void setLargeTemplet(Integer largeTemplet) {
+        this.largeTemplet = largeTemplet;
+    }
+
+    @Override
+    public String toString() {
+        return "TempletRelevance{" +
+                "templetId=" + templetId +
+                ", largeTemplet=" + largeTemplet +
+                "} " + super.toString();
+    }
+}

pcloud-service-book/src/main/java/com/pcloud/book/group/enums/LargTempletEnum.java

+package com.pcloud.book.group.enums;
+
+public enum LargTempletEnum {
+    /**
+     * K12类
+     */
+    K12(1, "K12类"),
+
+    /**
+     * 少儿类
+     */
+    CHILD(2, "少儿类"),
+    /**
+     * 高等/职教
+     */
+    HIGH(3, "高等/职教"),
+    /**
+     * 大众类
+     */
+    GENERAL(4, "大众类");
+
+    public final Integer code;
+
+    public final String name;
+
+    LargTempletEnum(Integer code, String name) {
+        this.code = code;
+        this.name = name;
+    }
+
+}

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

@@ -3,6 +3,8 @@ package com.pcloud.book.group.facade;
 import com.pcloud.book.group.entity.BookGroupClassify;
 import org.codehaus.jackson.JsonParseException;
 import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.CookieValue;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -11,6 +13,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import com.pcloud.book.group.entity.BookGroup;
+import com.pcloud.book.group.vo.ListBookGroup4ChannelParamVO;
 import com.pcloud.book.group.vo.UpdateRankTypeVO;
 import com.pcloud.common.dto.ResponseDto;
 import com.pcloud.common.exceptions.BizException;
@@ -118,6 +121,28 @@ public interface BookGroupFacade {
             @RequestParam(value = "endDate", required = false) String endDate)
             throws BizException, PermissionException;
 
+    @ApiOperation(value = "获取社群书列表(运营)", httpMethod = "POST")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "token", value = "token", dataType = "string", paramType = "header"),
+            @ApiImplicitParam(name = "listBookGroup4ChannelParamVO", value = "ListBookGroup4ChannelParamVO", dataType = "ListBookGroup4ChannelParamVO", paramType = "body")
+    })
+    @RequestMapping(value = "listBookGroup4Channel", method = RequestMethod.POST)
+    ResponseDto<PageBean> listBookGroup4Channel(@RequestHeader("token") String token,
+                                                @RequestBody ListBookGroup4ChannelParamVO listBookGroup4ChannelParamVO)
+            throws BizException, PermissionException;
+
+    @ApiOperation(value = "获取用户购买或者参与过的社群书信息", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "userInfo", value = "Cookie", dataType = "string", paramType = "header"),
+            @ApiImplicitParam(name = "currentPage", value = "当前页", dataType = "Integer", paramType = "query"),
+            @ApiImplicitParam(name = "numPerPage", value = "每页条数", dataType = "Integer", paramType = "query")
+    })
+    @RequestMapping(value = "getUserBrowseGroup4KnowLedgeMall", method = RequestMethod.GET)
+    ResponseDto<?> getUserBrowseGroup4KnowLedgeMall(@CookieValue("userInfo")String userInfo,
+                                                           @RequestParam(value = "currentPage", required = false) Integer currentPage,
+                                                           @RequestParam(value = "numPerPage", required = false) Integer numPerPage)
+            throws BizException, PermissionException;
+
     @ApiOperation(value = "获取社群书列表(编辑)", httpMethod = "GET")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "token", value = "token", dataType = "string", paramType = "header"),
@@ -258,4 +283,16 @@ public interface BookGroupFacade {
             @RequestParam("bookGroupId") Long bookGroupId
     ) throws BizException, PermissionException, JsonParseException;
 
+    @ApiOperation("根据分类id获取个人二维码")
+    @GetMapping("getOwnAltQrcodeInfoDTOByClassifyId")
+    ResponseDto<?> getOwnAltQrcodeInfoDTOByClassifyId(
+            @CookieValue("userInfo") String userInfo,
+            @RequestParam("classifyId") Long classifyId
+    ) throws BizException, PermissionException, JsonParseException;
+
+    @ApiOperation("获取所有的大类")
+    @GetMapping("getAllLargeTemplet")
+    ResponseDto<?> getAllLargeTemplet(
+            @RequestHeader("token") String token
+    ) throws BizException, PermissionException, JsonParseException;
 }

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

@@ -16,6 +16,8 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 
+import java.util.List;
+
 /**
  * @author lily
  * @date 2019/4/26 15:10
@@ -38,4 +40,10 @@ public interface WeixinQrcodeFacade {
     @GetMapping("getQrStatistics")
     ResponseDto<QrStatisticsVO> getQrStatistics(@RequestHeader("token") String token)
             throws BizException, PermissionException;
+
+    @GetMapping("getQrStatisticsByVersion")
+    ResponseDto<List<QrStatisticsVO>> getQrStatisticsByVersion(@RequestHeader("token") String token)
+            throws BizException, PermissionException;
+
+
 }

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

@@ -3,20 +3,25 @@ package com.pcloud.book.group.facade.impl;
 import com.pcloud.book.base.exception.BookBizException;
 import com.pcloud.book.group.biz.BookGroupBiz;
 import com.pcloud.book.group.biz.BookGroupClassifyBiz;
+import com.pcloud.book.group.dto.GroupStoreMyPayDto;
 import com.pcloud.book.group.entity.BookGroup;
 import com.pcloud.book.group.entity.BookGroupClassify;
 import com.pcloud.book.group.facade.BookGroupFacade;
-import com.pcloud.book.group.vo.UpdateRankTypeVO;
+import com.pcloud.book.group.vo.*;
 import com.pcloud.common.dto.ResponseDto;
 import com.pcloud.common.exceptions.BizException;
 import com.pcloud.common.page.PageBean;
+import com.pcloud.common.page.PageBeanNew;
 import com.pcloud.common.page.PageParam;
 import com.pcloud.common.permission.PermissionException;
 import com.pcloud.common.utils.SessionUtil;
+import com.pcloud.common.utils.cookie.Cookie;
 import com.pcloud.common.utils.string.StringUtil;
 
 import org.codehaus.jackson.JsonParseException;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.CookieValue;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -170,6 +175,26 @@ public class BookGroupFacadeImpl implements BookGroupFacade {
         return new ResponseDto<>(pageBean);
     }
 
+    @Override
+    @RequestMapping(value = "listBookGroup4Channel", method = RequestMethod.POST)
+    public ResponseDto<PageBean> listBookGroup4Channel(@RequestHeader("token") String token,
+                                                       @RequestBody ListBookGroup4ChannelParamVO listBookGroup4ChannelParamVO) throws BizException, PermissionException {
+        Long channelId = (Long) SessionUtil.getVlaue(token, SessionUtil.PARTY_ID);
+        PageBean pageBean = bookGroupBiz.listBookGroup4Channel(channelId, listBookGroup4ChannelParamVO);
+        return new ResponseDto<>(pageBean);
+    }
+
+    @Override
+    @RequestMapping(value = "getUserBrowseGroup4KnowLedgeMall", method = RequestMethod.GET)
+    public ResponseDto<?> getUserBrowseGroup4KnowLedgeMall(@CookieValue("userInfo")String userInfo,
+                                                                  @RequestParam(value = "currentPage", required = false) Integer currentPage,
+                                                                  @RequestParam(value = "numPerPage", required = false) Integer numPerPage) throws BizException, PermissionException {
+        Long channelId = Cookie.getId(userInfo, Cookie._CHANNEL_ID);
+        Long wechatUserId = Cookie.getId(userInfo, Cookie._WECHAT_USER_ID);
+        PageBeanNew<GroupStoreMyPayDto> resultInfos= bookGroupBiz.getUserBrowseGroup4KnowLedgeMall(channelId, wechatUserId, currentPage, numPerPage);
+        return new ResponseDto<>(resultInfos);
+    }
+
     /**
      * 获取社群书列表(编辑)
      */
@@ -383,4 +408,29 @@ public class BookGroupFacadeImpl implements BookGroupFacade {
         bookGroupBiz.deleteBookGroup(bookGroupId);
         return new ResponseDto<>();
     }
+
+    @ApiOperation("根据分类id获取个人二维码")
+    @GetMapping("getOwnAltQrcodeInfoDTOByClassifyId")
+    @Override
+    public ResponseDto<?> getOwnAltQrcodeInfoDTOByClassifyId(
+            @CookieValue("userInfo") String userInfo,
+            @RequestParam("classifyId") Long classifyId
+    ) throws BizException, PermissionException, JsonParseException {
+        Long wechatUserId = Cookie.getId(userInfo, Cookie._WECHAT_USER_ID);
+        if (classifyId == null) {
+            throw new BookBizException(BookBizException.PARAM_IS_ERROR, "分类不能为空！");
+        }
+        return new ResponseDto<>(bookGroupBiz.getOwnAltQrcodeInfoDTOByClassifyId(wechatUserId, classifyId));
+    }
+
+    @ApiOperation("获取所有的大类")
+    @GetMapping("getAllLargeTemplet")
+    @Override
+    public ResponseDto<?> getAllLargeTemplet(
+            @RequestHeader("token") String token
+    ) throws BizException, PermissionException, JsonParseException {
+        SessionUtil.getVlaue(token, SessionUtil.PARTY_ID);
+        return new ResponseDto<>(bookGroupBiz.getAllLargTemplet());
+    }
+
 }

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

@@ -19,6 +19,8 @@ import org.springframework.web.bind.annotation.RestController;
 
 import io.swagger.annotations.ApiOperation;
 
+import java.util.List;
+
 /**
  * @author lily
  * @date 2019/4/26 15:10
@@ -44,4 +46,11 @@ public class WeixinQrcodeFacadeImpl implements WeixinQrcodeFacade {
             throws BizException {
         return new ResponseDto<>(weixinQrcodeBiz.getQrStatistics());
     }
+
+    @Override
+    @GetMapping("getQrStatisticsByVision")
+    @ApiOperation("平台端按照版本获取二维码统计数据")
+    public ResponseDto<List<QrStatisticsVO>> getQrStatisticsByVersion(String token) throws BizException {
+        return new ResponseDto<>(weixinQrcodeBiz.getQrStatisticsByVersion());
+    }
 }

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

@@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
@@ -67,7 +68,7 @@ public class BookGroupClassifyServiceImpl implements BookGroupClassifyService {
             @ApiImplicitParam(name = "query", value = "书籍名称", dataType = "string",required = false, paramType = "query"),
             @ApiImplicitParam(name = "proLabelId", value = "专业标签id", dataType = "long",required = false, paramType = "query"),
             @ApiImplicitParam(name = "depLabelId", value = "深度标签id", dataType = "long",required = false, paramType = "query"),
-            @ApiImplicitParam(name = "purLabelId", value = "目的标签id", dataType = "string",required = false, paramType = "query")
+            @ApiImplicitParam(name = "purLabelId", value = "目的标签id", dataType = "long",required = false, paramType = "query")
     })
     @GetMapping("listQrcodeIdsByLabelQuery")
     public ResponseEntity<ResponseDto<List<Long>>> listQrcodeIdsByLabelQuery(
@@ -85,4 +86,14 @@ public class BookGroupClassifyServiceImpl implements BookGroupClassifyService {
         List<Long>qrcodeIds =  groupQrcodeBiz.filterDeleteId(wxGroupIdList);
         return ResponseHandleUtil.toResponse(qrcodeIds);
     }
+
+    @Override
+    @GetMapping("getPayPrice")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "qrcodeId", value = "qrcodeId", dataType = "long", required = true, paramType = "query"),
+            @ApiImplicitParam(name = "wxUserId", value = "wxUserId", dataType = "string", required = true, paramType = "query")
+    })
+    public ResponseEntity<ResponseDto<BigDecimal>> getPayPrice(@RequestParam("qrcodeId") Long qrcodeId, @RequestParam("wxUserId") String wxUserId) {
+        return ResponseHandleUtil.toResponse(bookGroupClassifyBiz.getPayPrice(qrcodeId, wxUserId));
+    }
 }

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

@@ -2,18 +2,22 @@ package com.pcloud.book.group.service.impl;
 
 import java.util.List;
 import java.util.Map;
+
+
+import com.pcloud.book.group.dto.PersonalQrcodeDTO;
+import com.pcloud.book.group.dto.GroupCipherDTO;
+import com.pcloud.book.group.dto.GroupUseDTO;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.RequestBody;
-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;
+import org.springframework.web.bind.annotation.*;
 import com.pcloud.book.group.biz.BookGroupBiz;
 import com.pcloud.book.group.dto.BookGroupDTO;
 import com.pcloud.book.group.service.BookGroupService;
 import com.pcloud.common.dto.ResponseDto;
+import com.pcloud.common.dto.StoreFlowInfoDto;
 import com.pcloud.common.exceptions.BizException;
+import com.pcloud.common.page.PageBeanNew;
 import com.pcloud.common.utils.ResponseHandleUtil;
 
 /**
@@ -46,6 +50,35 @@ public class BookGroupServiceImpl implements BookGroupService {
     }
 
     /**
+     * 为信息流批量获取社群书基本信息
+     */
+    @Override
+    @RequestMapping(value = "getFlowInfoByBookGroupIds", method = RequestMethod.POST)
+    public ResponseEntity<ResponseDto<Map<Long, StoreFlowInfoDto>>> getFlowInfoByBookGroupIds(@RequestBody List<Long> bookGroupIds) throws BizException {
+        return ResponseHandleUtil.toResponse(bookGroupBiz.getFlowInfoByBookGroupIds(bookGroupIds));
+    }
+
+    /**
+     * 获取指定条数社群书基本信息
+     */
+    @Override
+    @RequestMapping(value = "getBookGroupInfoByChannelId",method = RequestMethod.GET)
+    public ResponseEntity<ResponseDto<Map<Long, StoreFlowInfoDto>>> getBookGroupInfoByChannelId(@RequestParam("channelId")Long channelId, @RequestParam("itemNum")Integer itemNum) throws BizException {
+        return ResponseHandleUtil.toResponse(bookGroupBiz.getBookGroupInfoByChannelId(channelId, itemNum));
+    }
+
+    /**
+     * 知识商城获取社群书信息
+     */
+    @Override
+    @RequestMapping(value = "listBookGroup4KnowledgeMall",method = RequestMethod.GET)
+    public ResponseEntity<ResponseDto<PageBeanNew<StoreFlowInfoDto>>> listBookGroup4KnowledgeMall(@RequestParam(value="channelId",required = false)Long channelId,
+                                                                                                  @RequestParam("currentPage")int currentPage,
+                                                                                                  @RequestParam("numPerPage") int numPerPage) throws BizException {
+        return ResponseHandleUtil.toResponse(bookGroupBiz.listBookGroup4KnowledgeMall(channelId, currentPage, numPerPage));
+    }
+
+    /**
      * 获取社群书基本信息
      */
     @Override
@@ -54,4 +87,48 @@ public class BookGroupServiceImpl implements BookGroupService {
         return ResponseHandleUtil.toResponse(bookGroupBiz.getBaseInfoBySceneId(sceneId));
     }
 
+
+    @Override
+    @RequestMapping(value = "updatePersonQrcode",method = RequestMethod.POST)
+    public void updatePersonQrcode(@RequestBody PersonalQrcodeDTO personalQrcodeDTO) throws BizException {
+        bookGroupBiz.updatePersonQrcode(personalQrcodeDTO);
+    }
+
+    /**
+     * 获取暗号状态
+     */
+    @ApiOperation("获取暗号状态")
+    @GetMapping("/getCipherState")
+    @Override
+    public ResponseEntity<ResponseDto<Integer>> getCipherState(String cipher) throws BizException {
+        return ResponseHandleUtil.toResponse(bookGroupBiz.getCipherState(cipher));
+    }
+
+    /**
+     * 更新密码状态为已使用
+     */
+    @ApiOperation("更新暗号状态为已使用")
+    @GetMapping("/updateCipherStateToUsed")
+    @Override
+    public void updateCipherStateToUsed(String cipher, String wxId) throws BizException {
+        bookGroupBiz.updateCipherStateToUsed(cipher,wxId);
+    }
+
+    /**
+     * 获取个人二维码方式群已使用和未使用数量
+     */
+    @ApiOperation("获取个人二维码方式群已使用和未使用数量")
+    @PostMapping("/getGroupUse")
+    @Override
+    public ResponseEntity<ResponseDto<GroupUseDTO>> getGroupUse(@RequestBody List<String> altIds) throws BizException {
+        return ResponseHandleUtil.toResponse(bookGroupBiz.getGroupUse(altIds));
+    }
+
+    @ApiOperation("获取暗号基本信息")
+    @GetMapping("/getJoinGroupCipher")
+    @Override
+    public ResponseEntity<ResponseDto<GroupCipherDTO>> getJoinGroupCipher(@RequestParam("cipher")String cipher) throws BizException {
+        return ResponseHandleUtil.toResponse(bookGroupBiz.getJoinGroupCipher(cipher));
+    }
+
 }

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

@@ -88,7 +88,7 @@ public class WeixinQrcodeServiceImpl implements WeixinQrcodeService {
     @Override
     @GetMapping("getOneQrcode")
     public ResponseEntity<ResponseDto<WeixinQrcodeDTO>> getOneQrcode() {
-        return ResponseHandleUtil.toResponse(weixinQrcodeBiz.getOneQrcode());
+        return ResponseHandleUtil.toResponse(weixinQrcodeBiz.getOneQrcode(null));
     }
 
     @Override

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

@@ -5,11 +5,13 @@ import com.fasterxml.jackson.annotation.JsonInclude;
 import java.io.Serializable;
 
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 /**
  * @author lily
  * @date 2019/5/6 16:08
  */
+@Data
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class GroupQrcodeBaseInfoVO implements Serializable {
 
@@ -22,36 +24,7 @@ public class GroupQrcodeBaseInfoVO implements Serializable {
     @ApiModelProperty("二维码地址")
     private String qrcodeUrl;
 
-    public Long getGroupQrcodeId() {
-        return groupQrcodeId;
-    }
-
-    public void setGroupQrcodeId(Long groupQrcodeId) {
-        this.groupQrcodeId = groupQrcodeId;
-    }
-
-    public String getGroupName() {
-        return groupName;
-    }
-
-    public void setGroupName(String groupName) {
-        this.groupName = groupName;
-    }
-
-    public String getQrcodeUrl() {
-        return qrcodeUrl;
-    }
-
-    public void setQrcodeUrl(String qrcodeUrl) {
-        this.qrcodeUrl = qrcodeUrl;
-    }
-
-    @Override
-    public String toString() {
-        return "GroupQrcodeBaseInfoVO{" +
-                "groupQrcodeId=" + groupQrcodeId +
-                ", groupName='" + groupName + '\'' +
-                ", qrcodeUrl='" + qrcodeUrl + '\'' +
-                '}';
-    }
+    @ApiModelProperty(value = "二维码地址", hidden = true)
+    private String weixinGroupId;
+
 }

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

+package com.pcloud.book.group.vo;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+
+/**
+ * @author 戴兴
+ * @description TODO
+ * @date 2019/7/23 15:53
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class ListBook4ChannelVO implements Serializable {
+
+    @ApiModelProperty("书唯一标识")
+    private Long bookId;
+
+    @ApiModelProperty("书群唯一标识")
+    private Long bookGroupId;
+
+    @ApiModelProperty("书名")
+    private String bookName;
+
+    @ApiModelProperty("ISBN")
+    private String isbn;
+
+    @ApiModelProperty("书编号")
+    private String bookNumber;
+
+    @ApiModelProperty("群分类数")
+    private Long classifyNum;
+
+    @ApiModelProperty("群总人数")
+    private Long totalNum;
+
+    @ApiModelProperty("书封面图")
+    private String coverImg;
+
+    public String getBookName() {
+        return bookName;
+    }
+
+    public void setBookName(String bookName) {
+        this.bookName = bookName;
+    }
+
+    public String getIsbn() {
+        return isbn;
+    }
+
+    public void setIsbn(String isbn) {
+        this.isbn = isbn;
+    }
+
+    public String getBookNumber() {
+        return bookNumber;
+    }
+
+    public void setBookNumber(String bookNumber) {
+        this.bookNumber = bookNumber;
+    }
+
+    public Long getClassifyNum() {
+        return classifyNum;
+    }
+
+    public void setClassifyNum(Long classifyNum) {
+        this.classifyNum = classifyNum;
+    }
+
+    public Long getTotalNum() {
+        return totalNum;
+    }
+
+    public void setTotalNum(Long totalNum) {
+        this.totalNum = totalNum;
+    }
+
+    public Long getBookId() {
+        return bookId;
+    }
+
+    public void setBookId(Long bookId) {
+        this.bookId = bookId;
+    }
+
+    public Long getBookGroupId() {
+        return bookGroupId;
+    }
+
+    public void setBookGroupId(Long bookGroupId) {
+        this.bookGroupId = bookGroupId;
+    }
+
+    public String getCoverImg() {
+        return coverImg;
+    }
+
+    public void setCoverImg(String coverImg) {
+        this.coverImg = coverImg;
+    }
+
+    @Override
+    public String toString() {
+        return "ListBook4ChannelVO{" +
+                "bookId=" + bookId +
+                ", bookGroupId=" + bookGroupId +
+                ", bookName='" + bookName + '\'' +
+                ", isbn='" + isbn + '\'' +
+                ", bookNumber='" + bookNumber + '\'' +
+                ", classifyNum=" + classifyNum +
+                ", totalNum=" + totalNum +
+                ", coverImg='" + coverImg + '\'' +
+                '}';
+    }
+}
\ No newline at end of file

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

+package com.pcloud.book.group.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author 戴兴
+ * @description TODO
+ * @date 2019/7/23 15:28
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class ListBookGroup4ChannelParamVO implements Serializable {
+
+    @ApiModelProperty("当前页")
+    private Integer currentPage;
+
+    @ApiModelProperty("每页条数")
+    private Integer numPerPage;
+
+    @ApiModelProperty("搜索的关键词")
+    private String keywords;
+
+    @ApiModelProperty("开始时间")
+    private String startTime;
+
+    @ApiModelProperty("结束时间")
+    private String endTime;
+
+    @ApiModelProperty("是否是基金书 0-否，1-是")
+    private Integer isFundBook;
+
+    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 getKeywords() {
+        return keywords;
+    }
+
+    public void setKeywords(String keywords) {
+        this.keywords = keywords;
+    }
+
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+
+    public Integer getIsFundBook() {
+        return isFundBook;
+    }
+
+    public void setIsFundBook(Integer isFundBook) {
+        this.isFundBook = isFundBook;
+    }
+
+    @Override
+    public String toString() {
+        return "ListBookGroup4ChannelParamVO{" +
+                "currentPage=" + currentPage +
+                ", numPerPage=" + numPerPage +
+                ", keywords='" + keywords + '\'' +
+                ", startTime=" + startTime +
+                ", endTime=" + endTime +
+                ", isFundBook=" + isFundBook +
+                '}';
+    }
+}
\ No newline at end of file

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

 package com.pcloud.book.group.vo;
 
 import java.io.Serializable;
+import java.util.Map;
 
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 /**
  * @author 戴兴
  * @description TODO
  * @date 2019/2/28 18:15
  */
+@Data
 public class QrStatisticsVO implements Serializable {
 
     @ApiModelProperty("所有个数")
@@ -20,36 +23,6 @@ public class QrStatisticsVO implements Serializable {
     @ApiModelProperty("未使用的个数")
     private Integer notUseCount;
 
-    public Integer getAllCount() {
-        return allCount;
-    }
-
-    public void setAllCount(Integer allCount) {
-        this.allCount = allCount;
-    }
-
-    public Integer getInUseCount() {
-        return inUseCount;
-    }
-
-    public void setInUseCount(Integer inUseCount) {
-        this.inUseCount = inUseCount;
-    }
-
-    public Integer getNotUseCount() {
-        return notUseCount;
-    }
-
-    public void setNotUseCount(Integer notUseCount) {
-        this.notUseCount = notUseCount;
-    }
-
-    @Override
-    public String toString() {
-        return "QrStatisticsVO{" +
-                "allCount=" + allCount +
-                ", inUseCount=" + inUseCount +
-                ", notUseCount=" + notUseCount +
-                '}';
-    }
+    @ApiModelProperty("QR版本")
+    private Integer version;
 }
\ No newline at end of file

pcloud-service-book/src/main/java/com/pcloud/book/keywords/biz/BookGuideBiz.java

@@ -5,6 +5,7 @@ import com.pcloud.book.keywords.vo.GuideVO;
 import com.pcloud.book.keywords.vo.ReplyMessageVO;
 import com.pcloud.book.keywords.vo.SetGuideVO;
 import com.pcloud.book.keywords.vo.UpdateGuideVO;
+import com.pcloud.wechatgroup.message.dto.AgreeAddUserDTO;
 
 import java.util.List;
 import java.util.Map;
@@ -14,6 +15,11 @@ import java.util.Map;
  * @date 2019/4/23 15:46
  */
 public interface BookGuideBiz {
+
+    /**
+     * 同意加好友发送欢迎语
+     */
+    void sendGuide(AgreeAddUserDTO agreeAddUserDTO);
     /**
      * @Author:lili
      * @Desr:新增欢迎语

pcloud-service-book/src/main/java/com/pcloud/book/keywords/biz/BookKeywordBiz.java

@@ -6,6 +6,7 @@ import com.pcloud.book.keywords.dto.ReplyKeywordDTO;
 import com.pcloud.book.keywords.dto.ServiceResourceDTO;
 import com.pcloud.book.keywords.vo.*;
 import com.pcloud.common.page.PageBeanNew;
+import com.sdk.wxgroup.SendMessageTypeEnum;
 
 import java.util.List;
 
@@ -70,7 +71,7 @@ public interface BookKeywordBiz {
      * @Desr: 回复关键词消息
      * @Date:2019/5/5 16:28
      */
-    void sendKeywordMessage(String content, String weixinGroupId, String userWxId, String robotId, String ip);
+    void sendKeywordMessage(String content, String weixinGroupId, String userWxId, String robotId, String ip, Integer code);
 
     /**
      * 关键词统计

pcloud-service-book/src/main/java/com/pcloud/book/keywords/dao/BookKeywordDao.java

@@ -52,6 +52,11 @@ public interface BookKeywordDao extends BaseDao<BookKeyword> {
     ReplyKeywordDTO getKeywordId(Long classifyId, Long bookGroupId, String content);
 
     /**
+     * 根据分类ids和群ids批量获取关键词
+     */
+    List<ReplyKeywordDTO> getKeywordIds(List<Long> classifyIds, List<Long> bookGroupIds, String content);
+
+    /**
      * @Author:lili
      * @Desr:校验关键词
      * @Date:2019/5/6 14:47

pcloud-service-book/src/main/java/com/pcloud/book/keywords/dao/impl/BookKeywordDaoImpl.java

 package com.pcloud.book.keywords.dao.impl;
 
+import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 
 import com.pcloud.book.group.vo.SyncKeyworsVO;
@@ -12,10 +13,14 @@ import com.pcloud.book.keywords.vo.ListKeywordVO;
 import com.pcloud.common.core.dao.BaseDaoImpl;
 
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collector;
+import java.util.stream.Collectors;
 
 /**
  * @author lily
@@ -62,6 +67,18 @@ public class BookKeywordDaoImpl extends BaseDaoImpl<BookKeyword> implements Book
     }
 
     @Override
+    public List<ReplyKeywordDTO> getKeywordIds(List<Long> classifyIds, List<Long> bookGroupIds, String content) {
+        if (CollectionUtils.isEmpty(classifyIds) || CollectionUtils.isEmpty(bookGroupIds) || StringUtils.isEmpty(content)) {
+            return Lists.newArrayList();
+        }
+        Map<String, Object> paramMap = Maps.newHashMap();
+        paramMap.put("classifyId", classifyIds.stream().map(Object::toString).collect(Collectors.joining(",")));
+        paramMap.put("bookGroupId", bookGroupIds.stream().map(Object::toString).collect(Collectors.joining(",")));
+        paramMap.put("content", content);
+        return this.getSqlSession().selectList(this.getStatement("getKeywordIds"), paramMap);
+    }
+
+    @Override
     public Boolean checkKeyword(String keywords, Long classifyId, Long bookGroupId, Long keywordId) {
         Map<String, Object> paramMap = new HashMap<>();
         paramMap.put("classifyId", classifyId);

pcloud-service-book/src/main/java/com/pcloud/book/keywords/dto/ReplyKeywordDTO.java

@@ -27,6 +27,12 @@ public class ReplyKeywordDTO  implements Serializable {
     @ApiModelProperty("仓库关键词id")
     private Long warehouseId;
 
+    @ApiModelProperty("分类id")
+    private Long classifyId;
+
+    @ApiModelProperty("群id")
+    private Long bookGroupId;
+
     @ApiModelProperty("内容")
     private String content;
 
@@ -42,4 +48,10 @@ public class ReplyKeywordDTO  implements Serializable {
     @ApiModelProperty("短链接地址")
     private String shortLinkUrl;
 
+    @ApiModelProperty("应用/作品id")
+    private Long serveId;
+
+    @ApiModelProperty("应用/作品")
+    private String serveType;
+
 }

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

@@ -6,12 +6,15 @@ import com.pcloud.book.keywords.vo.GuideVO;
 import com.pcloud.book.keywords.vo.ReplyMessageVO;
 import com.pcloud.book.keywords.vo.SetGuideVO;
 import com.pcloud.book.keywords.vo.UpdateGuideVO;
+import com.pcloud.common.core.constant.MQTopicProducer;
 import com.pcloud.common.dto.ResponseDto;
 import com.pcloud.common.exceptions.BizException;
 import com.pcloud.common.permission.PermissionException;
 import com.pcloud.common.utils.ResponseHandleUtil;
 import com.pcloud.common.utils.SessionUtil;
+import com.pcloud.wechatgroup.message.dto.AgreeAddUserDTO;
 
+import org.springframework.amqp.core.AmqpTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -26,16 +29,34 @@ import org.springframework.web.bind.annotation.RestController;
 import java.util.List;
 import java.util.Map;
 
+import lombok.extern.slf4j.Slf4j;
+
 /**
  * @author lily
  * @date 2019/4/23 15:24
  */
+@Slf4j
 @RestController("bookGuideFacade")
 @RequestMapping("bookGuide")
 public class BookGuideFacadeImpl implements BookGuideFacade {
 
     @Autowired
     private BookGuideBiz bookGuidBiz;
+    @Autowired
+    private AmqpTemplate amqpTemplate;
+
+    @PostMapping("test")
+    public void test() {
+        final AgreeAddUserDTO agreeAddUserDTO = new AgreeAddUserDTO();
+        agreeAddUserDTO.setNickName("大威");
+        agreeAddUserDTO.setRobotWxId("wxid_arjobo1bbk2i22");
+        // 当消息为个人消息时，wechatGroupId为发送人id
+        agreeAddUserDTO.setUserWxId("p867263500");
+        agreeAddUserDTO.setIp("http://192.168.92.122:8081");
+        log.info("[processSelfMessage] start convertAndSend agreeAddUserDTO:{}", agreeAddUserDTO);
+        // 发送topic book处理后续欢迎语，关键词和拉群操作
+        amqpTemplate.convertAndSend(MQTopicProducer.EXCHAGE, MQTopicProducer.WX_AGREE_ADD_USER, agreeAddUserDTO);
+    }
 
     @Override
     @PostMapping("insertGuide")

pcloud-service-book/src/main/java/com/pcloud/book/mq/config/MQTopicConumer.java

@@ -70,4 +70,9 @@ public class MQTopicConumer {
      */
     public static final String WXGROUP_LEARNING_REPORT = PREFIX + MQTopicProducer.WXGROUP_LEARNING_REPORT;
 
+    /**
+     * 微信群同意添加好友成功
+     */
+    public static final String WX_AGREE_ADD_USER = PREFIX + MQTopicProducer.WX_AGREE_ADD_USER;
+
 }

pcloud-service-book/src/main/java/com/pcloud/book/mq/topic/UpdateWXGroupNameListener.java

@@ -51,8 +51,8 @@ public class UpdateWXGroupNameListener {
             }
             String groupName = groupQrcode.getGroupName();
             // 如果数据库微信群名称超过16，就截断，然后重新设置数据库的名称，因为wxgroup那边设置的时候截断了
-            if (groupName.length() > 16) {
-                groupName = groupName.substring(0, 16);
+            if (groupName.length() > 15) {
+                groupName = groupName.substring(0, 15);
                 groupQrcodeDao.updateGroupName(groupQrcode.getId(), groupName);
             }
             if (!groupNameDTO.getNewGroupName().equals(groupName)) {
@@ -67,7 +67,7 @@ public class UpdateWXGroupNameListener {
                 SendTextMessageVO sendTextMessageVO = new SendTextMessageVO();
                 sendTextMessageVO.setContent("@"+groupNameDTO.getNickName()+"，为方便群友入群分享好的助学方法，请不要随意修改群名。如再修改，会将您移出群聊。谢谢配合。");
                 sendTextMessageVO.setAltId(altId);
-                sendTextMessageVO.setGroupId(wechatGroupId);
+                sendTextMessageVO.setWxGroupId(wechatGroupId);
                 LOGGER.info("发送警告文本消息"+sendTextMessageVO.toString());
                 sendTextMessageVO.setIp(findIp(wechatGroupId));
                 WxGroupSDK.sendTextMessage(sendTextMessageVO);

pcloud-service-book/src/main/java/com/pcloud/book/mq/topic/WXGroupLearningReportListener.java

@@ -25,6 +25,7 @@ import com.pcloud.wechatgroup.message.dto.GroupLearningReportDTO;
 import com.sdk.wxgroup.SendPicMessageVO;
 import com.sdk.wxgroup.SendTextMessageVO;
 import com.sdk.wxgroup.WxGroupSDK;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.amqp.rabbit.annotation.RabbitHandler;
@@ -63,8 +64,9 @@ public class WXGroupLearningReportListener {
         try {
             if (groupLearningReportDTO == null
                     || groupLearningReportDTO.getWechatGroupId() == null
-                    || groupLearningReportDTO.getWechatUserId() == null)
+                    || groupLearningReportDTO.getWechatUserId() == null) {
                 return;
+            }
             String wechatUserId = groupLearningReportDTO.getWechatUserId();
             String wechatGroupId = groupLearningReportDTO.getWechatGroupId();
             //新增触发记录
@@ -102,7 +104,7 @@ public class WXGroupLearningReportListener {
                 return;
             }
             SendTextMessageVO sendTextMessageVO = new SendTextMessageVO();
-            sendTextMessageVO.setGroupId(wechatGroupId);
+            sendTextMessageVO.setWxGroupId(wechatGroupId);
             sendTextMessageVO.setAltId(alt);
             sendTextMessageVO.setContent("个人专属学习报告，及群成员元气排行榜。点击获取" + resultUrl);
             sendTextMessageVO.setIp(findIp(wechatGroupId));
@@ -115,7 +117,7 @@ public class WXGroupLearningReportListener {
             }
             SendPicMessageVO sendPicMessageVO = new SendPicMessageVO();
             sendPicMessageVO.setPicUrl(imageUrl);
-            sendPicMessageVO.setGroupId(wechatGroupId);
+            sendPicMessageVO.setWxGroupId(wechatGroupId);
             sendPicMessageVO.setAltId(alt);
             sendPicMessageVO.setIp(findIp(wechatGroupId));
             LOGGER.info("发送分享图消息开始"+sendPicMessageVO.toString());