Merge branch 'feat-dw-delBookGroup' into 'master'

feat delBookGroup

See merge request rays/pcloud-book!230

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

@@ -294,6 +294,12 @@ public interface BookGroupBiz {
     void deleteBookGroup(Long bookGroupId);
 
     /**
+     * 删除社群书不删除现代纸书
+     * by sjh 20191119
+     */
+    void deleteBookGroup4Adviser(Long bookGroupId);
+
+    /**
      * 根据社群码id获取个人二维码信息
      */
     OwnAltQrcodeInfoDTO getOwnAltQrcodeInfoDTOByBookGroupId(Long wechatUserId, Long bookGroupId);

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

@@ -1311,6 +1311,18 @@ public class BookGroupBizImpl implements BookGroupBiz {
         bookGroupDao.deleteByBookGroupId(bookGroupId);
     }
 
+    @Override
+    public void deleteBookGroup4Adviser(Long bookGroupId) {
+        if (bookGroupId == null) {
+            throw new BookBizException(BookBizException.PARAM_IS_ERROR, "参数不能为空");
+        }
+        BookGroupDTO dto = bookGroupDao.getDTOById(bookGroupId);
+        if (dto == null || dto.getIsDelete()) {
+            throw new BookBizException(BookBizException.ID_NOT_EXIST, "没有该数据！");
+        }
+        bookGroupDao.deleteByBookGroupId(bookGroupId);
+    }
+
     @Transactional(rollbackFor = Exception.class)
     @ParamLog("根据社群码id获取个人二维码信息")
     @Override

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

@@ -3,18 +3,9 @@ package com.pcloud.book.group.facade;
 import com.pcloud.book.group.entity.BookGroup;
 import com.pcloud.book.group.entity.BookGroupClassify;
 import com.pcloud.book.group.entity.BookGroupServe;
-import com.pcloud.book.group.vo.FriendsVO;
-import com.pcloud.book.group.vo.GroupIncomeStaticParamVO;
-import com.pcloud.book.group.vo.GroupScanTrendParamVO;
-import com.pcloud.book.group.vo.GroupScanTrendVO;
-import com.pcloud.book.group.vo.ListBookGroup4ChannelParamVO;
-import com.pcloud.book.group.vo.ResourcesStatisticVO;
-import com.pcloud.book.group.vo.UpdateRankTypeVO;
-import com.pcloud.common.dto.ResponseDto;
-import com.pcloud.common.exceptions.BizException;
-import com.pcloud.common.page.PageBean;
 import com.pcloud.book.group.vo.BookGroupAnalysisParam;
 import com.pcloud.book.group.vo.BookGroupAnalysisVO;
+import com.pcloud.book.group.vo.FriendsVO;
 import com.pcloud.book.group.vo.GroupIncomeStaticParamVO;
 import com.pcloud.book.group.vo.GroupScanTrendParamVO;
 import com.pcloud.book.group.vo.GroupScanTrendVO;
@@ -311,6 +302,13 @@ public interface BookGroupFacade {
             @RequestParam("bookGroupId") Long bookGroupId
     ) throws BizException, PermissionException, JsonParseException;
 
+    @ApiOperation("删除社群码（不校验挂书和分类）")
+    @GetMapping("deleteBookGroup4Adviser")
+    ResponseDto<?> deleteBookGroup4Adviser(
+            @RequestHeader("token") String token,
+            @RequestParam("bookGroupId") Long bookGroupId
+    ) throws BizException, PermissionException, JsonParseException;
+
     @ApiOperation("根据社群书id获取个人二维码")
     @GetMapping("getOwnAltQrcodeInfoDTOByBookGroupId")
     ResponseDto<?> getOwnAltQrcodeInfoDTOByBookGroupId(

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

@@ -49,11 +49,13 @@ import java.util.Map;
 
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * Description 社群书群二维码接口实现类
  * Created by PENG on 2019/4/17.
  */
+@Slf4j
 @RestController("bookGroupFacade")
 @RequestMapping("bookGroup")
 public class BookGroupFacadeImpl implements BookGroupFacade {
@@ -430,6 +432,18 @@ public class BookGroupFacadeImpl implements BookGroupFacade {
         return new ResponseDto<>();
     }
 
+    @GetMapping("deleteBookGroup4Adviser")
+    @Override
+    public ResponseDto<?> deleteBookGroup4Adviser(
+            @RequestHeader("token") String token,
+            @RequestParam("bookGroupId") Long bookGroupId
+    ) throws BizException, PermissionException {
+        Long partyId = (Long) SessionUtil.getVlaue(token, SessionUtil.PARTY_ID);
+        log.info("===deleteBookGroup4Adviser partyId :{}; bookGroupId:{}===", partyId, bookGroupId);
+        bookGroupBiz.deleteBookGroup4Adviser(bookGroupId);
+        return new ResponseDto<>();
+    }
+
     @ApiOperation("根据社群书id获取个人二维码")
     @GetMapping("getOwnAltQrcodeInfoDTOByBookGroupId")
     @Override