Merge branch 'feat-rsy-1001465' into 'master'

6月学习报告需求合集加删除接口

See merge request rays/pcloud-book!108

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

@@ -265,6 +265,11 @@ public interface BookGroupBiz {
     Boolean getIsShowBookName(Long partyId);
 
     /**
+     * 删除社群码
+     */
+    void deleteBookGroup(Long bookGroupId);
+
+    /**
      * 根据分类id获取个人二维码信息
      */
     OwnAltQrcodeInfoDTO getOwnAltQrcodeInfoDTOByClassifyId(Long wechatUserId, Long classifyId);

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

@@ -34,8 +34,7 @@ import com.pcloud.book.group.dao.AppClickRecordDao;
 import com.pcloud.book.group.dao.AppTouchRecordDao;
 import com.pcloud.book.group.dao.BookGroupClassifyDao;
 import com.pcloud.book.group.dao.BookGroupDao;
-import com.pcloud.book.group.dto.*;
-import com.pcloud.book.group.entity.BookGroup;
+import com.pcloud.book.group.vo.ClassifyAndGroupCountVO;
 import com.pcloud.book.group.vo.*;
 import com.pcloud.book.keywords.dao.BookKeywordDao;
 import com.pcloud.book.keywords.enums.ReplyTypeEnum;
@@ -1144,6 +1143,29 @@ public class BookGroupBizImpl implements BookGroupBiz {
     }
 
     @Transactional(rollbackFor = Exception.class)
+    @ParamLog("删除社群码")
+    @Override
+    public void deleteBookGroup(Long bookGroupId) {
+        if (bookGroupId == null) {
+            throw new BookBizException(BookBizException.PARAM_IS_ERROR, "参数不能为空");
+        }
+        BookGroupDTO dto = bookGroupDao.getDTOById(bookGroupId);
+        if (dto == null) {
+            throw new BookBizException(BookBizException.PARAM_IS_ERROR, "没有该数据！");
+        }
+        if (dto.getBookId() != null && !new Long(0L).equals(dto.getBookId())) {
+            throw new BookBizException(BookBizException.PARAM_IS_ERROR, "该社群码已经绑定图书！");
+        }
+        ClassifyAndGroupCountVO classifyAndGroupCount = bookGroupClassifyBiz.getClassifyAndGroupCount(bookGroupId);
+        if (classifyAndGroupCount != null
+                && ((classifyAndGroupCount.getClassifyCount() != null && classifyAndGroupCount.getClassifyCount() > 0)
+                || (classifyAndGroupCount.getGroupCount() != null && classifyAndGroupCount.getGroupCount() > 0))) {
+            throw new BookBizException(BookBizException.PARAM_IS_ERROR, "该社群码下已有分类！");
+        }
+        bookGroupDao.deleteByBookGroupId(bookGroupId);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
     @ParamLog("根据分类id获取个人二维码信息")
     @Override
     public OwnAltQrcodeInfoDTO getOwnAltQrcodeInfoDTOByClassifyId(Long wechatUserId, Long classifyId) {

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

@@ -143,4 +143,9 @@ public interface BookGroupDao extends BaseDao<BookGroup> {
      * 获取是否显示书名
      */
     Boolean getIsShowBookName(Long partyId);
+
+    /**
+     * 删除社群书
+     */
+    void deleteByBookGroupId(Long bookGroupId);
 }

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

@@ -150,4 +150,11 @@ public class BookGroupDaoImpl extends BaseDaoImpl<BookGroup> implements BookGrou
     public Boolean getIsShowBookName(Long partyId) {
         return this.getSqlSession().selectOne(this.getStatement("getIsShowBookName"), partyId);
     }
+
+    @Override
+    public void deleteByBookGroupId(Long bookGroupId) {
+        Map<String, Object> paramMap = new HashMap<>();
+        paramMap.put("bookGroupId", bookGroupId);
+        super.getSqlSession().update(getStatement("deleteByBookGroupId"), paramMap);
+    }
 }

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

@@ -276,6 +276,13 @@ public interface BookGroupFacade {
             @RequestHeader("token") String token
     ) throws BizException, PermissionException, JsonParseException;
 
+    @ApiOperation("删除社群码")
+    @GetMapping("deleteBookGroup")
+    ResponseDto<?> deleteBookGroup(
+            @RequestHeader("token") String token,
+            @RequestParam("bookGroupId") Long bookGroupId
+    ) throws BizException, PermissionException, JsonParseException;
+
     @ApiOperation("根据分类id获取个人二维码")
     @GetMapping("getOwnAltQrcodeInfoDTOByClassifyId")
     ResponseDto<?> getOwnAltQrcodeInfoDTOByClassifyId(

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

@@ -397,6 +397,18 @@ public class BookGroupFacadeImpl implements BookGroupFacade {
         return new ResponseDto<>(bookGroupBiz.getIsShowBookName(partyId));
     }
 
+    @ApiOperation("删除社群码")
+    @GetMapping("deleteBookGroup")
+    @Override
+    public ResponseDto<?> deleteBookGroup(
+            @RequestHeader("token") String token,
+            @RequestParam("bookGroupId") Long bookGroupId
+    ) throws BizException, PermissionException, JsonParseException {
+        SessionUtil.getVlaue(token, SessionUtil.PARTY_ID);
+        bookGroupBiz.deleteBookGroup(bookGroupId);
+        return new ResponseDto<>();
+    }
+
     @ApiOperation("根据分类id获取个人二维码")
     @GetMapping("getOwnAltQrcodeInfoDTOByClassifyId")
     @Override
@@ -421,5 +433,4 @@ public class BookGroupFacadeImpl implements BookGroupFacade {
         return new ResponseDto<>(bookGroupBiz.getAllLargTemplet());
     }
 
-
 }

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

@@ -335,4 +335,12 @@
         select IFNULL(is_show_book_name,0) from book_group
         where create_user=#{partyId} limit 1
     </select>
+
+    <!--删除-->
+    <update id="deleteByBookGroupId" parameterType="map">
+        update book_group
+        set is_delete = 1,
+        update_time=now()
+        where id = #{bookGroupId} and is_delete = 0
+    </update>
 </mapper>
\ No newline at end of file