Skip to content

M
midjourney-proxy
Commit ea41aea7 by gaopeng
Options

社群书

parent d3f9d6ee
Showing with 608 additions and 150 deletions
pcloud-facade-book/src/main/java/com/pcloud/book/book/dto/BookDto.java
...@@ -440,6 +440,50 @@ public class BookDto extends BaseDto { ...@@ -440,6 +440,50 @@ public class BookDto extends BaseDto {
* 唯一编号 * 唯一编号
*/ */
private String uniqueNumber; private String uniqueNumber;
/**
* 社群码数据
*/
/**
* 社群码ID
*/
private Long bookGroupId;
/**
* 社群码图片
*/
private String groupQrcodeUrl;
/**
* 社群码名称
*/
private String groupQrcodeName;
/**
* 群分类数量
*/
private Long classifyCount;
/**
* 群总人数
*/
private Long groupPersonCount;
/**
* 群数量
*/
private Long groupCount;
/**
* 累计收益
*/
private BigDecimal totalIncome;
/**
* 社群码链接
*/
private String groupQrcodeLink;
public String getQrRemark() { public String getQrRemark() {
return qrRemark; return qrRemark;
} }
...@@ -1116,6 +1160,30 @@ public class BookDto extends BaseDto { ...@@ -1116,6 +1160,30 @@ public class BookDto extends BaseDto {
this.officialAccountsName = officialAccountsName; this.officialAccountsName = officialAccountsName;
} }
public Long getBookGroupId() {
return bookGroupId;
}
public void setBookGroupId(Long bookGroupId) {
this.bookGroupId = bookGroupId;
}
public String getGroupQrcodeUrl() {
return groupQrcodeUrl;
}
public void setGroupQrcodeUrl(String groupQrcodeUrl) {
this.groupQrcodeUrl = groupQrcodeUrl;
}
public String getGroupQrcodeName() {
return groupQrcodeName;
}
public void setGroupQrcodeName(String groupQrcodeName) {
this.groupQrcodeName = groupQrcodeName;
}
public String getUniqueNumber() { public String getUniqueNumber() {
return uniqueNumber; return uniqueNumber;
} }
...@@ -1123,6 +1191,47 @@ public class BookDto extends BaseDto { ...@@ -1123,6 +1191,47 @@ public class BookDto extends BaseDto {
public void setUniqueNumber(String uniqueNumber) { public void setUniqueNumber(String uniqueNumber) {
this.uniqueNumber = uniqueNumber; this.uniqueNumber = uniqueNumber;
} }
public Long getClassifyCount() {
return classifyCount;
}
public void setClassifyCount(Long classifyCount) {
this.classifyCount = classifyCount;
}
public Long getGroupPersonCount() {
return groupPersonCount;
}
public void setGroupPersonCount(Long groupPersonCount) {
this.groupPersonCount = groupPersonCount;
}
public Long getGroupCount() {
return groupCount;
}
public void setGroupCount(Long groupCount) {
this.groupCount = groupCount;
}
public BigDecimal getTotalIncome() {
return totalIncome;
}
public void setTotalIncome(BigDecimal totalIncome) {
this.totalIncome = totalIncome;
}
public String getGroupQrcodeLink() {
return groupQrcodeLink;
}
public void setGroupQrcodeLink(String groupQrcodeLink) {
this.groupQrcodeLink = groupQrcodeLink;
}
@Override @Override
public String toString() { public String toString() {
return "BookDto{" + return "BookDto{" +
...@@ -1210,7 +1319,14 @@ public class BookDto extends BaseDto { ...@@ -1210,7 +1319,14 @@ public class BookDto extends BaseDto {
", exposureNum=" + exposureNum + ", exposureNum=" + exposureNum +
", clickNum=" + clickNum + ", clickNum=" + clickNum +
", officialAccountsName='" + officialAccountsName + '\'' + ", officialAccountsName='" + officialAccountsName + '\'' +
", bookGroupId=" + bookGroupId +
", groupQrcodeUrl='" + groupQrcodeUrl + '\'' +
", groupQrcodeName='" + groupQrcodeName + '\'' +
", uniqueNumber='" + uniqueNumber + '\'' + ", uniqueNumber='" + uniqueNumber + '\'' +
", classifyCount=" + classifyCount +
", groupPersonCount=" + groupPersonCount +
", groupCount=" + groupCount +
", totalIncome=" + totalIncome +
'}'; '}';
} }
} }
pcloud-facade-book/src/main/java/com/pcloud/book/book/entity/Book.java
...@@ -182,6 +182,11 @@ public class Book extends BaseEntity { ...@@ -182,6 +182,11 @@ public class Book extends BaseEntity {
*/ */
private Integer isDelete; private Integer isDelete;
/**
* 是否社群书
*/
private Boolean isBookGroup;
public String getTypeCode() { public String getTypeCode() {
return typeCode; return typeCode;
} }
...@@ -447,6 +452,14 @@ public class Book extends BaseEntity { ...@@ -447,6 +452,14 @@ public class Book extends BaseEntity {
this.isDelete = isDelete; this.isDelete = isDelete;
} }
public Boolean getIsBookGroup() {
return isBookGroup;
}
public void setIsBookGroup(Boolean isBookGroup) {
this.isBookGroup = isBookGroup;
}
@Override @Override
public String toString() { public String toString() {
return "Book [bookId=" + bookId + ", typeCode=" + typeCode + ", isbn=" + isbn + ", bookName=" + bookName return "Book [bookId=" + bookId + ", typeCode=" + typeCode + ", isbn=" + isbn + ", bookName=" + bookName
...@@ -457,7 +470,8 @@ public class Book extends BaseEntity { ...@@ -457,7 +470,8 @@ public class Book extends BaseEntity {
+ mailCode + ", address=" + address + ", telephone=" + telephone + ", mail=" + mail + ", purpose=" + mailCode + ", address=" + address + ", telephone=" + telephone + ", mail=" + mail + ", purpose="
+ purpose + ", createdUser=" + createdUser + ", lastModifiedUser=" + lastModifiedUser + ", channelId=" + purpose + ", createdUser=" + createdUser + ", lastModifiedUser=" + lastModifiedUser + ", channelId="
+ channelId + ", issn=" + issn + ", serialNumber=" + serialNumber + ", adImg=" + adImg + ", templetId=" + channelId + ", issn=" + issn + ", serialNumber=" + serialNumber + ", adImg=" + adImg + ", templetId="
+ templetId + ", agentId=" + agentId + ", sceneId=" + sceneId + ", isDelete=" + isDelete + "]"; + templetId + ", agentId=" + agentId + ", sceneId=" + sceneId + ", isDelete=" + isDelete + ", isBookGroup="
+ isBookGroup + "]";
} }
} }
pcloud-service-book/src/main/java/com/pcloud/book/appeal/biz/impl/BookAppealBizImpl.java
...@@ -9,6 +9,7 @@ import java.util.Map; ...@@ -9,6 +9,7 @@ import java.util.Map;
import com.pcloud.book.appeal.dao.BookAppealResultDao; import com.pcloud.book.appeal.dao.BookAppealResultDao;
import com.pcloud.book.appeal.entity.BookAppealResult; import com.pcloud.book.appeal.entity.BookAppealResult;
import com.pcloud.book.consumer.user.ChannelConsr; import com.pcloud.book.consumer.user.ChannelConsr;
import com.pcloud.book.group.biz.BookGroupBiz;
import com.pcloud.common.utils.DateUtils; import com.pcloud.common.utils.DateUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
...@@ -102,6 +103,9 @@ public class BookAppealBizImpl implements BookAppealBiz { ...@@ -102,6 +103,9 @@ public class BookAppealBizImpl implements BookAppealBiz {
@Autowired @Autowired
private ChannelConsr channelConsr; private ChannelConsr channelConsr;
@Autowired
private BookGroupBiz bookGroupBiz;
private static final ExecutorService EXECUTOR_SERVICE = Executors.newFixedThreadPool(5); private static final ExecutorService EXECUTOR_SERVICE = Executors.newFixedThreadPool(5);
/** /**
* 书刊申诉 * 书刊申诉
...@@ -349,6 +353,8 @@ public class BookAppealBizImpl implements BookAppealBiz { ...@@ -349,6 +353,8 @@ public class BookAppealBizImpl implements BookAppealBiz {
bookcaseConsr.deleteBookForAdviser(bookId, channelId, adviserBook.getAdviserId()); bookcaseConsr.deleteBookForAdviser(bookId, channelId, adviserBook.getAdviserId());
//删除与二维码关联关系 //删除与二维码关联关系
qrcodeSceneConsr.deleteBook(bookId, adviserBook.getChannelId(), adviserBook.getAdviserId()); qrcodeSceneConsr.deleteBook(bookId, adviserBook.getChannelId(), adviserBook.getAdviserId());
// 删除社群码
bookGroupBiz.deleteByBookId(bookId, adviserBook.getChannelId(), adviserBook.getAdviserId());
} }
); );
}); });
......
pcloud-service-book/src/main/java/com/pcloud/book/book/biz/impl/BookAdviserBizImpl.java
...@@ -17,6 +17,7 @@ import com.pcloud.book.consumer.settlement.BookConsr; ...@@ -17,6 +17,7 @@ import com.pcloud.book.consumer.settlement.BookConsr;
import com.pcloud.book.consumer.user.AdviserConsr; import com.pcloud.book.consumer.user.AdviserConsr;
import com.pcloud.book.consumer.user.BookcaseConsr; import com.pcloud.book.consumer.user.BookcaseConsr;
import com.pcloud.book.consumer.user.ChannelConsr; import com.pcloud.book.consumer.user.ChannelConsr;
import com.pcloud.book.group.biz.BookGroupBiz;
import com.pcloud.common.core.aspect.ParamLog; import com.pcloud.common.core.aspect.ParamLog;
import com.pcloud.common.core.constant.SceneCode; import com.pcloud.common.core.constant.SceneCode;
import com.pcloud.common.core.constant.SendType; import com.pcloud.common.core.constant.SendType;
...@@ -85,6 +86,9 @@ public class BookAdviserBizImpl implements BookAdviserBiz { ...@@ -85,6 +86,9 @@ public class BookAdviserBizImpl implements BookAdviserBiz {
@Autowired @Autowired
private ChannelConsr channelConsr; private ChannelConsr channelConsr;
@Autowired
private BookGroupBiz bookGroupBiz;
private static final ExecutorService EXECUTOR_SERVICE = Executors.newFixedThreadPool(5); private static final ExecutorService EXECUTOR_SERVICE = Executors.newFixedThreadPool(5);
/** /**
...@@ -666,6 +670,11 @@ public class BookAdviserBizImpl implements BookAdviserBiz { ...@@ -666,6 +670,11 @@ public class BookAdviserBizImpl implements BookAdviserBiz {
paramMap.put("status", deleteStatus); paramMap.put("status", deleteStatus);
paramMap.put("templetId", templetId); paramMap.put("templetId", templetId);
bookAdviserDao.updateBook4Adviser(paramMap); bookAdviserDao.updateBook4Adviser(paramMap);
if (BookConstant.BOOK_ADVISER_DELETE.equals(deleteStatus)) {
bookGroupBiz.deleteByBookId(bookId, channelId, adviserId);
} else {
bookGroupBiz.recoverByBookId(bookId, channelId, adviserId);
}
LOGGER.info("修改书籍编辑的状态（删除或者恢复） <END>"); LOGGER.info("修改书籍编辑的状态（删除或者恢复） <END>");
} }
......
pcloud-service-book/src/main/java/com/pcloud/book/book/biz/impl/BookBizImpl.java
...@@ -3,6 +3,23 @@ ...@@ -3,6 +3,23 @@
*/ */
package com.pcloud.book.book.biz.impl; package com.pcloud.book.book.biz.impl;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.stream.Collectors;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import com.pcloud.analysisengine.qrcode.dto.BookTimeSourceDto; import com.pcloud.analysisengine.qrcode.dto.BookTimeSourceDto;
...@@ -21,7 +38,18 @@ import com.pcloud.book.book.biz.BookResourceBiz; ...@@ -21,7 +38,18 @@ import com.pcloud.book.book.biz.BookResourceBiz;
import com.pcloud.book.book.cache.BookCache; import com.pcloud.book.book.cache.BookCache;
import com.pcloud.book.book.constant.BookConstant; import com.pcloud.book.book.constant.BookConstant;
import com.pcloud.book.book.dao.BookDao; import com.pcloud.book.book.dao.BookDao;
import com.pcloud.book.book.dto.*; import com.pcloud.book.book.dto.BookAdviserDto;
import com.pcloud.book.book.dto.BookAdviserUpdateTimeDTO;
import com.pcloud.book.book.dto.BookAssocCount;
import com.pcloud.book.book.dto.BookCoverImgUpdateDTO;
import com.pcloud.book.book.dto.BookDetialDTO;
import com.pcloud.book.book.dto.BookDto;
import com.pcloud.book.book.dto.BookFreezeDto;
import com.pcloud.book.book.dto.BookFundDto;
import com.pcloud.book.book.dto.BookInfo4AnlysicsDTO;
import com.pcloud.book.book.dto.BookInfoAnalysicsDTO;
import com.pcloud.book.book.dto.BookInfoAndAuthStatusDTO;
import com.pcloud.book.book.dto.BookNameUpdateDTO;
import com.pcloud.book.book.entity.Book; import com.pcloud.book.book.entity.Book;
import com.pcloud.book.book.entity.BookAdviser; import com.pcloud.book.book.entity.BookAdviser;
import com.pcloud.book.book.set.BookSet; import com.pcloud.book.book.set.BookSet;
...@@ -37,6 +65,8 @@ import com.pcloud.book.consumer.user.ChannelConsr; ...@@ -37,6 +65,8 @@ import com.pcloud.book.consumer.user.ChannelConsr;
import com.pcloud.book.consumer.user.PartyConsr; import com.pcloud.book.consumer.user.PartyConsr;
import com.pcloud.book.copyright.biz.BookAuthInfoBiz; import com.pcloud.book.copyright.biz.BookAuthInfoBiz;
import com.pcloud.book.copyright.vo.BookAuthInfoVO; import com.pcloud.book.copyright.vo.BookAuthInfoVO;
import com.pcloud.book.group.biz.BookGroupBiz;
import com.pcloud.book.group.entity.BookGroup;
import com.pcloud.book.mq.producer.BookMQProducer; import com.pcloud.book.mq.producer.BookMQProducer;
import com.pcloud.common.core.aspect.ParamLog; import com.pcloud.common.core.aspect.ParamLog;
import com.pcloud.common.core.constant.AgentTypeEnum; import com.pcloud.common.core.constant.AgentTypeEnum;
...@@ -48,24 +78,6 @@ import com.pcloud.common.page.PageParam; ...@@ -48,24 +78,6 @@ import com.pcloud.common.page.PageParam;
import com.pcloud.common.utils.DateUtils; import com.pcloud.common.utils.DateUtils;
import com.pcloud.common.utils.ListUtils; import com.pcloud.common.utils.ListUtils;
import com.pcloud.common.utils.string.StringUtil; import com.pcloud.common.utils.string.StringUtil;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.stream.Collectors;
/** /**
* @描述：书籍业务层接口实现类 * @描述：书籍业务层接口实现类
...@@ -120,6 +132,8 @@ public class BookBizImpl implements BookBiz { ...@@ -120,6 +132,8 @@ public class BookBizImpl implements BookBiz {
private BookAuthInfoBiz bookAuthInfoBiz; private BookAuthInfoBiz bookAuthInfoBiz;
@Autowired @Autowired
private MainLineConsr mainLineConsr; private MainLineConsr mainLineConsr;
@Autowired
private BookGroupBiz bookGroupBiz;
/** /**
...@@ -191,7 +205,7 @@ public class BookBizImpl implements BookBiz { ...@@ -191,7 +205,7 @@ public class BookBizImpl implements BookBiz {
@ParamLog("校验是否修改图书名称并发送修改名称topic") @ParamLog("校验是否修改图书名称并发送修改名称topic")
private void checkIsUpdateBookNameAndSendTopic(BookDto oldBook, String newBookName) { private void checkIsUpdateBookNameAndSendTopic(BookDto oldBook, String newBookName) {
if (newBookName != null && !newBookName.equalsIgnoreCase(oldBook.getBookName())){ if (newBookName != null && !newBookName.equalsIgnoreCase(oldBook.getBookName())) {
BookNameUpdateDTO bookNameUpdateDTO = new BookNameUpdateDTO(); BookNameUpdateDTO bookNameUpdateDTO = new BookNameUpdateDTO();
bookNameUpdateDTO.setBookId(oldBook.getBookId()); bookNameUpdateDTO.setBookId(oldBook.getBookId());
bookNameUpdateDTO.setBookName(newBookName); bookNameUpdateDTO.setBookName(newBookName);
...@@ -200,8 +214,8 @@ public class BookBizImpl implements BookBiz { ...@@ -200,8 +214,8 @@ public class BookBizImpl implements BookBiz {
} }
@ParamLog("校验是否修改图书封面图并发送修改封面图topic") @ParamLog("校验是否修改图书封面图并发送修改封面图topic")
void checkIsUpdateCoverImgAndSendTopic(BookDto oldBook, String newCoverImg){ void checkIsUpdateCoverImgAndSendTopic(BookDto oldBook, String newCoverImg) {
if(newCoverImg != null && !newCoverImg.equalsIgnoreCase(oldBook.getCoverImg())){ if (newCoverImg != null && !newCoverImg.equalsIgnoreCase(oldBook.getCoverImg())) {
BookCoverImgUpdateDTO bookCoverImgUpdateDTO = new BookCoverImgUpdateDTO(); BookCoverImgUpdateDTO bookCoverImgUpdateDTO = new BookCoverImgUpdateDTO();
bookCoverImgUpdateDTO.setBookId(oldBook.getBookId()); bookCoverImgUpdateDTO.setBookId(oldBook.getBookId());
bookCoverImgUpdateDTO.setCoverImg(newCoverImg); bookCoverImgUpdateDTO.setCoverImg(newCoverImg);
...@@ -549,16 +563,16 @@ public class BookBizImpl implements BookBiz { ...@@ -549,16 +563,16 @@ public class BookBizImpl implements BookBiz {
@Override @Override
public Map<String, BookDto> listDetailByIds(BookDetialDTO bookDetialDTO) throws BizException { public Map<String, BookDto> listDetailByIds(BookDetialDTO bookDetialDTO) throws BizException {
Map<String, BookDto> bookMap = null; Map<String, BookDto> bookMap = null;
if(null != bookDetialDTO && !(null == bookDetialDTO || ListUtils.isEmpty(bookDetialDTO.getBookIds()) || ListUtils.isEmpty(bookDetialDTO.getChannelId()))){ if (null != bookDetialDTO && !(null == bookDetialDTO || ListUtils.isEmpty(bookDetialDTO.getBookIds()) || ListUtils.isEmpty(bookDetialDTO.getChannelId()))) {
Map<String, Object> paramMap = Maps.newHashMap(); Map<String, Object> paramMap = Maps.newHashMap();
paramMap.put("bookIds",bookDetialDTO.getBookIds()); paramMap.put("bookIds", bookDetialDTO.getBookIds());
paramMap.put("channelIds",bookDetialDTO.getChannelId()); paramMap.put("channelIds", bookDetialDTO.getChannelId());
paramMap.put("adviserId",bookDetialDTO.getAdviserId()); paramMap.put("adviserId", bookDetialDTO.getAdviserId());
List<BookDto> bookDtos = bookDao.listDetailByIds(paramMap); List<BookDto> bookDtos = bookDao.listDetailByIds(paramMap);
if(!ListUtils.isEmpty(bookDtos)){ if (!ListUtils.isEmpty(bookDtos)) {
bookMap = Maps.newHashMap(); bookMap = Maps.newHashMap();
for(BookDto bookDto:bookDtos){ for (BookDto bookDto : bookDtos) {
bookMap.put(bookDto.getChannelId()+"_"+bookDto.getBookId(),bookDto); bookMap.put(bookDto.getChannelId() + "_" + bookDto.getBookId(), bookDto);
} }
} }
} }
...@@ -594,7 +608,7 @@ public class BookBizImpl implements BookBiz { ...@@ -594,7 +608,7 @@ public class BookBizImpl implements BookBiz {
String transferor = bf == null ? null : bf.getTransferor(); String transferor = bf == null ? null : bf.getTransferor();
if (!ListUtils.isEmpty(bookFunds)) { if (!ListUtils.isEmpty(bookFunds)) {
for (BookFundDto bookFundDto : bookFunds) { for (BookFundDto bookFundDto : bookFunds) {
if(StringUtil.isEmpty(transferor)){ if (StringUtil.isEmpty(transferor)) {
transferor = bookFundDto.getTransferor(); transferor = bookFundDto.getTransferor();
} }
Date startTime = bookFundDto.getStartTime(); Date startTime = bookFundDto.getStartTime();
...@@ -643,7 +657,6 @@ public class BookBizImpl implements BookBiz { ...@@ -643,7 +657,6 @@ public class BookBizImpl implements BookBiz {
/** /**
* 获取书籍总数信息 * 获取书籍总数信息
*
* @return * @return
*/ */
public int getAllBookCount() { public int getAllBookCount() {
...@@ -668,10 +681,10 @@ public class BookBizImpl implements BookBiz { ...@@ -668,10 +681,10 @@ public class BookBizImpl implements BookBiz {
public PageBean getListPage4Adviser(Map<String, Object> paramMap, PageParam pageParam, Long adviserId) throws BizException { public PageBean getListPage4Adviser(Map<String, Object> paramMap, PageParam pageParam, Long adviserId) throws BizException {
LOGGER.info("【书籍应用】获取书籍列表,<START>.[paramMap]=" + paramMap.toString()); LOGGER.info("【书籍应用】获取书籍列表,<START>.[paramMap]=" + paramMap.toString());
Long templeId = (Long) paramMap.get("templetId"); Long templeId = (Long) paramMap.get("templetId");
if(null != templeId){ if (null != templeId) {
List<Long> ids = assistTempletConsr.getChildIdListByParentId(templeId); List<Long> ids = assistTempletConsr.getChildIdListByParentId(templeId);
if(!ListUtils.isEmpty(ids)){ if (!ListUtils.isEmpty(ids)) {
paramMap.put("templeIds",ids); paramMap.put("templeIds", ids);
} }
} }
PageBean pageBean = bookDao.listPage(pageParam, paramMap, "getListPage4Adviser"); PageBean pageBean = bookDao.listPage(pageParam, paramMap, "getListPage4Adviser");
...@@ -686,7 +699,7 @@ public class BookBizImpl implements BookBiz { ...@@ -686,7 +699,7 @@ public class BookBizImpl implements BookBiz {
// 设置是否被冻结 // 设置是否被冻结
bookSet.setFreezeStatus(pageBean.getRecordList()); bookSet.setFreezeStatus(pageBean.getRecordList());
// 设置图书是否关联二维码 // 设置图书是否关联二维码
bookSet.setIsRelationQrcodeAndCount(pageBean.getRecordList(),adviserId); bookSet.setIsRelationQrcodeAndCount(pageBean.getRecordList(), adviserId);
//设置图书收益 //设置图书收益
bookSet.setBookIncome(pageBean.getRecordList()); bookSet.setBookIncome(pageBean.getRecordList());
// 设置二维码相关信息 // 设置二维码相关信息
...@@ -698,12 +711,12 @@ public class BookBizImpl implements BookBiz { ...@@ -698,12 +711,12 @@ public class BookBizImpl implements BookBiz {
@ParamLog(description = "首页展示正在做的图书") @ParamLog(description = "首页展示正在做的图书")
@Override @Override
public List<BookDto> getList4Adviser(Long adviserId, Integer num) throws BizException { public List<BookDto> getList4Adviser(Long adviserId, Integer num) throws BizException {
Map<String,Object> paramMap = Maps.newHashMap(); Map<String, Object> paramMap = Maps.newHashMap();
paramMap.put("adviserId",adviserId); paramMap.put("adviserId", adviserId);
paramMap.put("num",num); paramMap.put("num", num);
paramMap.put("isbns",BookConstant.DEFAULT_BOOK_ISBN); paramMap.put("isbns", BookConstant.DEFAULT_BOOK_ISBN);
List<BookDto> bookDtos = bookDao.getList4Adviser(paramMap); List<BookDto> bookDtos = bookDao.getList4Adviser(paramMap);
if(!ListUtils.isEmpty(bookDtos)){ if (!ListUtils.isEmpty(bookDtos)) {
// 填充渠道基础信息 // 填充渠道基础信息
bookSet.setChannelInfoList(Lists.newArrayList(bookDtos)); bookSet.setChannelInfoList(Lists.newArrayList(bookDtos));
bookSet.setBookSvUvPv4Object(Lists.newArrayList(bookDtos)); bookSet.setBookSvUvPv4Object(Lists.newArrayList(bookDtos));
...@@ -712,7 +725,7 @@ public class BookBizImpl implements BookBiz { ...@@ -712,7 +725,7 @@ public class BookBizImpl implements BookBiz {
// 设置是否被冻结 // 设置是否被冻结
bookSet.setFreezeStatus(Lists.newArrayList(bookDtos)); bookSet.setFreezeStatus(Lists.newArrayList(bookDtos));
// 设置图书是否关联二维码 // 设置图书是否关联二维码
bookSet.setIsRelationQrcodeAndCount(Lists.newArrayList(bookDtos),adviserId); bookSet.setIsRelationQrcodeAndCount(Lists.newArrayList(bookDtos), adviserId);
//设置图书收益 //设置图书收益
bookSet.setBookIncome(Lists.newArrayList(bookDtos)); bookSet.setBookIncome(Lists.newArrayList(bookDtos));
// 设置二维码相关信息 // 设置二维码相关信息
...@@ -803,7 +816,7 @@ public class BookBizImpl implements BookBiz { ...@@ -803,7 +816,7 @@ public class BookBizImpl implements BookBiz {
*/ */
@Override @Override
public List<Long> getIdsByName(String bookName, Long adviserId) throws BizException { public List<Long> getIdsByName(String bookName, Long adviserId) throws BizException {
LOGGER.info("【书籍顾问】根据名称获取ID,<START>.[bookName|adviserId]=" + bookName+"|"+adviserId); LOGGER.info("【书籍顾问】根据名称获取ID,<START>.[bookName|adviserId]=" + bookName + "|" + adviserId);
if (StringUtil.isEmpty(bookName)) { if (StringUtil.isEmpty(bookName)) {
throw new BookBizException(BookBizException.PARAM_IS_NULL, "请输入书籍名称"); throw new BookBizException(BookBizException.PARAM_IS_NULL, "请输入书籍名称");
} }
...@@ -1054,10 +1067,10 @@ public class BookBizImpl implements BookBiz { ...@@ -1054,10 +1067,10 @@ public class BookBizImpl implements BookBiz {
} }
//图书类型查询 //图书类型查询
Long templeId = (Long) paramMap.get("templetId"); Long templeId = (Long) paramMap.get("templetId");
if(null != templeId){ if (null != templeId) {
List<Long> ids = assistTempletConsr.getChildIdListByParentId(templeId); List<Long> ids = assistTempletConsr.getChildIdListByParentId(templeId);
if(!ListUtils.isEmpty(ids)){ if (!ListUtils.isEmpty(ids)) {
paramMap.put("templeIds",ids); paramMap.put("templeIds", ids);
} }
} }
PageBean pageBean = bookDao.listPage(pageParam, paramMap, "listPage4Agent"); PageBean pageBean = bookDao.listPage(pageParam, paramMap, "listPage4Agent");
...@@ -1074,7 +1087,7 @@ public class BookBizImpl implements BookBiz { ...@@ -1074,7 +1087,7 @@ public class BookBizImpl implements BookBiz {
bookSet.setFreezeStatus(pageBean.getRecordList()); bookSet.setFreezeStatus(pageBean.getRecordList());
// 设置模板名称(图书类型) // 设置模板名称(图书类型)
bookSet.setTemplateName(pageBean.getRecordList()); bookSet.setTemplateName(pageBean.getRecordList());
if(agentId.equals(getAgentIdByType())){ if (agentId.equals(getAgentIdByType())) {
// 设置待审核二维码个数 // 设置待审核二维码个数
bookSet.setAuditWaitNum(pageBean.getRecordList()); bookSet.setAuditWaitNum(pageBean.getRecordList());
} }
...@@ -1213,10 +1226,10 @@ public class BookBizImpl implements BookBiz { ...@@ -1213,10 +1226,10 @@ public class BookBizImpl implements BookBiz {
public PageBean listBookClassify(PageParam pageParam, Map<String, Object> paramMap) { public PageBean listBookClassify(PageParam pageParam, Map<String, Object> paramMap) {
LOGGER.info("图书列表（平台端）<START>,paramMap=" + paramMap); LOGGER.info("图书列表（平台端）<START>,paramMap=" + paramMap);
Long templeId = (Long) paramMap.get("templetId"); Long templeId = (Long) paramMap.get("templetId");
if(null != templeId){ if (null != templeId) {
List<Long> ids = assistTempletConsr.getChildIdListByParentId(templeId); List<Long> ids = assistTempletConsr.getChildIdListByParentId(templeId);
if(!ListUtils.isEmpty(ids)){ if (!ListUtils.isEmpty(ids)) {
paramMap.put("templeIds",ids); paramMap.put("templeIds", ids);
} }
} }
PageBean pageBean = bookDao.listPage(pageParam, paramMap, "listBookClassify", "listBookClassifyCount"); PageBean pageBean = bookDao.listPage(pageParam, paramMap, "listBookClassify", "listBookClassifyCount");
...@@ -1320,7 +1333,6 @@ public class BookBizImpl implements BookBiz { ...@@ -1320,7 +1333,6 @@ public class BookBizImpl implements BookBiz {
} }
/** /**
* 获取图书基本信息（编辑 - 运营 - 图书） * 获取图书基本信息（编辑 - 运营 - 图书）
*/ */
...@@ -1380,6 +1392,11 @@ public class BookBizImpl implements BookBiz { ...@@ -1380,6 +1392,11 @@ public class BookBizImpl implements BookBiz {
} }
// 新增图书与编辑关联关系 // 新增图书与编辑关联关系
createBookAdviserRelation(book); createBookAdviserRelation(book);
if (null != book.getIsBookGroup() && book.getIsBookGroup()) {
BookGroup bookGroup = bookGroupBiz.createBookGroupAfterCreateBook(book.getBookId(), book.getChannelId(), book.getCreatedUser());
bookDto.setBookGroupId(bookGroup.getId());
bookDto.setGroupQrcodeUrl(bookGroup.getGroupQrcodeUrl());
}
// 图书不存在，新增图书，图书数量加1 // 图书不存在，新增图书，图书数量加1
if (bookDto == null) { if (bookDto == null) {
// 书籍总数缓存加1 // 书籍总数缓存加1
...@@ -1419,13 +1436,12 @@ public class BookBizImpl implements BookBiz { ...@@ -1419,13 +1436,12 @@ public class BookBizImpl implements BookBiz {
// 清除redis中数据 // 清除redis中数据
bookCache.clearRedisByBook(book.getBookId(), book.getIsbn(), book.getSerialNumber()); bookCache.clearRedisByBook(book.getBookId(), book.getIsbn(), book.getSerialNumber());
//修改图书类型 //修改图书类型
bookAdviserBiz.updateBookTemplet(book.getBookId(),book.getChannelId(),book.getLastModifiedUser(),book.getTempletId()); bookAdviserBiz.updateBookTemplet(book.getBookId(), book.getChannelId(), book.getLastModifiedUser(), book.getTempletId());
LOGGER.info("修改图书基本信息与类型[END]"); LOGGER.info("修改图书基本信息与类型[END]");
} }
/** /**
* 新增图书与编辑关联关系 * 新增图书与编辑关联关系
*
* @param book * @param book
*/ */
void createBookAdviserRelation(Book book) { void createBookAdviserRelation(Book book) {
...@@ -1443,7 +1459,8 @@ public class BookBizImpl implements BookBiz { ...@@ -1443,7 +1459,8 @@ public class BookBizImpl implements BookBiz {
bookSet.checkISBNEx(BookTypeEnum.BOOK.value, isbn); bookSet.checkISBNEx(BookTypeEnum.BOOK.value, isbn);
return true; return true;
} }
Long getAgentIdByType(){
Long getAgentIdByType() {
Long checkAgentId = agentConsr.getAgentIdByType(AgentTypeEnum.AGENT_TYPE_WYS.getCode()); Long checkAgentId = agentConsr.getAgentIdByType(AgentTypeEnum.AGENT_TYPE_WYS.getCode());
return checkAgentId; return checkAgentId;
} }
...@@ -1453,15 +1470,15 @@ public class BookBizImpl implements BookBiz { ...@@ -1453,15 +1470,15 @@ public class BookBizImpl implements BookBiz {
*/ */
@ParamLog(description = "根据渠道ID分页获取图书列表") @ParamLog(description = "根据渠道ID分页获取图书列表")
@Override @Override
public PageBean getBookBaseInfoListByChannelId4Adviser(Long partyId,Long channelId, PageParam pageParam) throws BizException { public PageBean getBookBaseInfoListByChannelId4Adviser(Long partyId, Long channelId, PageParam pageParam) throws BizException {
Map<String,Object> paramMap = Maps.newHashMap(); Map<String, Object> paramMap = Maps.newHashMap();
paramMap.put("adviserId",partyId); paramMap.put("adviserId", partyId);
paramMap.put("channelId",channelId); paramMap.put("channelId", channelId);
/*paramMap.put("typeCode",BookTypeEnum.BOOK.value);*/ /*paramMap.put("typeCode",BookTypeEnum.BOOK.value);*/
PageBean pageBean = bookDao.listPage(pageParam, paramMap, "getListPage4Adviser"); PageBean pageBean = bookDao.listPage(pageParam, paramMap, "getListPage4Adviser");
if (null == pageBean || ListUtils.isEmpty(pageBean.getRecordList())) { if (null == pageBean || ListUtils.isEmpty(pageBean.getRecordList())) {
return new PageBean(0, 0, Lists.newArrayList()); return new PageBean(0, 0, Lists.newArrayList());
}else{ } else {
// 设置模板名字 // 设置模板名字
bookSet.setTemplateName(pageBean.getRecordList()); bookSet.setTemplateName(pageBean.getRecordList());
} }
...@@ -1472,11 +1489,11 @@ public class BookBizImpl implements BookBiz { ...@@ -1472,11 +1489,11 @@ public class BookBizImpl implements BookBiz {
@ParamLog(description = "根据ID修改时间") @ParamLog(description = "根据ID修改时间")
@Override @Override
public void updateTimeById(Long bookId) throws BizException { public void updateTimeById(Long bookId) throws BizException {
if(null == bookId){ if (null == bookId) {
return; return;
} }
Map<String,Object> paramMap = Maps.newHashMap(); Map<String, Object> paramMap = Maps.newHashMap();
paramMap.put("bookId",bookId); paramMap.put("bookId", bookId);
bookDao.updateTimeById(paramMap); bookDao.updateTimeById(paramMap);
} }
...@@ -1484,16 +1501,16 @@ public class BookBizImpl implements BookBiz { ...@@ -1484,16 +1501,16 @@ public class BookBizImpl implements BookBiz {
@ParamLog(description = "批量根据ID修改时间") @ParamLog(description = "批量根据ID修改时间")
@Override @Override
public void updateTimeByIds(BookAdviserUpdateTimeDTO bookAdviserUpdateTimeDTO) throws BizException { public void updateTimeByIds(BookAdviserUpdateTimeDTO bookAdviserUpdateTimeDTO) throws BizException {
if(ListUtils.isEmpty(bookAdviserUpdateTimeDTO.getBookIds()) && null == bookAdviserUpdateTimeDTO.getBookId() ){ if (ListUtils.isEmpty(bookAdviserUpdateTimeDTO.getBookIds()) && null == bookAdviserUpdateTimeDTO.getBookId()) {
return; return;
} }
Map<String,Object> paramMap = Maps.newHashMap(); Map<String, Object> paramMap = Maps.newHashMap();
paramMap.put("adviserId",bookAdviserUpdateTimeDTO.getAdviserId()); paramMap.put("adviserId", bookAdviserUpdateTimeDTO.getAdviserId());
paramMap.put("channelId",bookAdviserUpdateTimeDTO.getChannelId()); paramMap.put("channelId", bookAdviserUpdateTimeDTO.getChannelId());
if(null != bookAdviserUpdateTimeDTO.getBookId()){ if (null != bookAdviserUpdateTimeDTO.getBookId()) {
paramMap.put("bookId",bookAdviserUpdateTimeDTO.getBookId()); paramMap.put("bookId", bookAdviserUpdateTimeDTO.getBookId());
}else{ } else {
paramMap.put("bookIds",bookAdviserUpdateTimeDTO.getBookIds()); paramMap.put("bookIds", bookAdviserUpdateTimeDTO.getBookIds());
} }
bookDao.updateTimeByIds(paramMap); bookDao.updateTimeByIds(paramMap);
} }
...@@ -1503,34 +1520,34 @@ public class BookBizImpl implements BookBiz { ...@@ -1503,34 +1520,34 @@ public class BookBizImpl implements BookBiz {
public Map<String, BookInfoAnalysicsDTO> getBookInfoBy(List<BookInfoAnalysicsDTO> bookInfoAnalysicsDTOS, String public Map<String, BookInfoAnalysicsDTO> getBookInfoBy(List<BookInfoAnalysicsDTO> bookInfoAnalysicsDTOS, String
monthDate) throws BizException { monthDate) throws BizException {
Map<String, BookInfoAnalysicsDTO> bookInfoAnalysicsDTOMap = null; Map<String, BookInfoAnalysicsDTO> bookInfoAnalysicsDTOMap = null;
if(!ListUtils.isEmpty(bookInfoAnalysicsDTOS)){ if (!ListUtils.isEmpty(bookInfoAnalysicsDTOS)) {
List<Long> bookIds = Lists.newArrayList(); List<Long> bookIds = Lists.newArrayList();
List<Long> adviserIds = Lists.newArrayList(); List<Long> adviserIds = Lists.newArrayList();
List<Long> channelIds = Lists.newArrayList(); List<Long> channelIds = Lists.newArrayList();
for(BookInfoAnalysicsDTO bookInfoAnalysicsDTO:bookInfoAnalysicsDTOS){ for (BookInfoAnalysicsDTO bookInfoAnalysicsDTO : bookInfoAnalysicsDTOS) {
bookIds.add(bookInfoAnalysicsDTO.getBookId()); bookIds.add(bookInfoAnalysicsDTO.getBookId());
adviserIds.add(bookInfoAnalysicsDTO.getAdviserId()); adviserIds.add(bookInfoAnalysicsDTO.getAdviserId());
channelIds.add(bookInfoAnalysicsDTO.getChannelId()); channelIds.add(bookInfoAnalysicsDTO.getChannelId());
} }
Map<String,Object> paramMap = Maps.newHashMap(); Map<String, Object> paramMap = Maps.newHashMap();
if(!ListUtils.isEmpty(bookIds)){ if (!ListUtils.isEmpty(bookIds)) {
paramMap.put("bookIds",bookIds); paramMap.put("bookIds", bookIds);
} }
if(!ListUtils.isEmpty(adviserIds)){ if (!ListUtils.isEmpty(adviserIds)) {
paramMap.put("adviserIds",adviserIds); paramMap.put("adviserIds", adviserIds);
} }
if(!ListUtils.isEmpty(channelIds)){ if (!ListUtils.isEmpty(channelIds)) {
paramMap.put("channelIds",channelIds); paramMap.put("channelIds", channelIds);
} }
if(!StringUtil.isEmpty(monthDate)){ if (!StringUtil.isEmpty(monthDate)) {
paramMap.put("statisTime",monthDate); paramMap.put("statisTime", monthDate);
} }
List<BookInfoAnalysicsDTO> bookInfoAnalysicsDTOList = bookDao.getBookInfoBy(paramMap); List<BookInfoAnalysicsDTO> bookInfoAnalysicsDTOList = bookDao.getBookInfoBy(paramMap);
if(!ListUtils.isEmpty(bookInfoAnalysicsDTOList)){ if (!ListUtils.isEmpty(bookInfoAnalysicsDTOList)) {
bookInfoAnalysicsDTOMap = Maps.newHashMap(); bookInfoAnalysicsDTOMap = Maps.newHashMap();
for(BookInfoAnalysicsDTO bookInfoAnalysicsDTO:bookInfoAnalysicsDTOList){ for (BookInfoAnalysicsDTO bookInfoAnalysicsDTO : bookInfoAnalysicsDTOList) {
String key = bookInfoAnalysicsDTO.getBookId()+"_"+bookInfoAnalysicsDTO.getChannelId()+"_"+bookInfoAnalysicsDTO.getAdviserId(); String key = bookInfoAnalysicsDTO.getBookId() + "_" + bookInfoAnalysicsDTO.getChannelId() + "_" + bookInfoAnalysicsDTO.getAdviserId();
bookInfoAnalysicsDTOMap.put(key,bookInfoAnalysicsDTO); bookInfoAnalysicsDTOMap.put(key, bookInfoAnalysicsDTO);
} }
} }
} }
...@@ -1548,29 +1565,29 @@ public class BookBizImpl implements BookBiz { ...@@ -1548,29 +1565,29 @@ public class BookBizImpl implements BookBiz {
@ParamLog(description = "获取书刊信息--分析引擎内部接口") @ParamLog(description = "获取书刊信息--分析引擎内部接口")
@Override @Override
public Map<Long, BookInfo4AnlysicsDTO> getBookAnalysis(List<Long> bookIds, String monthDate) throws BizException { public Map<Long, BookInfo4AnlysicsDTO> getBookAnalysis(List<Long> bookIds, String monthDate) throws BizException {
if(ListUtils.isEmpty(bookIds)){ if (ListUtils.isEmpty(bookIds)) {
return null; return null;
} }
Map<String,Object> paramMap = Maps.newHashMap(); Map<String, Object> paramMap = Maps.newHashMap();
paramMap.put("bookIds",bookIds); paramMap.put("bookIds", bookIds);
if(!StringUtil.isEmpty(monthDate)){ if (!StringUtil.isEmpty(monthDate)) {
paramMap.put("monthDate",monthDate); paramMap.put("monthDate", monthDate);
} }
Map<Long,BookInfo4AnlysicsDTO> resultMap = null; Map<Long, BookInfo4AnlysicsDTO> resultMap = null;
List<BookInfo4AnlysicsDTO> bookList = bookDao.getBookAnalysis(paramMap); List<BookInfo4AnlysicsDTO> bookList = bookDao.getBookAnalysis(paramMap);
if(!ListUtils.isEmpty(bookList)){ if (!ListUtils.isEmpty(bookList)) {
resultMap = bookList.stream().collect(Collectors.toMap(BookInfo4AnlysicsDTO::getBookId,bookInfo4AnlysicsDTO -> bookInfo4AnlysicsDTO)); resultMap = bookList.stream().collect(Collectors.toMap(BookInfo4AnlysicsDTO::getBookId, bookInfo4AnlysicsDTO -> bookInfo4AnlysicsDTO));
} }
return resultMap; return resultMap;
} }
@Override @Override
public PageBean getListPage4PC(PageParam pageParam, String name) throws BizException { public PageBean getListPage4PC(PageParam pageParam, String name) throws BizException {
Map<String,Object> paramMap = Maps.newHashMap(); Map<String, Object> paramMap = Maps.newHashMap();
if(!StringUtil.isEmpty(name)){ if (!StringUtil.isEmpty(name)) {
paramMap.put("name",name); paramMap.put("name", name);
} }
return bookDao.listPage(pageParam,paramMap,"getBookBaseInfo"); return bookDao.listPage(pageParam, paramMap, "getBookBaseInfo");
} }
@Override @Override
...@@ -1584,10 +1601,10 @@ public class BookBizImpl implements BookBiz { ...@@ -1584,10 +1601,10 @@ public class BookBizImpl implements BookBiz {
paramMap.put("name", listNoAuthBookParam.getName() != null && "".equals(listNoAuthBookParam.getName().trim()) ? null : listNoAuthBookParam.getName()); paramMap.put("name", listNoAuthBookParam.getName() != null && "".equals(listNoAuthBookParam.getName().trim()) ? null : listNoAuthBookParam.getName());
paramMap.put("typeCode", listNoAuthBookParam.getTypeCode() != null && "".equals(listNoAuthBookParam.getTypeCode().trim()) ? null : listNoAuthBookParam.getTypeCode()); paramMap.put("typeCode", listNoAuthBookParam.getTypeCode() != null && "".equals(listNoAuthBookParam.getTypeCode().trim()) ? null : listNoAuthBookParam.getTypeCode());
paramMap.put("templetId", listNoAuthBookParam.getTempletId()); paramMap.put("templetId", listNoAuthBookParam.getTempletId());
if(null != listNoAuthBookParam.getTempletId()){ if (null != listNoAuthBookParam.getTempletId()) {
List<Long> ids = assistTempletConsr.getChildIdListByParentId(listNoAuthBookParam.getTempletId()); List<Long> ids = assistTempletConsr.getChildIdListByParentId(listNoAuthBookParam.getTempletId());
if(!ListUtils.isEmpty(ids)){ if (!ListUtils.isEmpty(ids)) {
paramMap.put("templeIds",ids); paramMap.put("templeIds", ids);
} }
} }
PageParam pageParam = new PageParam(listNoAuthBookParam.getCurrentPage(), listNoAuthBookParam.getNumPerPage()); PageParam pageParam = new PageParam(listNoAuthBookParam.getCurrentPage(), listNoAuthBookParam.getNumPerPage());
...@@ -1606,14 +1623,15 @@ public class BookBizImpl implements BookBiz { ...@@ -1606,14 +1623,15 @@ public class BookBizImpl implements BookBiz {
@ParamLog("获取图书基本信息与授权状态") @ParamLog("获取图书基本信息与授权状态")
public BookInfoAndAuthStatusDTO getBaseAndAuthStatus(Long bookId, Long channelId, Long adviserId) { public BookInfoAndAuthStatusDTO getBaseAndAuthStatus(Long bookId, Long channelId, Long adviserId) {
BookDto book = getBaseById(bookId); BookDto book = getBaseById(bookId);
if(book == null )return null; if (book == null)
return null;
//获取编辑是否删除这本书 //获取编辑是否删除这本书
BookAdviserDto bookAdviser = bookAdviserBiz.getBase(bookId, channelId, adviserId); BookAdviserDto bookAdviser = bookAdviserBiz.getBase(bookId, channelId, adviserId);
BookInfoAndAuthStatusDTO bookInfoAndAuthStatusDTO = new BookInfoAndAuthStatusDTO(); BookInfoAndAuthStatusDTO bookInfoAndAuthStatusDTO = new BookInfoAndAuthStatusDTO();
BeanUtils.copyProperties(book, bookInfoAndAuthStatusDTO); BeanUtils.copyProperties(book, bookInfoAndAuthStatusDTO);
//获取授权状态 //获取授权状态
BookAuthInfoVO infoByBook = bookAuthInfoBiz.getInfoByBook(bookId, channelId, adviserId); BookAuthInfoVO infoByBook = bookAuthInfoBiz.getInfoByBook(bookId, channelId, adviserId);
if(infoByBook != null){ if (infoByBook != null) {
BeanUtils.copyProperties(infoByBook, bookInfoAndAuthStatusDTO); BeanUtils.copyProperties(infoByBook, bookInfoAndAuthStatusDTO);
} }
bookInfoAndAuthStatusDTO.setIsDelete(bookAdviser == null ? BookStatusEnum.BookDeleteStatus.DELETE.value : bookAdviser.getIsDelete()); bookInfoAndAuthStatusDTO.setIsDelete(bookAdviser == null ? BookStatusEnum.BookDeleteStatus.DELETE.value : bookAdviser.getIsDelete());
......
pcloud-service-book/src/main/java/com/pcloud/book/consumer/resource/ProductConsr.java
...@@ -3,23 +3,25 @@ ...@@ -3,23 +3,25 @@
*/ */
package com.pcloud.book.consumer.resource; package com.pcloud.book.consumer.resource;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import com.pcloud.book.base.exception.BookBizException; import com.pcloud.book.base.exception.BookBizException;
import com.pcloud.common.exceptions.BizException; import com.pcloud.common.exceptions.BizException;
import com.pcloud.common.utils.ListUtils; import com.pcloud.common.utils.ListUtils;
import com.pcloud.common.utils.ResponseHandleUtil; import com.pcloud.common.utils.ResponseHandleUtil;
import com.pcloud.resourcecenter.product.dto.Product4BookDTO; import com.pcloud.resourcecenter.product.dto.Product4BookDTO;
import com.pcloud.resourcecenter.product.dto.ProductDto; import com.pcloud.resourcecenter.product.dto.ProductDto;
import com.pcloud.resourcecenter.product.dto.UpdateAppProductParamDTO;
import com.pcloud.resourcecenter.product.entity.Product;
import com.pcloud.resourcecenter.product.service.ProductService; import com.pcloud.resourcecenter.product.service.ProductService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/** /**
* @描述：商品中间件 * @描述：商品中间件
* @作者：songx * @作者：songx
...@@ -129,4 +131,16 @@ public class ProductConsr { ...@@ -129,4 +131,16 @@ public class ProductConsr {
return productDtoMap; return productDtoMap;
} }
public Product postUpdateBookGroupProduct(UpdateAppProductParamDTO updateAppProductParamDTO) {
try {
Product product = ResponseHandleUtil.parseResponse(productService.postUpdateBookGroupProduct(updateAppProductParamDTO), Product.class);
return product;
} catch (BizException e) {
throw new BizException(e.getCode(), e.getMessage());
} catch (Exception e) {
throw new BookBizException(BookBizException.INVOKE_RES_ERROR, "设置商品失败！");
}
}
} }
pcloud-service-book/src/main/java/com/pcloud/book/group/biz/BookGroupBiz.java
...@@ -4,6 +4,8 @@ import java.util.Map; ...@@ -4,6 +4,8 @@ import java.util.Map;
import com.pcloud.book.group.dto.BookGroupDTO; import com.pcloud.book.group.dto.BookGroupDTO;
import com.pcloud.book.group.entity.BookGroup; import com.pcloud.book.group.entity.BookGroup;
import com.pcloud.common.exceptions.BizException; import com.pcloud.common.exceptions.BizException;
import com.pcloud.common.page.PageBean;
import com.pcloud.common.page.PageParam;
/** /**
* Description 社群书群二维码业务逻辑层接口 * Description 社群书群二维码业务逻辑层接口
...@@ -70,4 +72,38 @@ public interface BookGroupBiz { ...@@ -70,4 +72,38 @@ public interface BookGroupBiz {
* @throws BizException * @throws BizException
*/ */
Map<String, Object> getBookNameByBookGroupId(Long bookGroupId) throws BizException; Map<String, Object> getBookNameByBookGroupId(Long bookGroupId) throws BizException;
/**
* 获取社群书列表(编辑)
* @param paramMap 参数Map
* @param pageParam 分页参数
* @param adviserId 编辑ID
* @return
* @throws BizException
*/
PageBean listBookGroup4Adviser(Map<String, Object> paramMap, PageParam pageParam, Long adviserId) throws BizException;
/**
* 获取未创建社群码的书刊列表
* @param paramMap 参数Map
* @param pageParam 分页参数
* @param adviserId 编辑ID
* @return
* @throws BizException
*/
PageBean listBook4CreateBookGroup(Map<String, Object> paramMap, PageParam pageParam, Long adviserId) throws BizException;
/**
* @Author:lili
* @Desr:获取排序方式
* @Date:2019/4/19 14:57
*/
Integer getRankType(Long bookGroupId) throws BizException;
/**
* @Author:lili
* @Desr:更新排序方式
* @Date:2019/4/19 14:58
*/
void updateRankType(Long bookGroupId, Integer rankType) throws BizException;
} }
pcloud-service-book/src/main/java/com/pcloud/book/group/biz/impl/BookGroupBizImpl.java
package com.pcloud.book.group.biz.impl; package com.pcloud.book.group.biz.impl;
import java.math.BigDecimal;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
...@@ -11,7 +12,9 @@ import org.springframework.stereotype.Component; ...@@ -11,7 +12,9 @@ import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import com.pcloud.book.base.exception.BookBizException; import com.pcloud.book.base.exception.BookBizException;
import com.pcloud.book.book.biz.BookBiz; import com.pcloud.book.book.biz.BookBiz;
import com.pcloud.book.book.dao.BookDao;
import com.pcloud.book.book.dto.BookDto; import com.pcloud.book.book.dto.BookDto;
import com.pcloud.book.book.set.BookSet;
import com.pcloud.book.consumer.user.AdviserConsr; import com.pcloud.book.consumer.user.AdviserConsr;
import com.pcloud.book.group.biz.BookGroupBiz; import com.pcloud.book.group.biz.BookGroupBiz;
import com.pcloud.book.group.dao.BookGroupDao; import com.pcloud.book.group.dao.BookGroupDao;
...@@ -20,6 +23,8 @@ import com.pcloud.book.group.entity.BookGroup; ...@@ -20,6 +23,8 @@ import com.pcloud.book.group.entity.BookGroup;
import com.pcloud.common.core.aspect.ParamLog; import com.pcloud.common.core.aspect.ParamLog;
import com.pcloud.common.core.constant.ProductTypeConstant; import com.pcloud.common.core.constant.ProductTypeConstant;
import com.pcloud.common.exceptions.BizException; import com.pcloud.common.exceptions.BizException;
import com.pcloud.common.page.PageBean;
import com.pcloud.common.page.PageParam;
import com.pcloud.common.utils.ListUtils; import com.pcloud.common.utils.ListUtils;
import com.pcloud.common.utils.QrcodeUtils; import com.pcloud.common.utils.QrcodeUtils;
import com.pcloud.common.utils.ResponseHandleUtil; import com.pcloud.common.utils.ResponseHandleUtil;
...@@ -52,6 +57,10 @@ public class BookGroupBizImpl implements BookGroupBiz { ...@@ -52,6 +57,10 @@ public class BookGroupBizImpl implements BookGroupBiz {
private AdviserConsr adviserConsr; private AdviserConsr adviserConsr;
@Autowired @Autowired
private BookBiz bookBiz; private BookBiz bookBiz;
@Autowired
private BookSet bookSet;
@Autowired
private BookDao bookDao;
/** /**
* 创建社群书时生成群二维码 * 创建社群书时生成群二维码
...@@ -93,7 +102,7 @@ public class BookGroupBizImpl implements BookGroupBiz { ...@@ -93,7 +102,7 @@ public class BookGroupBizImpl implements BookGroupBiz {
if (null != bookGroupDTO.getPurLabelId()) { if (null != bookGroupDTO.getPurLabelId()) {
labelIds.add(bookGroupDTO.getPurLabelId()); labelIds.add(bookGroupDTO.getPurLabelId());
} }
if (ListUtils.isEmpty(labelIds)) { if (!ListUtils.isEmpty(labelIds)) {
Map<Long, String> labelMap = ResponseHandleUtil.parseMap(labelService.getLabelName(labelIds), Long.class, String.class); Map<Long, String> labelMap = ResponseHandleUtil.parseMap(labelService.getLabelName(labelIds), Long.class, String.class);
if (!MapUtils.isEmpty(labelMap)) { if (!MapUtils.isEmpty(labelMap)) {
if (null != bookGroupDTO.getProLabelId() && labelMap.containsKey(bookGroupDTO.getProLabelId())) { if (null != bookGroupDTO.getProLabelId() && labelMap.containsKey(bookGroupDTO.getProLabelId())) {
...@@ -168,7 +177,7 @@ public class BookGroupBizImpl implements BookGroupBiz { ...@@ -168,7 +177,7 @@ public class BookGroupBizImpl implements BookGroupBiz {
if (null == group) { if (null == group) {
throw new BookBizException(BookBizException.PARAM_IS_NULL, "群二维码不存在！"); throw new BookBizException(BookBizException.PARAM_IS_NULL, "群二维码不存在！");
} }
/*if (null == group.getProductId()) { if (null == group.getProductId()) {
AddAppProductParamDTO addAppProductParamDTO = new AddAppProductParamDTO(); AddAppProductParamDTO addAppProductParamDTO = new AddAppProductParamDTO();
addAppProductParamDTO.setAppProCode(ProductTypeConstant.BOOK_GROUP); addAppProductParamDTO.setAppProCode(ProductTypeConstant.BOOK_GROUP);
addAppProductParamDTO.setAppProName(bookGroup.getGroupQrcodeName()); addAppProductParamDTO.setAppProName(bookGroup.getGroupQrcodeName());
...@@ -189,7 +198,7 @@ public class BookGroupBizImpl implements BookGroupBiz { ...@@ -189,7 +198,7 @@ public class BookGroupBizImpl implements BookGroupBiz {
updateAppProductParamDTO.setAppProName(bookGroup.getGroupQrcodeName()); updateAppProductParamDTO.setAppProName(bookGroup.getGroupQrcodeName());
ResponseHandleUtil.parseResponse(productService.postUpdateBookGroupProduct(updateAppProductParamDTO), Product.class); ResponseHandleUtil.parseResponse(productService.postUpdateBookGroupProduct(updateAppProductParamDTO), Product.class);
} }
bookGroupDao.update(bookGroup);*/ bookGroupDao.update(bookGroup);
} }
/** /**
...@@ -227,4 +236,52 @@ public class BookGroupBizImpl implements BookGroupBiz { ...@@ -227,4 +236,52 @@ public class BookGroupBizImpl implements BookGroupBiz {
} }
return result; return result;
} }
/**
* 获取社群书列表(编辑)
*/
@Override
public PageBean listBookGroup4Adviser(Map<String, Object> paramMap, PageParam pageParam, Long adviserId) throws BizException {
PageBean pageBean = bookDao.listPage(pageParam, paramMap, "listBookGroup4Adviser");
if (pageBean == null || ListUtils.isEmpty(pageBean.getRecordList())) {
return new PageBean(0, 0, new ArrayList<>());
}
// 设置是否被冻结
bookSet.setFreezeStatus(pageBean.getRecordList());
// 填充社群书数据
for (Object object : pageBean.getRecordList()) {
BookDto bookDto = (BookDto) object;
bookDto.setGroupQrcodeLink(bookGroupQrcodeDomain + "/" + bookDto.getBookGroupId());
bookDto.setScanCount(0L);
bookDto.setClassifyCount(0L);
bookDto.setGroupPersonCount(0L);
bookDto.setGroupCount(0L);
bookDto.setTotalIncome(BigDecimal.ZERO);
}
return pageBean;
}
/**
* 获取未创建社群码的书刊列表
*/
@Override
public PageBean listBook4CreateBookGroup(Map<String, Object> paramMap, PageParam pageParam, Long adviserId) throws BizException {
PageBean pageBean = bookDao.listPage(pageParam, paramMap, "listBook4CreateBookGroup");
if (pageBean == null || ListUtils.isEmpty(pageBean.getRecordList())) {
return new PageBean(0, 0, new ArrayList<>());
}
return pageBean;
}
@Override
@ParamLog("获取排序类型")
public Integer getRankType(Long bookGroupId) throws BizException {
return bookGroupDao.getRankType(bookGroupId);
}
@Override
@ParamLog("更新排序类型")
public void updateRankType(Long bookGroupId, Integer rankType) throws BizException {
bookGroupDao.updateRankType(bookGroupId, rankType);
}
} }
pcloud-service-book/src/main/java/com/pcloud/book/group/dao/BookGroupDao.java
...@@ -43,4 +43,18 @@ public interface BookGroupDao extends BaseDao<BookGroup> { ...@@ -43,4 +43,18 @@ public interface BookGroupDao extends BaseDao<BookGroup> {
* @return * @return
*/ */
long recoverByBookId(Long bookId, Long channelId, Long adviserId); long recoverByBookId(Long bookId, Long channelId, Long adviserId);
/**
* @Author:lili
* @Desr:获取排序类型
* @Date:2019/4/19 15:01
*/
Integer getRankType(Long bookGroupId);
/**
* @Author:lili
* @Desr:更新排序类型
* @Date:2019/4/19 15:01
*/
void updateRankType(Long bookGroupId, Integer rankType);
} }
pcloud-service-book/src/main/java/com/pcloud/book/group/dao/impl/BookGroupDaoImpl.java
...@@ -58,4 +58,17 @@ public class BookGroupDaoImpl extends BaseDaoImpl<BookGroup> implements BookGrou ...@@ -58,4 +58,17 @@ public class BookGroupDaoImpl extends BaseDaoImpl<BookGroup> implements BookGrou
paramMap.put("adviserId", adviserId); paramMap.put("adviserId", adviserId);
return super.getSqlSession().update(getStatement("recoverByBookId"), paramMap); return super.getSqlSession().update(getStatement("recoverByBookId"), paramMap);
} }
@Override
public Integer getRankType(Long bookGroupId) {
return super.getSqlSession().selectOne(getStatement("getRankType"), bookGroupId);
}
@Override
public void updateRankType(Long bookGroupId, Integer rankType) {
Map<String, Object> paramMap = new HashMap<>();
paramMap.put("bookGroupId", bookGroupId);
paramMap.put("rankType", rankType);
super.getSqlSession().update(getStatement("updateRankType"), paramMap);
}
} }
pcloud-service-book/src/main/java/com/pcloud/book/group/facade/BookGroupFacade.java
...@@ -2,14 +2,18 @@ package com.pcloud.book.group.facade; ...@@ -2,14 +2,18 @@ package com.pcloud.book.group.facade;
import org.codehaus.jackson.JsonParseException; import org.codehaus.jackson.JsonParseException;
import org.springframework.cloud.netflix.feign.FeignClient; import org.springframework.cloud.netflix.feign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestHeader; import org.springframework.web.bind.annotation.RequestHeader;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import com.pcloud.book.group.entity.BookGroup; import com.pcloud.book.group.entity.BookGroup;
import com.pcloud.common.dto.ResponseDto; import com.pcloud.common.dto.ResponseDto;
import com.pcloud.common.exceptions.BizException; import com.pcloud.common.exceptions.BizException;
import com.pcloud.common.page.PageBean;
import com.pcloud.common.permission.PermissionException; import com.pcloud.common.permission.PermissionException;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
...@@ -24,15 +28,6 @@ import io.swagger.annotations.ApiOperation; ...@@ -24,15 +28,6 @@ import io.swagger.annotations.ApiOperation;
@Api(description = "社群书群二维码接口") @Api(description = "社群书群二维码接口")
public interface BookGroupFacade { public interface BookGroupFacade {
/**
* 获取社群书群二维码信息
* @param token 用户身份信息
* @param bookGroupId 群二维码ID
* @return
* @throws BizException
* @throws PermissionException
* @throws JsonParseException
*/
@ApiOperation(value = "获取社群书群二维码信息", httpMethod = "GET") @ApiOperation(value = "获取社群书群二维码信息", httpMethod = "GET")
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name = "token", value = "用户身份信息", dataType = "string", paramType = "header"), @ApiImplicitParam(name = "token", value = "用户身份信息", dataType = "string", paramType = "header"),
...@@ -42,16 +37,6 @@ public interface BookGroupFacade { ...@@ -42,16 +37,6 @@ public interface BookGroupFacade {
ResponseDto<?> getBookGroupInfo(@RequestHeader("token") String token, @RequestParam(value = "bookGroupId", required = false) Long bookGroupId) ResponseDto<?> getBookGroupInfo(@RequestHeader("token") String token, @RequestParam(value = "bookGroupId", required = false) Long bookGroupId)
throws BizException, PermissionException, JsonParseException; throws BizException, PermissionException, JsonParseException;
/**
* 获取社群书群二维码信息
* @param token 用户身份信息
* @param bookId 书刊ID
* @param channelId 运营ID
* @return
* @throws BizException
* @throws PermissionException
* @throws JsonParseException
*/
@ApiOperation(value = "获取社群书群二维码信息", httpMethod = "GET") @ApiOperation(value = "获取社群书群二维码信息", httpMethod = "GET")
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name = "token", value = "用户身份信息", dataType = "string", paramType = "header"), @ApiImplicitParam(name = "token", value = "用户身份信息", dataType = "string", paramType = "header"),
...@@ -62,15 +47,6 @@ public interface BookGroupFacade { ...@@ -62,15 +47,6 @@ public interface BookGroupFacade {
ResponseDto<?> getBookGroupInfoByBookId(@RequestHeader("token") String token, @RequestParam(value = "bookId", required = false) Long bookId, ResponseDto<?> getBookGroupInfoByBookId(@RequestHeader("token") String token, @RequestParam(value = "bookId", required = false) Long bookId,
@RequestParam(value = "channelId", required = false) Long channelId) throws BizException, PermissionException, JsonParseException; @RequestParam(value = "channelId", required = false) Long channelId) throws BizException, PermissionException, JsonParseException;
/**
* 更新群二维码信息
* @param token 用户身份信息
* @param bookGroup 群二维码实体
* @return
* @throws BizException
* @throws PermissionException
* @throws JsonParseException
*/
@ApiOperation(value = "更新群二维码信息", httpMethod = "POST") @ApiOperation(value = "更新群二维码信息", httpMethod = "POST")
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name = "token", value = "用户身份信息", dataType = "string", paramType = "header"), @ApiImplicitParam(name = "token", value = "用户身份信息", dataType = "string", paramType = "header"),
...@@ -80,14 +56,6 @@ public interface BookGroupFacade { ...@@ -80,14 +56,6 @@ public interface BookGroupFacade {
ResponseDto<?> updateBookGroup(@RequestHeader("token") String token, @RequestBody BookGroup bookGroup) ResponseDto<?> updateBookGroup(@RequestHeader("token") String token, @RequestBody BookGroup bookGroup)
throws BizException, PermissionException, JsonParseException; throws BizException, PermissionException, JsonParseException;
/**
* 根据社群码ID获取书名
* @param bookGroupId 社群码ID
* @return
* @throws BizException
* @throws PermissionException
* @throws JsonParseException
*/
@ApiOperation(value = "根据社群码ID获取书名", httpMethod = "GET") @ApiOperation(value = "根据社群码ID获取书名", httpMethod = "GET")
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name = "bookGroupId", value = "社群码ID", dataType = "long", paramType = "query") @ApiImplicitParam(name = "bookGroupId", value = "社群码ID", dataType = "long", paramType = "query")
...@@ -95,4 +63,45 @@ public interface BookGroupFacade { ...@@ -95,4 +63,45 @@ public interface BookGroupFacade {
@RequestMapping(value = "getBookNameByBookGroupId", method = RequestMethod.GET) @RequestMapping(value = "getBookNameByBookGroupId", method = RequestMethod.GET)
ResponseDto<?> getBookNameByBookGroupId(@RequestParam(value = "bookGroupId", required = false) Long bookGroupId) ResponseDto<?> getBookNameByBookGroupId(@RequestParam(value = "bookGroupId", required = false) Long bookGroupId)
throws BizException, PermissionException, JsonParseException; throws BizException, PermissionException, JsonParseException;
@ApiOperation(value = "获取社群书列表(编辑)", httpMethod = "GET")
@ApiImplicitParams({
@ApiImplicitParam(name = "token", value = "token", dataType = "string", paramType = "header"),
@ApiImplicitParam(name = "bookName", value = "书籍名称", dataType = "string", paramType = "query"),
@ApiImplicitParam(name = "isbn", value = "isbn", dataType = "string", paramType = "query"),
@ApiImplicitParam(name = "channelId", value = "渠道标识", dataType = "long", paramType = "query"),
@ApiImplicitParam(name = "typeCode", value = "书刊类型", dataType = "string", paramType = "query"),
@ApiImplicitParam(name = "currentPage", value = "当前页", dataType = "int", paramType = "query"),
@ApiImplicitParam(name = "numPerPage", value = "每页条数", dataType = "int", paramType = "query"),
@ApiImplicitParam(name = "isMainEditor", value = "只看我是主编辑", dataType = "int", paramType = "query"),
@ApiImplicitParam(name = "isFundSupport", value = "只看基金支持", dataType = "int", paramType = "query"),
@ApiImplicitParam(name = "bookId", value = "书籍标识", dataType = "int", paramType = "query")
})
@RequestMapping(value = "listBookGroup4Adviser", method = RequestMethod.GET)
ResponseDto<PageBean> listBookGroup4Adviser(@RequestHeader("token") String token,
@RequestParam(value = "name", required = false) String name,
@RequestParam(value = "bookName", required = false) String bookName,
@RequestParam(value = "isbn", required = false) String isbn,
@RequestParam(value = "channelId", required = false) Long channelId,
@RequestParam(value = "typeCode", required = false) String typeCode,
@RequestParam(value = "currentPage", required = false) Integer currentPage,
@RequestParam(value = "numPerPage", required = false) Integer numPerPage,
@RequestParam(value = "isMainEditor", required = false) Integer isMainEditor,
@RequestParam(value = "isFundSupport", required = false) Integer isFundSupport,
@RequestParam(value = "bookId", required = false) Integer bookId)
throws BizException, PermissionException;
@ApiOperation(value = "获取未创建社群码的书刊列表", httpMethod = "GET")
@ApiImplicitParams({
@ApiImplicitParam(name = "token", value = "token", dataType = "string", paramType = "header"),
@ApiImplicitParam(name = "name", value = "搜索字段", dataType = "string", paramType = "query"),
@ApiImplicitParam(name = "currentPage", value = "当前页", dataType = "int", paramType = "query"),
@ApiImplicitParam(name = "numPerPage", value = "每页条数", dataType = "int", paramType = "query")
})
@RequestMapping(value = "listBook4CreateBookGroup", method = RequestMethod.GET)
ResponseDto<?> listBook4CreateBookGroup(@RequestHeader("token") String token,
@RequestParam(value = "name", required = false) String name,
@RequestParam(value = "currentPage", required = false) Integer currentPage,
@RequestParam(value = "numPerPage", required = false) Integer numPerPage)
throws BizException, PermissionException;
} }
pcloud-service-book/src/main/java/com/pcloud/book/group/facade/impl/BookGroupFacadeImpl.java
package com.pcloud.book.group.facade.impl; package com.pcloud.book.group.facade.impl;
import java.util.HashMap;
import java.util.Map;
import org.codehaus.jackson.JsonParseException; import org.codehaus.jackson.JsonParseException;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestHeader; import org.springframework.web.bind.annotation.RequestHeader;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
...@@ -14,6 +18,8 @@ import com.pcloud.book.group.entity.BookGroup; ...@@ -14,6 +18,8 @@ import com.pcloud.book.group.entity.BookGroup;
import com.pcloud.book.group.facade.BookGroupFacade; import com.pcloud.book.group.facade.BookGroupFacade;
import com.pcloud.common.dto.ResponseDto; import com.pcloud.common.dto.ResponseDto;
import com.pcloud.common.exceptions.BizException; import com.pcloud.common.exceptions.BizException;
import com.pcloud.common.page.PageBean;
import com.pcloud.common.page.PageParam;
import com.pcloud.common.permission.PermissionException; import com.pcloud.common.permission.PermissionException;
import com.pcloud.common.utils.SessionUtil; import com.pcloud.common.utils.SessionUtil;
...@@ -82,4 +88,60 @@ public class BookGroupFacadeImpl implements BookGroupFacade { ...@@ -82,4 +88,60 @@ public class BookGroupFacadeImpl implements BookGroupFacade {
} }
return new ResponseDto<>(bookGroupBiz.getBookNameByBookGroupId(bookGroupId)); return new ResponseDto<>(bookGroupBiz.getBookNameByBookGroupId(bookGroupId));
} }
/**
* 获取社群书列表(编辑)
*/
@Override
@RequestMapping(value = "listBookGroup4Adviser", method = RequestMethod.GET)
public ResponseDto<PageBean> listBookGroup4Adviser(@RequestHeader("token") String token,
@RequestParam(value = "name", required = false) String name,
@RequestParam(value = "bookName", required = false) String bookName,
@RequestParam(value = "isbn", required = false) String isbn,
@RequestParam(value = "channelId", required = false) Long channelId,
@RequestParam(value = "typeCode", required = false) String typeCode,
@RequestParam(value = "currentPage", required = false) Integer currentPage,
@RequestParam(value = "numPerPage", required = false) Integer numPerPage,
@RequestParam(value = "isMainEditor", required = false) Integer isMainEditor,
@RequestParam(value = "isFundSupport", required = false) Integer isFundSupport,
@RequestParam(value = "bookId", required = false) Integer bookId)
throws BizException, PermissionException {
Long adviserId = (Long) SessionUtil.getVlaue(token, SessionUtil.PARTY_ID);
if (currentPage == null || numPerPage == null || currentPage < 0 || numPerPage < 0) {
throw BookBizException.PAGE_PARAM_DELETION;
}
Map<String, Object> paramMap = new HashMap<>();
paramMap.put("adviserId", adviserId);
paramMap.put("isMainEditor", isMainEditor);
paramMap.put("isFundSupport", isFundSupport);
paramMap.put("channelId", channelId);
paramMap.put("name", name != null && "".equals(name.trim()) ? null : name);
paramMap.put("isbn", isbn != null && "".equals(isbn.trim()) ? null : isbn);
paramMap.put("bookName", bookName != null && "".equals(bookName.trim()) ? null : bookName);
paramMap.put("typeCode", typeCode != null && "".equals(typeCode.trim()) ? null : typeCode);
paramMap.put("bookId", bookId);
PageBean pageBean = bookGroupBiz.listBookGroup4Adviser(paramMap, new PageParam(currentPage, numPerPage), adviserId);
return new ResponseDto<>(pageBean);
}
/**
* 获取未创建社群码的书刊列表
*/
@Override
@RequestMapping(value = "listBook4CreateBookGroup", method = RequestMethod.GET)
public ResponseDto<?> listBook4CreateBookGroup(@RequestHeader("token") String token,
@RequestParam(value = "name", required = false) String name,
@RequestParam(value = "currentPage", required = false) Integer currentPage,
@RequestParam(value = "numPerPage", required = false) Integer numPerPage)
throws BizException, PermissionException {
Long adviserId = (Long) SessionUtil.getVlaue(token, SessionUtil.PARTY_ID);
if (currentPage == null || numPerPage == null || currentPage < 0 || numPerPage < 0) {
throw BookBizException.PAGE_PARAM_DELETION;
}
Map<String, Object> paramMap = new HashMap<>();
paramMap.put("adviserId", adviserId);
paramMap.put("name", name != null && "".equals(name.trim()) ? null : name);
PageBean pageBean = bookGroupBiz.listBook4CreateBookGroup(paramMap, new PageParam(currentPage, numPerPage), adviserId);
return new ResponseDto<>(pageBean);
}
} }
pcloud-service-book/src/main/resources/mapper/book/Book.Mapper.xml
...@@ -511,6 +511,80 @@ ...@@ -511,6 +511,80 @@
</if> </if>
</select> </select>
<!-- 获取未创建社群码的书刊列表 -->
<select id="listBook4CreateBookGroup" resultMap="bookMap" parameterType="map">
SELECT
A.BOOK_ID, A.CHANNEL_ID, A.ADVISER_ID, A.IS_MAIN_EDITOR, B.ISBN, B.BOOK_NAME,
B.AUTHOR, B.PUBLISH, B.PUBLISH_DATE, B.COVER_IMG, B.ORIGIN_NAME, B.BOOK_PRICE, B.ISSN, B.BOOK_NUM, B.SERIAL_NUMBER,
A.TEMPLET_ID, A.LAST_MODIFIED_DATE, A.BOOK_ADVISER_ID, CONCAT('BK',A.BOOK_ID) uniqueNumber
FROM
BOOK_ADVISER A
INNER JOIN BOOK B ON A.BOOK_ID = B.BOOK_ID AND B.IS_DELETE = 0
LEFT JOIN book_group G on G.BOOK_ID = A.BOOK_ID AND G.CHANNEL_ID = A.CHANNEL_ID AND G.CREATE_USER = A.ADVISER_ID
WHERE
A.ADVISER_ID = #{adviserId} AND A.IS_DELETE = 0 AND G.ID IS NULL
<if test="name != null">
AND
(B.BOOK_NAME LIKE CONCAT('%', #{name}, '%') OR B.ISBN LIKE CONCAT(#{name},'%') OR CONCAT('BK',A.BOOK_ID) = #{name})
</if>
GROUP BY A.BOOK_ID, A.CHANNEL_ID
ORDER BY
A.LAST_MODIFIED_DATE DESC
</select>
<!-- 获取社群书列表(编辑) -->
<select id="listBookGroup4Adviser" resultMap="bookMap" parameterType="map">
SELECT
A.BOOK_ID, A.CHANNEL_ID, A.ADVISER_ID, A.IS_MAIN_EDITOR, T.TYPE_CODE, T.TYPE_NAME, B.ISBN, B.BOOK_NAME, B.REMARK,
B.AUTHOR, B.PUBLISH, B.PUBLISH_DATE, B.COVER_IMG, B.ORIGIN_NAME, B.BOOK_PRICE, B.ISSN, B.BOOK_NUM, B.SERIAL_NUMBER,
IF(ISNULL(BF.BOOK_FUND_ID),0,1) IS_FUND_SUPPORT, A.TEMPLET_ID, A.BOOK_ADVISER_ID, CONCAT('BK',A.BOOK_ID) uniqueNumber,
G.update_time LAST_MODIFIED_DATE, G.create_time CREATED_DATE, G.id bookGroupId, G.group_qrcode_url groupQrcodeUrl,
G.group_qrcode_name groupQrcodeName
FROM
BOOK_ADVISER A
INNER JOIN book_group G on G.BOOK_ID = A.BOOK_ID AND G.CHANNEL_ID = A.CHANNEL_ID AND G.CREATE_USER = A.ADVISER_ID
INNER JOIN BOOK B ON A.BOOK_ID = B.BOOK_ID AND B.IS_DELETE = 0
LEFT JOIN BOOK_TYPE T ON B.TYPE_CODE = T.TYPE_CODE
LEFT JOIN BOOK_FUND BF ON BF.BOOK_ID = A.BOOK_ID AND BF.END_TIME <![CDATA[ > ]]> NOW() AND BF.START_TIME <![CDATA[ < ]]> NOW()
WHERE
A.ADVISER_ID = #{adviserId} AND A.IS_DELETE = 0
<if test="bookId != null">
AND
A.BOOK_ID = #{bookId}
</if>
<if test="typeCode != null">
AND
B.TYPE_CODE = #{typeCode}
</if>
<if test="channelId != null">
AND
A.CHANNEL_ID = #{channelId}
</if>
<if test="bookName != null">
AND
B.BOOK_NAME LIKE CONCAT('%', #{bookName}, '%')
</if>
<if test="isbn != null">
AND
B.ISBN LIKE CONCAT(#{isbn},'%')
</if>
<if test="name != null">
AND
(B.BOOK_NAME LIKE CONCAT('%', #{name}, '%') OR G.group_qrcode_name LIKE CONCAT('%', #{name}, '%') OR B.ISBN LIKE CONCAT(#{name},'%') OR CONCAT('BK',A.BOOK_ID) = #{name})
</if>
<if test="isMainEditor != null">
AND
A.IS_MAIN_EDITOR = 1
</if>
<if test="isFundSupport != null">
AND
BF.BOOK_FUND_ID IS NOT NULL
</if>
GROUP BY A.BOOK_ID, A.CHANNEL_ID
ORDER BY
G.UPDATE_TIME DESC
</select>
<!-- 获取书籍列表(编辑) --> <!-- 获取书籍列表(编辑) -->
<select id="listBook4Adviser" resultMap="bookMap" parameterType="map"> <select id="listBook4Adviser" resultMap="bookMap" parameterType="map">
SELECT SELECT
......
pcloud-service-book/src/main/resources/mapper/group/BookGroupMapper.xml
...@@ -167,4 +167,19 @@ ...@@ -167,4 +167,19 @@
where id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
</update> </update>
<select id="getRankType" resultType="Integer" parameterType="java.lang.Long">
select
rank_type
from book_group
where id = #{_parameter,jdbcType=BIGINT}
</select>
<update id="updateRankType" parameterType="map">
update book_group
<set>
rank_type = #{rankType},
update_time = NOW()
</set>
where id = #{bookGroupId,jdbcType=BIGINT}
</update>
</mapper> </mapper>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment