Merge branch 'feat-1002160' into 'master'

定制社群书

See merge request rays/pcloud-book!299

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

@@ -681,4 +681,11 @@ public interface BookGroupBiz {
      * 获取1v1关联社群书数量和名称
      */
     List<BookGroupDTO> getAssocBookGroupByServeInfo(Long adviserId,Long serveId,String serveType);
+
+    /**
+     * 更新社群码定制出版社状态
+     * @param id
+     * @param belongSpecialAgent
+     */
+    public void updateSpecialState(Long id, Boolean belongSpecialAgent);
 }

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

@@ -90,8 +90,8 @@ import com.pcloud.book.group.entity.QrChangeRecord;
 import com.pcloud.book.group.entity.TempletRelevance;
 import com.pcloud.book.group.entity.WeixinQrcodeGeneration;
 import com.pcloud.book.group.entity.WxUserWechatRelevance;
-import com.pcloud.book.group.enums.ChangeOriginTypeEnum;
 import com.pcloud.book.group.enums.AppAndProductTypeEnum;
+import com.pcloud.book.group.enums.ChangeOriginTypeEnum;
 import com.pcloud.book.group.enums.CipherTypeEnum;
 import com.pcloud.book.group.enums.JoinGroupTypeEnum;
 import com.pcloud.book.group.enums.LargeTempletEnum;
@@ -1468,6 +1468,7 @@ public class BookGroupBizImpl implements BookGroupBiz {
         availableRobotParamDTO.setLargeTemplet(largeTemplet);
         availableRobotParamDTO.setGrade(bookGroupDTO.getDepLabelName());
         availableRobotParamDTO.setSubject(bookGroupDTO.getProLabelName());
+        availableRobotParamDTO.setSpecialAgent(bookGroupDTO.getBelongSpecialAgent());
         SelfRobotDTO selfRobotDTO = wechatGroupConsr.getAvailableRobotByBookGroup(availableRobotParamDTO);
         if (selfRobotDTO == null) {
             throw new BookBizException(BookBizException.PARAM_IS_ERROR, "未找到机器人!");
@@ -4008,4 +4009,9 @@ public class BookGroupBizImpl implements BookGroupBiz {
         }
         return map;
     }
+
+    @Override
+    public void updateSpecialState(Long id, Boolean belongSpecialAgent) {
+        bookGroupDao.updateSpecialState(id, belongSpecialAgent);
+    }
 }

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

 package com.pcloud.book.group.dao;
 
-import java.util.List;
-import java.util.Map;
-
 import com.pcloud.book.group.dto.AgentStatisticsInfoDTO;
 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.dto.SelfBookGroupStDTO;
 import com.pcloud.book.group.dto.TopAgentBookGroupDTO;
 import com.pcloud.book.group.entity.BookGroup;
 import com.pcloud.book.group.entity.QrChangeRecord;
 import com.pcloud.book.group.vo.BookGroupAnalysisVO;
 import com.pcloud.common.core.dao.BaseDao;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * Description 社群书群二维码数据访问层接口
  * Created by PENG on 2019/4/17.
@@ -284,4 +283,11 @@ public interface BookGroupDao extends BaseDao<BookGroup> {
      * 获取关联社群书
      */
     List<BookGroupDTO> getAssocBookGroupByAppInfo(Map<String, Object> paramMap);
+
+    /**
+     * 更新社群码定制出版社状态
+     * @param id
+     * @param belongSpecialAgent
+     */
+    public void updateSpecialState(Long id, Boolean belongSpecialAgent);
 }

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

@@ -5,7 +5,6 @@ import com.pcloud.book.group.dto.AgentStatisticsInfoDTO;
 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.dto.SelfBookGroupStDTO;
 import com.pcloud.book.group.dto.TopAgentBookGroupDTO;
 import com.pcloud.book.group.entity.BookGroup;
 import com.pcloud.book.group.entity.QrChangeRecord;
@@ -323,4 +322,12 @@ public class BookGroupDaoImpl extends BaseDaoImpl<BookGroup> implements BookGrou
     public List<BookGroupDTO> getAssocBookGroupByAppInfo(Map<String, Object> paramMap) {
         return super.getSqlSession().selectList(getStatement("getAssocBookGroupByAppInfo"), paramMap);
     }
+
+    @Override
+    public void updateSpecialState(Long id, Boolean belongSpecialAgent) {
+        Map<String, Object> paramMap = new HashMap<>();
+        paramMap.put("id", id);
+        paramMap.put("belongSpecialAgent", belongSpecialAgent);
+        getSessionTemplate().update(getStatement("updateSpecialState"), paramMap);
+    }
 }

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

@@ -210,6 +210,11 @@ public class BookGroupDTO extends BaseDto {
      */
     private Boolean assocState;
 
+    /**
+     * 是否属于特殊出版社
+     */
+    private Boolean belongSpecialAgent;
+
     public String getUrl() {
         return url;
     }
@@ -532,6 +537,14 @@ public class BookGroupDTO extends BaseDto {
         this.assocState = assocState;
     }
 
+    public Boolean getBelongSpecialAgent() {
+        return belongSpecialAgent;
+    }
+
+    public void setBelongSpecialAgent(Boolean belongSpecialAgent) {
+        this.belongSpecialAgent = belongSpecialAgent;
+    }
+
     @Override
     public String toString() {
         return "BookGroupDTO{" +
@@ -575,6 +588,7 @@ public class BookGroupDTO extends BaseDto {
                 ", isSomeUpdate=" + isSomeUpdate +
                 ", bookGroupServes=" + bookGroupServes +
                 ", assocState=" + assocState +
-                "} " + super.toString();
+                ", belongSpecialAgent=" + belongSpecialAgent +
+                '}';
     }
 }
\ No newline at end of file

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

@@ -145,6 +145,11 @@ public class BookGroup extends BaseEntity {
      */
     private Long agentId;
 
+    /**
+     * 是否属于特殊出版社
+     */
+    private Boolean belongSpecialAgent;
+
     public Long getId() {
         return id;
     }
@@ -353,6 +358,14 @@ public class BookGroup extends BaseEntity {
         this.agentId = agentId;
     }
 
+    public Boolean getBelongSpecialAgent() {
+        return belongSpecialAgent;
+    }
+
+    public void setBelongSpecialAgent(Boolean belongSpecialAgent) {
+        this.belongSpecialAgent = belongSpecialAgent;
+    }
+
     @Override
     public String toString() {
         return "BookGroup{" +
@@ -382,6 +395,7 @@ public class BookGroup extends BaseEntity {
                 ", lastPushUpdateTime=" + lastPushUpdateTime +
                 ", isSomeUpdate=" + isSomeUpdate +
                 ", agentId=" + agentId +
-                "} " + super.toString();
+                ", belongSpecialAgent=" + belongSpecialAgent +
+                '}';
     }
 }
\ No newline at end of file

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

 package com.pcloud.book.group.facade;
 
-import com.pcloud.book.group.dto.ChangeQrCodeTypeDto;
 import com.pcloud.book.group.dto.BookGroupDTO;
+import com.pcloud.book.group.dto.ChangeQrCodeTypeDto;
 import com.pcloud.book.group.dto.SelfBookGroupStParamDTO;
 import com.pcloud.book.group.dto.UserSelectParamDTO;
 import com.pcloud.book.group.entity.BookGroup;
@@ -640,4 +640,11 @@ public interface BookGroupFacade {
             @RequestParam("numPerPage") Integer numPerPage)
             throws BizException, PermissionException;
 
+    @ApiOperation("更新社群码定制出版社状态")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "belongSpecialAgent", value = "定制出版社状态", dataType = "boolean", paramType = "query"),
+            @ApiImplicitParam(name = "id", value = "社群书id", required = true, dataType = "string", paramType = "query")
+    })
+    @GetMapping("updateSpecialState")
+    public ResponseDto<?> updateSpecialState(@RequestParam("id") Long id, @RequestParam("belongSpecialAgent") Boolean belongSpecialAgent);
 }

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

@@ -3,8 +3,8 @@ 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.ChangeQrCodeTypeDto;
 import com.pcloud.book.group.dto.BookGroupDTO;
+import com.pcloud.book.group.dto.ChangeQrCodeTypeDto;
 import com.pcloud.book.group.dto.GroupStoreMyPayDto;
 import com.pcloud.book.group.dto.SelfBookGroupStParamDTO;
 import com.pcloud.book.group.dto.UserSelectParamDTO;
@@ -995,4 +995,11 @@ public class BookGroupFacadeImpl implements BookGroupFacade {
         PageBeanNew<BookGroupDTO> pageBean = bookGroupBiz.getAssocBookGroupByAppInfo(paramMap, new PageParam(currentPage, numPerPage));
         return new ResponseDto<>(null == pageBean ? new PageBeanNew<>() : pageBean);
     }
+
+    @Override
+    @GetMapping("updateSpecialState")
+    public ResponseDto<?> updateSpecialState(@RequestParam("id") Long id, @RequestParam("belongSpecialAgent") Boolean belongSpecialAgent) {
+        bookGroupBiz.updateSpecialState(id, belongSpecialAgent);
+        return new ResponseDto<>();
+    }
 }

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

@@ -28,6 +28,7 @@
         <result column="last_push_update_time" property="lastPushUpdateTime" jdbcType="TIMESTAMP"/>
         <result column="is_some_update" property="isSomeUpdate" jdbcType="BOOLEAN"/>
         <result column="agent_id" property="agentId" jdbcType="BIGINT"/>
+        <result column="belong_special_agent" property="belongSpecialAgent" jdbcType="BOOLEAN"/>
     </resultMap>
 
     <resultMap id="BookGroupDTO" type="com.pcloud.book.group.dto.BookGroupDTO">
@@ -61,6 +62,7 @@
         <result column="last_push_update_time" property="lastPushUpdateTime" jdbcType="TIMESTAMP"/>
         <result column="is_some_update" property="isSomeUpdate" jdbcType="BOOLEAN"/>
         <result column="agent_id" property="agentId" jdbcType="BIGINT"/>
+        <result column="belong_special_agent" property="belongSpecialAgent" jdbcType="BOOLEAN"/>
     </resultMap>
 
     <sql id="Base_Column_List">
@@ -68,7 +70,7 @@
         pur_label_id, join_title, join_slogan, personal_qrcode_url, product_id, create_user,
         create_time,
         update_time, is_delete, is_show_book_name,join_group_type,add_friend_guide,customer_service_name,
-        is_invite_group,book_group_cipher, last_push_update_time, is_some_update, agent_id
+        is_invite_group,book_group_cipher, last_push_update_time, is_some_update, agent_id, belong_special_agent
     </sql>
 
     <select id="getById" resultMap="BaseResultMap" parameterType="java.lang.Long">
@@ -881,4 +883,9 @@
         ORDER BY
         G.UPDATE_TIME DESC
     </select>
+
+    <update id="updateSpecialState" parameterType="map">
+        UPDATE book_group SET belong_special_agent = #{belongSpecialAgent} WHERE id = #{id}
+    </update>
+
 </mapper>
\ No newline at end of file