合并代码

pcloud-facade-book/src/main/java/com/pcloud/book/book/service/BookAdviserService.java

@@ -3,6 +3,8 @@
  */
 package com.pcloud.book.book.service;
 
+import com.pcloud.book.book.dto.AdviserBookInfoDTO;
+import com.pcloud.book.book.dto.AviserBookInfoParam;
 import com.pcloud.book.book.dto.BookAdviserDto;
 import com.pcloud.book.book.entity.BookAdviser;
 import com.pcloud.common.dto.ResponseDto;
@@ -14,6 +16,7 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.http.ResponseEntity;
 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.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -102,4 +105,7 @@ public interface BookAdviserService {
     @RequestMapping(value = "/setBookTemplet", method = RequestMethod.GET)
     void setBookTemplet(@RequestBody BookAdviser bookAdviser) throws BizException;
     
+    @PostMapping("listAdviserBookInfo")
+    @ApiOperation("获取图书基本信息")
+    ResponseEntity<ResponseDto<Map<String,AdviserBookInfoDTO>>> listAdviserBookInfo(@RequestBody AviserBookInfoParam AviserBookInfoParam) throws BizException ;
 }

pcloud-service-book/src/main/java/com/pcloud/book/book/biz/BookAdviserBiz.java

@@ -7,7 +7,9 @@ import java.util.List;
 import java.util.Map;
 
 import com.pcloud.book.base.dto.CountDto;
+import com.pcloud.book.book.dto.AdviserBookInfoDTO;
 import com.pcloud.book.book.dto.AdviserManageDto;
+import com.pcloud.book.book.dto.AviserBookInfoParam;
 import com.pcloud.book.book.dto.BookAdviserDto;
 import com.pcloud.book.book.dto.BookCountDto;
 import com.pcloud.book.book.entity.BookAdviser;
@@ -181,4 +183,6 @@ public interface BookAdviserBiz {
 	 * @return
 	 */
 	public void setBookTemplet(BookAdviser bookAdviser);
+
+	Map<String,AdviserBookInfoDTO> listAdviserBookInfo(AviserBookInfoParam aviserBookInfoParam);
 }

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

@@ -7,7 +7,9 @@ import com.pcloud.book.book.biz.BookAdviserBiz;
 import com.pcloud.book.book.biz.BookBiz;
 import com.pcloud.book.book.constant.BookConstant;
 import com.pcloud.book.book.dao.BookAdviserDao;
+import com.pcloud.book.book.dto.AdviserBookInfoDTO;
 import com.pcloud.book.book.dto.AdviserManageDto;
+import com.pcloud.book.book.dto.AviserBookInfoParam;
 import com.pcloud.book.book.dto.BookAdviserDto;
 import com.pcloud.book.book.dto.BookCountDto;
 import com.pcloud.book.book.dto.BookDto;
@@ -20,6 +22,7 @@ import com.pcloud.book.consumer.settlement.BookConsr;
 import com.pcloud.book.consumer.user.AdviserConsr;
 import com.pcloud.book.consumer.user.BookcaseConsr;
 import com.pcloud.book.consumer.user.ChannelConsr;
+import com.pcloud.common.core.aspect.ParamLog;
 import com.pcloud.common.core.constant.SceneCode;
 import com.pcloud.common.core.constant.SendType;
 import com.pcloud.common.core.constant.SystemCode;
@@ -693,4 +696,16 @@ public class BookAdviserBizImpl implements BookAdviserBiz {
 		bookAdviserDao.updateBookTemplet(bookAdviser);
 		LOGGER.info("设置图书使用模板【END】");
 	}
+	@Override
+	@ParamLog(value = "获取图书基本信息", isBefore = false, isAfterReturn = false)
+	public Map<String, AdviserBookInfoDTO> listAdviserBookInfo(AviserBookInfoParam aviserBookInfoParam) {
+		if (ListUtils.isEmpty(aviserBookInfoParam.getBookIds())) return null;
+		List<AdviserBookInfoDTO> adviserBookInfoDTOS = bookAdviserDao.listAdviserBookInfo(aviserBookInfoParam);
+		if (ListUtils.isEmpty(adviserBookInfoDTOS)) return null;
+		Map<String, AdviserBookInfoDTO> adviserBookInfoDTOMap = new HashMap<>();
+		for (AdviserBookInfoDTO adviserBookInfoDTO : adviserBookInfoDTOS) {
+			adviserBookInfoDTOMap.put(adviserBookInfoDTO.getBookId() + "-" + adviserBookInfoDTO.getChannelId() + "-" + adviserBookInfoDTO.getAdviserId(), adviserBookInfoDTO);
+		}
+		return adviserBookInfoDTOMap;
+	}
 }

pcloud-service-book/src/main/java/com/pcloud/book/book/dao/BookAdviserDao.java

@@ -6,7 +6,9 @@ package com.pcloud.book.book.dao;
 import java.util.List;
 import java.util.Map;
 
+import com.pcloud.book.book.dto.AdviserBookInfoDTO;
 import com.pcloud.book.book.dto.AdviserManageDto;
+import com.pcloud.book.book.dto.AviserBookInfoParam;
 import com.pcloud.book.book.dto.BookAdviserDto;
 import com.pcloud.book.book.dto.BookCountDto;
 import com.pcloud.book.book.entity.BookAdviser;
@@ -232,4 +234,10 @@ public interface BookAdviserDao extends BaseDao<BookAdviser> {
 	Integer getCount4BookAdviser(Long bookId);
 
 	BookAdviserDto getBase(Long bookId, Long channelId, Long adviserId);
+	/**
+	 * @Author:lili
+	 * @Desr:获取编辑图书基本信息
+	 * @Date:2019/2/13 17:35
+	 */
+    List<AdviserBookInfoDTO> listAdviserBookInfo(AviserBookInfoParam aviserBookInfoParam);
 }

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

@@ -7,6 +7,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import com.pcloud.book.book.dto.AdviserBookInfoDTO;
+import com.pcloud.book.book.dto.AviserBookInfoParam;
 import org.springframework.stereotype.Repository;
 
 import com.pcloud.book.book.dao.BookAdviserDao;
@@ -222,4 +224,8 @@ public class BookAdviserDaoImpl extends BaseDaoImpl<BookAdviser> implements Book
 		paramMap.put("adviserId", adviserId);
 		return super.getSqlSession().selectOne(this.getStatement("getBase"), paramMap);
 	}
+    @Override
+    public List<AdviserBookInfoDTO> listAdviserBookInfo(AviserBookInfoParam aviserBookInfoParam) {
+		return super.getSqlSession().selectList(this.getStatement("listAdviserBookInfo"), aviserBookInfoParam);
+    }
 }

pcloud-service-book/src/main/java/com/pcloud/book/book/service/impl/BookAdviserServiceImpl.java

@@ -6,8 +6,11 @@ package com.pcloud.book.book.service.impl;
 import java.util.List;
 import java.util.Map;
 
+import com.pcloud.book.book.dto.AdviserBookInfoDTO;
+import com.pcloud.book.book.dto.AviserBookInfoParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -85,4 +88,9 @@ public class BookAdviserServiceImpl implements BookAdviserService {
 		bookAdviserBiz.setBookTemplet(bookAdviser);
 	}
 
+	@Override
+	@PostMapping("listAdviserBookInfo")
+	public ResponseEntity<ResponseDto<Map<String,AdviserBookInfoDTO>>> listAdviserBookInfo(@RequestBody AviserBookInfoParam AviserBookInfoParam) throws BizException {
+		return ResponseHandleUtil.toResponse(bookAdviserBiz.listAdviserBookInfo(AviserBookInfoParam));
+	}
 }

pcloud-service-book/src/main/java/com/pcloud/book/book/set/BookSet.java

@@ -50,6 +50,7 @@ import com.pcloud.channelcenter.qrcode.dto.QrcodeLocationDto;
 import com.pcloud.channelcenter.qrcode.vo.BookAssocLastQrAskVO;
 import com.pcloud.channelcenter.qrcode.vo.BookAssocLastQrVO;
 import com.pcloud.comment.base.enums.SysCodeEnum;
+import com.pcloud.common.core.aspect.ParamLog;
 import com.pcloud.common.core.constant.MQTopicProducer;
 import com.pcloud.common.core.constant.SystemCode;
 import com.pcloud.common.exceptions.BizException;
@@ -1203,6 +1204,7 @@ public class BookSet {
 	 * 
 	 * @param bookList
 	 */
+	@ParamLog(value = "设置图书读者量、扫码量、浏览量", isBefore = false)
 	public void setBookSvUvPv4Object(List<Object> bookList) {
 		if (ListUtils.isEmpty(bookList)) {
 			return;
@@ -1327,6 +1329,7 @@ public class BookSet {
 	 * 
 	 * @param recordList
 	 */
+	@ParamLog(value = "图书收益",isBefore = false)
 	public void setBookIncome(List<Object> recordList) {
 		if (ListUtils.isEmpty(recordList)) {
 			return;

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

@@ -4,22 +4,18 @@ import com.pcloud.book.base.enums.BookStatusEnum;
 import com.pcloud.book.book.biz.BookBiz;
 import com.pcloud.book.book.dto.BookInfoAndAuthStatusDTO;
 import com.pcloud.book.consumer.channel.QrcodeSceneConsr;
-import com.pcloud.book.copyright.biz.BookAuthInfoBiz;
 import com.pcloud.book.copyright.biz.BookAuthServeBiz;
 import com.pcloud.book.copyright.dao.BookAuthServeDao;
 import com.pcloud.book.copyright.dto.ServeDTO;
 import com.pcloud.book.copyright.entity.BookAuthServe;
-import com.pcloud.book.copyright.vo.BookAuthInfoVO;
 import com.pcloud.book.copyright.vo.ServeVO;
 import com.pcloud.channelcenter.base.exceptions.ChannelBizException;
 import com.pcloud.channelcenter.qrcode.dto.QrcodeSceneDto;
 import com.pcloud.common.core.aspect.ParamLog;
 import com.pcloud.common.utils.ListUtils;
-import io.swagger.annotations.ApiModel;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -42,14 +38,14 @@ public class BookAuthServeBizImpl implements BookAuthServeBiz {
     @Override
     @ParamLog("设置图书授权服务")
     public void setBookAuthServes(List<ServeVO> serves, Long bookId, Long channelId, Long adviserId) {
-          if(bookId == null || channelId == null || adviserId == null) {
+        if (bookId == null || channelId == null || adviserId == null) {
             throw new ChannelBizException(ChannelBizException._ERROR, "图书不存在");
-          }
-          deleteServesByBook(bookId, channelId, adviserId);
-          if(!ListUtils.isEmpty(serves)){
-              List<BookAuthServe> bookAuthServes = changeToBookAuthServe(serves, bookId, channelId, adviserId);
-              bookAuthServeDao.insert(bookAuthServes);
-          }
+        }
+        deleteServesByBook(bookId, channelId, adviserId);
+        if (!ListUtils.isEmpty(serves)) {
+            List<BookAuthServe> bookAuthServes = changeToBookAuthServe(serves, bookId, channelId, adviserId);
+            bookAuthServeDao.insert(bookAuthServes);
+        }
     }
 
     /**
@@ -74,12 +70,12 @@ public class BookAuthServeBizImpl implements BookAuthServeBiz {
 
     @Override
     public List<ServeVO> listServesByBook(Long bookId, Long channelId, Long adviserId) {
-       return bookAuthServeDao.listServesByBook(bookId, channelId, adviserId);
+        return bookAuthServeDao.listServesByBook(bookId, channelId, adviserId);
     }
 
     @Override
     public Boolean checkIsNeedAuth(Long bookId, Long channelId, Long adviserId, Long serveId, String serveType) {
-        return bookAuthServeDao.checkIsNeedAuth(bookId, channelId, adviserId,serveId,serveType);
+        return bookAuthServeDao.checkIsNeedAuth(bookId, channelId, adviserId, serveId, serveType);
     }
 
     @Override
@@ -101,7 +97,7 @@ public class BookAuthServeBizImpl implements BookAuthServeBiz {
 
     @Override
     @ParamLog("listIsOpen4ServeIdsAndBookId")
-    public Map<String, Boolean> listIsOpen4ServeIdsAndBookId(Long bookId,Long adviserId, Long channelId, List<Long> serveIds) {
+    public Map<String, Boolean> listIsOpen4ServeIdsAndBookId(Long bookId, Long adviserId, Long channelId, List<Long> serveIds) {
         BookInfoAndAuthStatusDTO baseAndAuthStatus = bookBiz.getBaseAndAuthStatus(bookId, channelId, adviserId);
         final boolean boo = baseAndAuthStatus != null && BookStatusEnum.PROTECT.value.equals(baseAndAuthStatus.getBookStatus())
                 && BookStatusEnum.BookDeleteStatus.NOT_DELETE.value.equals(baseAndAuthStatus.getIsDelete());
@@ -114,7 +110,7 @@ public class BookAuthServeBizImpl implements BookAuthServeBiz {
 
     private List<BookAuthServe> changeToBookAuthServe(List<ServeVO> serves, Long bookId, Long channelId, Long adviserId) {
         List<BookAuthServe> bookAuthServes = new ArrayList<>();
-        for (ServeVO serveVO : serves){
+        for (ServeVO serveVO : serves) {
             BookAuthServe bookAuthServe = new BookAuthServe();
             bookAuthServe.setBookId(bookId);
             bookAuthServe.setChannelId(channelId);
@@ -126,12 +122,12 @@ public class BookAuthServeBizImpl implements BookAuthServeBiz {
     }
 
     @ParamLog("删除图书授权服务")
-    private void deleteServesByBook(Long bookId, Long channelId, Long adviserId){
+    private void deleteServesByBook(Long bookId, Long channelId, Long adviserId) {
         if (bookId == null || channelId == null || adviserId == null) {
             throw new ChannelBizException(ChannelBizException._ERROR, "图书不存在");
         }
         List<Long> ids = bookAuthServeDao.selectNeedDelete(bookId, channelId, adviserId);
-        if(ListUtils.isEmpty(ids)) return;
+        if (ListUtils.isEmpty(ids)) return;
         bookAuthServeDao.deleteServes(ids);
     }
 

pcloud-service-book/src/main/resources/mapper/book/BookAdviser.Mapper.xml

@@ -436,4 +436,38 @@
 			IS_DELETE = 0
 	</select>
 
+
+	<select id="listAdviserBookInfo" resultType="AdviserBookInfoDTO" parameterType="aviserBookInfoParam">
+		SELECT
+			ba.BOOK_ID bookId,
+			b.BOOK_NAME bookName,
+			b.cover_img coverImg,
+			b.type_code typeCode,
+			b.isbn,
+			b.serial_number serialNumber,
+			ba.adviser_id adviserId,
+			ba.channel_id channelId,
+			ba.created_date createdDate
+		FROM
+			book_adviser ba join book b on ba.book_id = b.book_id and  ba.is_delete = 0 and b.is_delete = 0
+		WHERE
+		  ba.BOOK_ID in
+		<foreach collection = "bookIds" index="index" item = "item" open = "("  separator= "," close = ")">
+			${item}
+		</foreach>
+		<if test="adviserIds!=null">
+		AND
+			ADVISER_ID in
+		<foreach collection = "adviserIds" index="index" item = "item" open = "("  separator= "," close = ")">
+			${item}
+		</foreach>
+		</if>
+		<if test="channelIds!=null">
+		AND
+			CHANNEL_ID in
+		<foreach collection = "channelIds" index="index" item = "item" open = "("  separator= "," close = ")">
+			${item}
+		</foreach>
+		</if>
+	</select>
 </mapper>
\ No newline at end of file