Merge branch 'feat-rsy' into 'master'

修改bug1015443

See merge request rays/pcloud-book!198

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

@@ -682,6 +682,7 @@ public class BookAdviserBizImpl implements BookAdviserBiz {
 		updateBookAdviserStatus(bookId, adviserId, channelId, templetId, secondTempletId, BookConstant.BOOK_ADVISER_NO_DELETE,BookConstant.MAIN_ADVISER);
 		// 恢复图书关联的二维码 20190723-刘娜【ID1001264】社群书删除后，再创建时不要自动恢复
 		if (recoverScene) {
+			bookGroupBiz.recoverByBookId(bookId, channelId, adviserId);
 			qrcodeSceneConsr.recoverByBook(bookId, channelId, adviserId);
 		}
 
@@ -711,8 +712,6 @@ public class BookAdviserBizImpl implements BookAdviserBiz {
 		bookAdviserDao.updateBook4Adviser(paramMap);
 		if (BookConstant.BOOK_ADVISER_DELETE.equals(deleteStatus)) {
             bookGroupBiz.deleteByBookId(bookId, channelId, adviserId);
-        } else {
-            bookGroupBiz.recoverByBookId(bookId, channelId, adviserId);
         }
 		LOGGER.info("修改书籍编辑的状态（删除或者恢复） <END>");
 	}