Merge remote-tracking branch 'origin/master'

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

pcloud-facade-book/src/main/java/com/pcloud/book/book/dto/BookAnlysicsDto.java

+package com.pcloud.book.book.dto;
+
+import com.pcloud.common.dto.BaseDto;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+
+/**
+ * 书刊分析DTO
+ */
+public class BookAnlysicsDto extends BaseDto {
+
+    @ApiModelProperty("图书ID")
+    private Long bookId;
+    @ApiModelProperty("图书名字")
+    private String bookName;
+    @ApiModelProperty("出版ID")
+    private Long agentId;
+    @ApiModelProperty("出版名字")
+    private String agentName;
+    @ApiModelProperty("运营平台ID")
+    private Long channelId;
+    @ApiModelProperty("运营平台名字")
+    private String channelName;
+    @ApiModelProperty("编辑ID")
+    private Long adviserId;
+    @ApiModelProperty("编辑名字")
+    private String adviserName;
+    @ApiModelProperty("分类ID")
+    private Long templetId;
+    @ApiModelProperty("分类名字")
+    private String templeName;
+    @ApiModelProperty("是否基金书籍")
+    private Boolean isFundSupport;
+    @ApiModelProperty("关联二维码数量")
+    private Long sceneCount;
+    @ApiModelProperty("")
+    private Long scanQR;
+    @ApiModelProperty("浏览量")
+    private Long scanNum;
+    @ApiModelProperty("读者量")
+    private Long readerNum;
+    @ApiModelProperty("累计收益")
+    private BigDecimal income;
+    @ApiModelProperty("ISBN")
+    private String isbn;
+    @ApiModelProperty("扫码平均转化率")
+    private Double scvr;
+    @ApiModelProperty("是否主编辑")
+    private Boolean isMainEditor;
+
+    public Long getBookId() {
+        return bookId;
+    }
+
+    public void setBookId(Long bookId) {
+        this.bookId = bookId;
+    }
+
+    public String getBookName() {
+        return bookName;
+    }
+
+    public void setBookName(String bookName) {
+        this.bookName = bookName;
+    }
+
+    public Long getAgentId() {
+        return agentId;
+    }
+
+    public void setAgentId(Long agentId) {
+        this.agentId = agentId;
+    }
+
+    public String getAgentName() {
+        return agentName;
+    }
+
+    public void setAgentName(String agentName) {
+        this.agentName = agentName;
+    }
+
+    public Long getChannelId() {
+        return channelId;
+    }
+
+    public void setChannelId(Long channelId) {
+        this.channelId = channelId;
+    }
+
+    public String getChannelName() {
+        return channelName;
+    }
+
+    public void setChannelName(String channelName) {
+        this.channelName = channelName;
+    }
+
+    public Long getAdviserId() {
+        return adviserId;
+    }
+
+    public void setAdviserId(Long adviserId) {
+        this.adviserId = adviserId;
+    }
+
+    public String getAdviserName() {
+        return adviserName;
+    }
+
+    public void setAdviserName(String adviserName) {
+        this.adviserName = adviserName;
+    }
+
+    public Long getTempletId() {
+        return templetId;
+    }
+
+    public void setTempleId(Long templetId) {
+        this.templetId = templetId;
+    }
+
+    public String getTempleName() {
+        return templeName;
+    }
+
+    public void setTempleName(String templeName) {
+        this.templeName = templeName;
+    }
+
+    public Long getSceneCount() {
+        return sceneCount;
+    }
+
+    public void setSceneCount(Long sceneCount) {
+        this.sceneCount = sceneCount;
+    }
+
+    public Long getScanQR() {
+        return scanQR;
+    }
+
+    public void setScanQR(Long scanQR) {
+        this.scanQR = scanQR;
+    }
+
+    public Long getScanNum() {
+        return scanNum;
+    }
+
+    public void setScanNum(Long scanNum) {
+        this.scanNum = scanNum;
+    }
+
+    public Long getReaderNum() {
+        return readerNum;
+    }
+
+    public void setReaderNum(Long readerNum) {
+        this.readerNum = readerNum;
+    }
+
+    public BigDecimal getIncome() {
+        return income;
+    }
+
+    public void setIncome(BigDecimal income) {
+        this.income = income;
+    }
+
+    public String getIsbn() {
+        return isbn;
+    }
+
+    public void setIsbn(String isbn) {
+        this.isbn = isbn;
+    }
+
+    public Double getScvr() {
+        return scvr;
+    }
+
+    public void setScvr(Double scvr) {
+        this.scvr = scvr;
+    }
+
+    public Boolean getIsMainEditor() {
+        return isMainEditor;
+    }
+
+    public void setIsMainEditor(Boolean isMainEditor) {
+        this.isMainEditor = isMainEditor;
+    }
+
+    public Boolean getIsFundSupport() {
+        return isFundSupport;
+    }
+
+    public void setIsFundSupport(Boolean isFundSupport) {
+        this.isFundSupport = isFundSupport;
+    }
+
+    @Override
+    public String toString() {
+        return "BookAnlysicsDto{" +
+                "bookId=" + bookId +
+                ", bookName='" + bookName + '\'' +
+                ", agentId=" + agentId +
+                ", agentName='" + agentName + '\'' +
+                ", channelId=" + channelId +
+                ", channelName='" + channelName + '\'' +
+                ", adviserId=" + adviserId +
+                ", adviserName='" + adviserName + '\'' +
+                ", templetId=" + templetId +
+                ", templeName='" + templeName + '\'' +
+                ", isFundSupport=" + isFundSupport +
+                ", sceneCount=" + sceneCount +
+                ", scanQR=" + scanQR +
+                ", scanNum=" + scanNum +
+                ", readerNum=" + readerNum +
+                ", income=" + income +
+                ", isbn='" + isbn + '\'' +
+                ", scvr=" + scvr +
+                ", isMainEditor=" + isMainEditor +
+                '}';
+    }
+}

pcloud-facade-book/src/main/java/com/pcloud/book/book/dto/BookInfoAnalysicsDTO.java

+package com.pcloud.book.book.dto;
+
+import com.pcloud.common.dto.BaseDto;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 图书分析DTO
+ */
+public class BookInfoAnalysicsDTO extends BaseDto {
+
+    @ApiModelProperty("图书ID")
+    private Long bookId;
+    @ApiModelProperty("图书名字")
+    private String bookName;
+    @ApiModelProperty("运营平台ID")
+    private Long channelId;
+    @ApiModelProperty("编辑ID")
+    private Long adviserId;
+    @ApiModelProperty("分类ID")
+    private Long templetId;
+    @ApiModelProperty("分类名字")
+    private String templeName;
+    @ApiModelProperty("是否基金书籍")
+    private Boolean isFundSupport;
+    @ApiModelProperty("ISBN")
+    private String isbn;
+
+    public Long getBookId() {
+        return bookId;
+    }
+
+    public void setBookId(Long bookId) {
+        this.bookId = bookId;
+    }
+
+    public String getBookName() {
+        return bookName;
+    }
+
+    public void setBookName(String bookName) {
+        this.bookName = bookName;
+    }
+
+    public Long getChannelId() {
+        return channelId;
+    }
+
+    public void setChannelId(Long channelId) {
+        this.channelId = channelId;
+    }
+
+    public Long getAdviserId() {
+        return adviserId;
+    }
+
+    public void setAdviserId(Long adviserId) {
+        this.adviserId = adviserId;
+    }
+
+    public Long getTempletId() {
+        return templetId;
+    }
+
+    public void setTempletId(Long templetId) {
+        this.templetId = templetId;
+    }
+
+    public Boolean getIsFundSupport() {
+        return isFundSupport;
+    }
+
+    public void setIsFundSupport(Boolean isFundSupport) {
+        isFundSupport = isFundSupport;
+    }
+
+    public String getTempleName() {
+        return templeName;
+    }
+
+    public void setTempleName(String templeName) {
+        this.templeName = templeName;
+    }
+
+    public String getIsbn() {
+        return isbn;
+    }
+
+    public void setIsbn(String isbn) {
+        this.isbn = isbn;
+    }
+
+    @Override
+    public String toString() {
+        return "BookInfoAnalysicsDTO{" +
+                "bookId=" + bookId +
+                ", bookName='" + bookName + '\'' +
+                ", channelId=" + channelId +
+                ", adviserId=" + adviserId +
+                ", templetId=" + templetId +
+                ", templeName='" + templeName + '\'' +
+                ", isFundSupport=" + isFundSupport +
+                ", isbn='" + isbn + '\'' +
+                '}';
+    }
+}

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

@@ -6,6 +6,7 @@ package com.pcloud.book.book.service;
 import com.pcloud.book.book.dto.BookAdviserUpdateTimeDTO;
 import com.pcloud.book.book.dto.BookDetialDTO;
 import com.pcloud.book.book.dto.BookDto;
+import com.pcloud.book.book.dto.BookInfoAnalysicsDTO;
 import com.pcloud.common.dto.ResponseDto;
 import com.pcloud.common.exceptions.BizException;
 import io.swagger.annotations.Api;
@@ -221,5 +222,11 @@ public interface BookService {
             @ApiImplicitParam(name = "bookIds", value = "图书标识", dataType = "List<Long>", paramType = "body")})
     @RequestMapping(value = "/updateTimeByIds", method = RequestMethod.POST)
     public void updateTimeByIds(@RequestBody BookAdviserUpdateTimeDTO bookAdviserUpdateTimeDTO)throws BizException;
-    
+
+    @ApiOperation(value = "获取书刊信息", httpMethod = "POST")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "bookInfoAnalysicsDTOS", value = "图书信息-书刊分析", dataType = "List<BookInfoAnalysicsDTO>", paramType = "body"),
+            @ApiImplicitParam(name = "monthDate", value = "数据统计时间", dataType = "String", paramType = "query")})
+    @RequestMapping(value = "/getBookInfoBy", method = RequestMethod.POST)
+    public ResponseEntity<ResponseDto<Map<String,BookInfoAnalysicsDTO>>> getBookInfoBy(@RequestBody List<BookInfoAnalysicsDTO> bookInfoAnalysicsDTOS,@RequestParam(value = "monthDate",required = false) String monthDate)throws BizException;
 }

pcloud-service-book/pom.xml

@@ -50,6 +50,12 @@
 
 		<dependency>
 			<groupId>com.pcloud.facade</groupId>
+			<artifactId>pcloud-facade-tradecenter</artifactId>
+			<version>${pcloud-facade-tradecenter.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>com.pcloud.facade</groupId>
 			<artifactId>pcloud-facade-usercenter</artifactId>
 			<version>${pcloud-facade-usercenter.version}</version>
 			<exclusions>

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

@@ -7,7 +7,9 @@ import com.pcloud.book.book.dto.BookAdviserUpdateTimeDTO;
 import com.pcloud.book.book.dto.BookAssocCount;
 import com.pcloud.book.book.dto.BookDetialDTO;
 import com.pcloud.book.book.dto.BookDto;
+import com.pcloud.book.book.dto.BookInfoAnalysicsDTO;
 import com.pcloud.book.book.entity.Book;
+import com.pcloud.book.book.vo.BookAnalysic4PCVO;
 import com.pcloud.common.exceptions.BizException;
 import com.pcloud.common.page.PageBean;
 import com.pcloud.common.page.PageBeanNew;
@@ -512,6 +514,23 @@ public interface BookBiz {
 	 * @throws BizException
 	 */
 	void updateTimeByIds(BookAdviserUpdateTimeDTO bookAdviserUpdateTimeDTO)throws BizException;
+
+	/**
+	 * 平台端--数据分析-书刊分析
+	 * @param pageParam
+	 * @param bookAnalysic4PCVO
+	 * @return
+	 * @throws BizException
+	 */
+	PageBean getBookAnalysis4PC(PageParam pageParam, BookAnalysic4PCVO bookAnalysic4PCVO)throws BizException;
+
+	/**
+	 * 获取书刊信息
+	 * @return
+	 * @throws BizException
+	 */
+	Map<String,BookInfoAnalysicsDTO> getBookInfoBy(List<BookInfoAnalysicsDTO> bookInfoAnalysicsDTOS,String monthDate)throws BizException;
+
 	/**
 	 * 获取图书分类标识
 	 * @param adviserId

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

@@ -27,9 +27,12 @@ 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.BookInfoAnalysicsDTO;
 import com.pcloud.book.book.entity.Book;
 import com.pcloud.book.book.entity.BookAdviser;
 import com.pcloud.book.book.set.BookSet;
+import com.pcloud.book.book.tools.BookTools;
+import com.pcloud.book.book.vo.BookAnalysic4PCVO;
 import com.pcloud.book.consumer.analysisengine.SceneRecordConsr;
 import com.pcloud.book.consumer.app.AssistTempletConsr;
 import com.pcloud.book.consumer.channel.QrcodeSceneConsr;
@@ -1531,6 +1534,114 @@ public class BookBizImpl implements BookBiz {
 		}
 		bookDao.updateTimeByIds(paramMap);
 	}
+
+	@ParamLog(description = "平台端--数据分析-书刊分析")
+	@Override
+	public PageBean getBookAnalysis4PC(PageParam pageParam, BookAnalysic4PCVO bookAnalysic4PCVO) throws BizException {
+		Map<String,Object> paramMap = Maps.newHashMap();
+		if(!StringUtil.isEmpty(bookAnalysic4PCVO.getBookName())){
+			paramMap.put("bookName",bookAnalysic4PCVO.getBookName());
+		}
+		if(!StringUtil.isEmpty(bookAnalysic4PCVO.getStatisTime())){
+			if(BookTools.isValidDate(bookAnalysic4PCVO.getStatisTime(),"yyyy-MM")){
+				paramMap.put("statisTime",bookAnalysic4PCVO.getStatisTime());
+			}else{
+				throw new BookBizException(BookBizException.PARAM_IS_ERROR,"请检查数据统计年月格式~");
+			}
+		}
+		if(!StringUtil.isEmpty(bookAnalysic4PCVO.getIsbn())){
+			paramMap.put("isbn",bookAnalysic4PCVO.getIsbn());
+		}
+		if(null != bookAnalysic4PCVO.getTempletId()){
+			/*List<Long> ids = assistTempletConsr.getChildIdListByParentId(bookAnalysic4PCVO.getTempletId());
+			if(!ListUtils.isEmpty(ids)){
+				paramMap.put("templetId",bookAnalysic4PCVO.getTempletId());
+			}*/
+			paramMap.put("templetId",bookAnalysic4PCVO.getTempletId());
+		}
+		if(!ListUtils.isEmpty(bookAnalysic4PCVO.getAgentIds())){
+			List<Long> channelIds = Lists.newArrayList();
+			List<Long> agentIds = bookAnalysic4PCVO.getAgentIds();
+			for(Long agentId:agentIds){
+				List<Long> ids = channelConsr.getApproveIdList(agentId);
+				if(!ListUtils.isEmpty(ids)){
+					channelIds.addAll(ids);
+				}
+
+			}
+			if(!ListUtils.isEmpty(channelIds)){
+				paramMap.put("channelIds",channelIds);
+			}else{
+				return new PageBean();
+			}
+		}
+
+		if(!ListUtils.isEmpty(bookAnalysic4PCVO.getAdviserIds())){
+			paramMap.put("adviserIds",bookAnalysic4PCVO.getAdviserIds());
+		}
+		if(null != bookAnalysic4PCVO.getIsFundSupport()){
+			paramMap.put("isFundSupport",bookAnalysic4PCVO.getIsFundSupport());
+		}
+		PageBean pageBean = bookDao.listPage(pageParam,paramMap,"getBookAnalysis4PC");
+		if(null != pageBean && !ListUtils.isEmpty(pageBean.getRecordList())){
+			//	设置出版信息
+			bookSet.setAgentInfo4Anlysics(pageBean.getRecordList());
+			//	设置编辑信息
+			bookSet.setAdviserInfo4Anlysics(pageBean.getRecordList());
+			//	设置书刊分类信息
+			bookSet.setTempletName4Anlysics(pageBean.getRecordList());
+			//	设置关联二维码数量
+			bookSet.setBookAssocQRCount(pageBean.getRecordList(),bookAnalysic4PCVO.getStatisTime());
+			//	设置浏览量 设置读者量 扫码平均转化率
+			bookSet.setAnalysicsInfo(pageBean.getRecordList(),bookAnalysic4PCVO.getStatisTime());
+			//	设置累计收益
+            bookSet.setBookIncome4Analysics(pageBean.getRecordList(),bookAnalysic4PCVO.getStatisTime());
+            //设置默认值
+			bookSet.setDefaultValue(pageBean.getRecordList());
+		}
+		return pageBean;
+	}
+
+	@ParamLog(description = "获取书刊信息")
+	@Override
+	public Map<String, BookInfoAnalysicsDTO> getBookInfoBy(List<BookInfoAnalysicsDTO> bookInfoAnalysicsDTOS, String
+			monthDate) throws BizException {
+		Map<String, BookInfoAnalysicsDTO> bookInfoAnalysicsDTOMap = null;
+		if(!ListUtils.isEmpty(bookInfoAnalysicsDTOS)){
+			List<Long> bookIds = Lists.newArrayList();
+			List<Long> adviserIds = Lists.newArrayList();
+			List<Long> channelIds = Lists.newArrayList();
+			for(BookInfoAnalysicsDTO bookInfoAnalysicsDTO:bookInfoAnalysicsDTOS){
+				bookIds.add(bookInfoAnalysicsDTO.getBookId());
+				adviserIds.add(bookInfoAnalysicsDTO.getAdviserId());
+				channelIds.add(bookInfoAnalysicsDTO.getChannelId());
+			}
+			Map<String,Object> paramMap = Maps.newHashMap();
+			if(!ListUtils.isEmpty(bookIds)){
+				paramMap.put("bookIds",bookIds);
+			}
+			if(!ListUtils.isEmpty(adviserIds)){
+				paramMap.put("adviserIds",adviserIds);
+			}
+			if(!ListUtils.isEmpty(channelIds)){
+				paramMap.put("channelIds",channelIds);
+			}
+			if(!StringUtil.isEmpty(monthDate)){
+				paramMap.put("statisTime",monthDate);
+			}
+			List<BookInfoAnalysicsDTO> bookInfoAnalysicsDTOList = bookDao.getBookInfoBy(paramMap);
+			if(!ListUtils.isEmpty(bookInfoAnalysicsDTOList)){
+				bookInfoAnalysicsDTOMap = Maps.newHashMap();
+				for(BookInfoAnalysicsDTO bookInfoAnalysicsDTO:bookInfoAnalysicsDTOList){
+					String key = bookInfoAnalysicsDTO.getBookId()+"_"+bookInfoAnalysicsDTO.getChannelId()+"_"+bookInfoAnalysicsDTO.getAdviserId();
+					bookInfoAnalysicsDTOMap.put(key,bookInfoAnalysicsDTO);
+				}
+			}
+		}
+
+		return bookInfoAnalysicsDTOMap;
+	}
+
 	@Override
 	public Long getBookTempletIdId(Long adviserId, Long channelId, Long bookId) {
 		// 获取图书类型

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

@@ -4,6 +4,7 @@
 package com.pcloud.book.book.dao;
 
 import com.pcloud.book.book.dto.BookDto;
+import com.pcloud.book.book.dto.BookInfoAnalysicsDTO;
 import com.pcloud.book.book.entity.Book;
 import com.pcloud.common.core.dao.BaseDao;
 
@@ -270,4 +271,11 @@ public interface BookDao extends BaseDao<Book> {
 	 */
 	void updateTimeByIds(Map<String, Object> param);
 
+	/**
+	 * 根据条件查询书刊相关信息
+	 * @param param
+	 * @return
+	 */
+	List<BookInfoAnalysicsDTO> getBookInfoBy(Map<String, Object> param);
+
 }

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

@@ -6,6 +6,7 @@ package com.pcloud.book.book.dao.impl;
 import com.google.common.collect.Maps;
 import com.pcloud.book.book.dao.BookDao;
 import com.pcloud.book.book.dto.BookDto;
+import com.pcloud.book.book.dto.BookInfoAnalysicsDTO;
 import com.pcloud.book.book.entity.Book;
 import com.pcloud.common.core.dao.BaseDaoImpl;
 import org.springframework.stereotype.Repository;
@@ -262,4 +263,9 @@ public class BookDaoImpl extends BaseDaoImpl<Book> implements BookDao {
 	public void updateTimeByIds(Map<String, Object> param) {
 		super.getSqlSession().update(super.getStatement("updateTimeByIds"),param);
 	}
+
+	@Override
+	public List<BookInfoAnalysicsDTO> getBookInfoBy(Map<String, Object> param) {
+		return super.getSqlSession().selectList(this.getStatement("getBookInfoBy"),param);
+	}
 }

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

@@ -11,6 +11,7 @@ import com.pcloud.book.book.dto.BookAssocCount;
 import com.pcloud.book.book.dto.BookDto;
 import com.pcloud.book.book.entity.Book;
 import com.pcloud.book.book.facade.BookFacade;
+import com.pcloud.book.book.vo.BookAnalysic4PCVO;
 import com.pcloud.common.dto.ResponseDto;
 import com.pcloud.common.exceptions.BizException;
 import com.pcloud.common.page.PageBean;
@@ -22,9 +23,17 @@ import com.pcloud.common.permission.PermissionException;
 import com.pcloud.common.utils.ListUtils;
 import com.pcloud.common.utils.SessionUtil;
 import com.pcloud.common.utils.cookie.Cookie;
-import org.codehaus.jackson.JsonParseException;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.CookieValue;
+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.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.Produces;
@@ -720,4 +729,14 @@ public class BookFacadeImpl implements BookFacade {
         PageParam pageParam = new PageParam(currentPage, numPerPage);
         return new ResponseDto<>(bookBiz.getBookBaseInfoListByChannelId4Adviser(partyId, channelId, pageParam));
     }
+	@ApiOperation("书刊分析")
+	@PostMapping("getBookAnalysis4PC")
+	public ResponseDto<PageBean> getBookAnalysis4PC(@RequestHeader("token") String token,@RequestBody BookAnalysic4PCVO bookAnalysic4PCVO)throws PermissionException,BizException{
+		if(null == bookAnalysic4PCVO.getCurrentPage() || null == bookAnalysic4PCVO.getNumPerPage()){
+			throw BookBizException.PAGE_PARAM_DELETION;
+		}
+		PageBean pageBean = bookBiz.getBookAnalysis4PC(new PageParam(bookAnalysic4PCVO.getCurrentPage(),bookAnalysic4PCVO.getNumPerPage()),bookAnalysic4PCVO);
+
+		return new ResponseDto<PageBean>(null == pageBean?new PageBean():pageBean);
+	}
 }

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

@@ -18,6 +18,7 @@ import com.pcloud.book.book.biz.BookBiz;
 import com.pcloud.book.book.dto.BookAdviserUpdateTimeDTO;
 import com.pcloud.book.book.dto.BookDetialDTO;
 import com.pcloud.book.book.dto.BookDto;
+import com.pcloud.book.book.dto.BookInfoAnalysicsDTO;
 import com.pcloud.book.book.service.BookService;
 import com.pcloud.common.dto.ResponseDto;
 import com.pcloud.common.exceptions.BizException;
@@ -163,4 +164,12 @@ public class BookServiceImpl implements BookService {
 	public void updateTimeByIds(@RequestBody BookAdviserUpdateTimeDTO bookAdviserUpdateTimeDTO) throws BizException {
 		bookBiz.updateTimeByIds(bookAdviserUpdateTimeDTO);
 	}
+
+	@Override
+	@RequestMapping(value = "/getBookInfoBy", method = RequestMethod.POST)
+	public ResponseEntity<ResponseDto<Map<String, BookInfoAnalysicsDTO>>> getBookInfoBy(@RequestBody List<BookInfoAnalysicsDTO>
+																									bookInfoAnalysicsDTOS,@RequestParam(value = "monthDate",required = false) String monthDate) throws BizException {
+
+		return ResponseHandleUtil.toResponse(bookBiz.getBookInfoBy(bookInfoAnalysicsDTOS,monthDate));
+	}
 }

pcloud-service-book/src/main/java/com/pcloud/book/book/tools/BookTools.java

@@ -3,14 +3,16 @@
  */
 package com.pcloud.book.book.tools;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 import com.google.common.collect.Lists;
 import com.pcloud.book.book.dto.BookDto;
 import com.pcloud.common.exceptions.BizException;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * @描述：
  * @作者：songx
@@ -97,5 +99,22 @@ public class BookTools {
 			}
 		}
 	}
+
+
+	public static boolean isValidDate(String str,String dateFormater) {
+		boolean convertSuccess=true;
+		// 指定日期格式为四位年/两位月份/两位日期，注意yyyy/MM/dd区分大小写；
+		SimpleDateFormat format = new SimpleDateFormat(dateFormater);
+		try {
+			// 设置lenient为false. 否则SimpleDateFormat会比较宽松地验证日期，比如2007/02/29会被接受，并转换成2007/03/01
+			format.setLenient(false);
+			format.parse(str);
+		} catch (ParseException e) {
+			// e.printStackTrace();
+			// 如果throw java.text.ParseException或者NullPointerException，就说明格式不对
+			convertSuccess=false;
+		}
+		return convertSuccess;
+	}
 	
 }

pcloud-service-book/src/main/java/com/pcloud/book/book/vo/BookAnalysic4PCVO.java

+package com.pcloud.book.book.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 平台端书刊分析VO接口类
+ */
+public class BookAnalysic4PCVO implements Serializable {
+
+    @ApiModelProperty("书刊名称")
+    private String bookName;
+    @ApiModelProperty("条形码")
+    private String isbn;
+    @ApiModelProperty("书刊分类")
+    private Long templetId;
+    @ApiModelProperty("只看基金书")
+    private Boolean isFundSupport;
+    @ApiModelProperty("数据统计年月")
+    private String statisTime;
+    @ApiModelProperty("出版社")
+    private List<Long> agentIds;
+    @ApiModelProperty("编辑")
+    private List<Long> adviserIds;
+    @ApiModelProperty("出版社")
+    private Integer numPerPage;
+    @ApiModelProperty("出版社")
+    private Integer currentPage;
+
+    public String getBookName() {
+        return bookName;
+    }
+
+    public void setBookName(String bookName) {
+        this.bookName = bookName;
+    }
+
+    public String getIsbn() {
+        return isbn;
+    }
+
+    public void setIsbn(String isbn) {
+        this.isbn = isbn;
+    }
+
+    public Long getTempletId() {
+        return templetId;
+    }
+
+    public void setTempletId(Long templetId) {
+        this.templetId = templetId;
+    }
+
+    public Boolean getIsFundSupport() {
+        return isFundSupport;
+    }
+
+    public void setIsFundSupport(Boolean isFundSupport) {
+        this.isFundSupport = isFundSupport;
+    }
+
+    public String getStatisTime() {
+        return statisTime;
+    }
+
+    public void setStatisTime(String statisTime) {
+        this.statisTime = statisTime;
+    }
+
+    public List<Long> getAgentIds() {
+        return agentIds;
+    }
+
+    public void setAgentIds(List<Long> agentIds) {
+        this.agentIds = agentIds;
+    }
+
+    public List<Long> getAdviserIds() {
+        return adviserIds;
+    }
+
+    public void setAdviserIds(List<Long> adviserIds) {
+        this.adviserIds = adviserIds;
+    }
+
+    public Integer getNumPerPage() {
+        return numPerPage;
+    }
+
+    public void setNumPerPage(Integer numPerPage) {
+        this.numPerPage = numPerPage;
+    }
+
+    public Integer getCurrentPage() {
+        return currentPage;
+    }
+
+    public void setCurrentPage(Integer currentPage) {
+        this.currentPage = currentPage;
+    }
+
+    @Override
+    public String toString() {
+        return "BookAnalysic4PCVO{" +
+                "bookName='" + bookName + '\'' +
+                ", isbn='" + isbn + '\'' +
+                ", templetId=" + templetId +
+                ", isFundSupport=" + isFundSupport +
+                ", statisTime='" + statisTime + '\'' +
+                ", agentIds=" + agentIds +
+                ", adviserIds=" + adviserIds +
+                ", numPerPage=" + numPerPage +
+                ", currentPage=" + currentPage +
+                '}';
+    }
+}

pcloud-service-book/src/main/java/com/pcloud/book/consumer/analysisengine/BrowseRecordConsr.java

@@ -3,20 +3,21 @@
  */
 package com.pcloud.book.consumer.analysisengine;
 
-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.analysisengine.browse.dto.BrowseCacheRecordDto;
+import com.pcloud.analysisengine.browse.dto.SBookAnalyzeDto;
 import com.pcloud.analysisengine.browse.service.BrowseRecordService;
+import com.pcloud.common.core.aspect.ParamLog;
 import com.pcloud.common.exceptions.BizException;
 import com.pcloud.common.utils.ListUtils;
 import com.pcloud.common.utils.ResponseHandleUtil;
+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;
 
 /**
  * @描述：分析引擎中间件
@@ -114,4 +115,18 @@ public class BrowseRecordConsr {
 		return resultMap;
 	}
 
+	@ParamLog(description = "设置书刊分析读者量、浏览量")
+	public Map<String, SBookAnalyzeDto> getMonthBookPvUvSuScvr(List<SBookAnalyzeDto> sBookAnalyzeDtos,String monthDate){
+		Map<String, SBookAnalyzeDto> sBookAnalyzeDtoMap = null;
+
+		try {
+			sBookAnalyzeDtoMap = ResponseHandleUtil.parseMapResponse(browseRecordService.getMonthBookPvUvSuScvr(sBookAnalyzeDtos,monthDate),String.class,SBookAnalyzeDto.class);
+		} catch (BizException e) {
+			LOGGER.warn("【分析引擎(消)】图书的：读者量、浏览量.[getMonthBookPvUvSuScvr]:" + e.getMessage(), e);
+		} catch (Exception e) {
+			LOGGER.error("【分析引擎(消)】图书的：读者量、浏览量.[getMonthBookPvUvSuScvr]:" + e.getMessage(), e);
+		}
+		return sBookAnalyzeDtoMap;
+	}
+
 }

pcloud-service-book/src/main/java/com/pcloud/book/consumer/channel/QrcodeSceneConsr.java

 /**
- * 
+ *
  */
 package com.pcloud.book.consumer.channel;
 
@@ -136,7 +136,7 @@ public class QrcodeSceneConsr {
 	 * 默认生成二维码以及对应数据
 	 */
 	public Long createDefualtByTemplet(Long templetId, Long channelId, Long adviserId, Long agentId, Long bookId,
-			Long sceneId) throws BizException {
+									   Long sceneId) throws BizException {
 		LOGGER.info("【二维码-渠道(消)】默认生成二维码以及对应数据,<START>.[templetId]=" + templetId + ",[channelId]=" + channelId
 				+ ",[adviserId]=" + adviserId + ",[agentId]=" + agentId + ",[bookId]=" + bookId + ",[sceneId]="
 				+ sceneId);
@@ -289,4 +289,16 @@ public class QrcodeSceneConsr {
 		return count;
 	}
 
+	@ParamLog(description = "批量获取图书关联二维码个数")
+	public Map<String,Long> getBookQRCountByMap(List<BookAssocQRcountRequestVO> bookAssocQRcountRequestVOS,String monthDate)throws BizException{
+		Map<String,Long> countMap = null;
+		try {
+			countMap = ResponseHandleUtil.parseMapResponse(qrcodeSceneService.bookAssosQrcountList(bookAssocQRcountRequestVOS,monthDate),String.class,Long.class);
+		} catch (BizException e) {
+			LOGGER.error("【二维码-渠道(消)】 批量获取图书关联二维码个数[qrcodeSceneService.bookAssosQrcountList],<ERROR>.[create]:" + e.getMessage(),
+					e);
+		}
+		return countMap;
+	}
+
 }

pcloud-service-book/src/main/java/com/pcloud/book/consumer/trade/OrderFormConsr.java

+package com.pcloud.book.consumer.trade;
+
+import com.pcloud.common.core.aspect.ParamLog;
+import com.pcloud.common.exceptions.BizException;
+import com.pcloud.common.utils.ResponseHandleUtil;
+import com.pcloud.facade.tradecenter.dto.BookIncomeQueryVo;
+import com.pcloud.facade.tradecenter.service.OrderFormService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+@Component("orderFormConsr")
+public class OrderFormConsr {
+
+    @Autowired
+    private OrderFormService orderFormService;
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(OrderFormConsr.class);
+
+    @ParamLog(description = "获取图书收益")
+    public Map<String, BigDecimal> getBookIncome(List<BookIncomeQueryVo> bookIncomeQueryVos,String date)throws BizException {
+        Map<String, BigDecimal> incomeMap = null;
+        try {
+            incomeMap = ResponseHandleUtil.parseMapResponse(orderFormService.getBookIncome(bookIncomeQueryVos,date),String.class,BigDecimal.class);
+        } catch (Exception e) {
+            LOGGER.error("[消TRADECENTER.orderFormService.getBookIncome]出现异常，信息为:"+e.getMessage(),e);
+        }
+        return incomeMap;
+    }
+
+}

pcloud-service-book/src/main/java/com/pcloud/book/consumer/user/ChannelConsr.java

@@ -113,4 +113,20 @@ public class ChannelConsr {
         return status;
     }
 
+	/**
+	 * 获取代理下已经审核通过的运营id
+	 * @param agentId
+	 * @return
+	 * @throws BizException
+	 */
+	public List<Long> getApproveIdList(Long agentId)throws BizException{
+		LOGGER.info("获取代理下已经审核通过的运营id,<START>.[agentId]=" + agentId);
+		try {
+			return ResponseHandleUtil.parseListResponse(channelService.getApproveIdList(agentId),Long.class);
+		} catch (Exception e) {
+			LOGGER.error("获取代理下已经审核通过的运营id.[getApproveIdList]:" + e.getMessage(), e);
+			throw new ChannelBizException(ChannelBizException.PARAM_IS_NULL, "运营不存在");
+		}
+	}
+
 }

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

@@ -982,4 +982,128 @@
 			</foreach>
 		</if>
 	</update>
+
+	<!--PC端-获取书刊分析相关信息-->
+	<select id="getBookAnalysis4PC" parameterType="map" resultType="bookAnlysicsDto">
+		SELECT
+			ba.BOOK_ID bookId,
+			b.BOOK_NAME bookName,
+			b.ISBN isbn,
+			ba.ADVISER_ID adviserId,
+			ba.IS_MAIN_EDITOR isMainEditor,
+			ba.CHANNEL_ID channelId,
+			ba.CREATED_DATE createdDate,
+			ba.TEMPLET_ID templetId,
+			IF (
+			ISNULL(BF.BOOK_FUND_ID),
+			0,
+			1
+			) isFundSupport
+		FROM
+			`book_adviser` ba
+		LEFT JOIN book b ON ba.BOOK_ID = b.BOOK_ID
+		LEFT JOIN book_fund bf ON ba.BOOK_ID = bf.BOOK_ID
+			AND
+			<choose>
+				<when test="statisTime != null">
+					bf.END_TIME <![CDATA[ > ]]> DATE_FORMAT(#{statisTime},'yyyy-MM')
+					AND bf.START_TIME <![CDATA[ < ]]> DATE_FORMAT(#{statisTime},'yyyy-MM')
+				</when>
+				<otherwise>
+					BF.END_TIME <![CDATA[ > ]]> NOW() AND BF.START_TIME <![CDATA[ < ]]> NOW()
+				</otherwise>
+			</choose>
+		WHERE
+			ba.IS_DELETE = 0
+		AND
+			b.IS_DELETE = 0
+		<if test="bookName != null">
+			AND (b.BOOK_NAME LIKE CONCAT('%',#{bookName},'%') OR b.ISBN LIKE CONCAT('%',#{bookName},'%'))
+		</if>
+		<if test="templetId != null">
+			AND ba.TEMPLET_ID = #{templetId}
+		</if>
+		<!--<if test="templetIds != null">
+			AND ba.TEMPLET_ID in
+			<foreach collection="templetIds" item="templetId" open="(" separator="," close=")">
+				${templetId}
+			</foreach>
+		</if>-->
+		<if test="channelIds != null">
+			AND
+				ba.CHANNEL_ID in
+			<foreach collection="channelIds" item="channelId" open="(" separator="," close=")">
+				${channelId}
+			</foreach>
+		</if>
+		<if test="adviserIds != null">
+			AND
+			ba.ADVISER_ID in
+			<foreach collection="adviserIds" item="adviserId" open="(" separator="," close=")">
+				${adviserId}
+			</foreach>
+		</if>
+		<if test="isFundSupport != null">
+			AND
+			 bf.BOOK_FUND_ID IS NOT NULL
+		</if>
+		ORDER BY
+			ba.CREATED_DATE DESC
+	</select>
+
+
+	<select id="getBookInfoBy" parameterType="map" resultType="bookInfoAnalysicsDTO">
+		SELECT
+			ba.BOOK_ID bookId,
+			b.BOOK_NAME bookName,
+			b.ISBN isbn,
+			ba.ADVISER_ID adviserId,
+			ba.CHANNEL_ID channelId,
+			ba.CREATED_DATE createdDate,
+			ba.TEMPLET_ID templetId,
+			IF (
+			ISNULL(BF.BOOK_FUND_ID),
+			0,
+			1
+			) isFundSupport
+		FROM
+			`book_adviser` ba
+		LEFT JOIN book b ON ba.BOOK_ID = b.BOOK_ID
+		LEFT JOIN book_fund bf ON ba.BOOK_ID = bf.BOOK_ID
+		AND
+		<choose>
+			<when test="statisTime != null">
+				bf.END_TIME <![CDATA[ > ]]> DATE_FORMAT(#{statisTime},'yyyy-MM')
+				AND bf.START_TIME <![CDATA[ < ]]> DATE_FORMAT(#{statisTime},'yyyy-MM')
+			</when>
+			<otherwise>
+				BF.END_TIME <![CDATA[ > ]]> NOW() AND BF.START_TIME <![CDATA[ < ]]> NOW()
+			</otherwise>
+		</choose>
+		WHERE
+		ba.IS_DELETE = 0
+		AND
+		b.IS_DELETE = 0
+		<if test="channelIds != null">
+			AND
+			ba.CHANNEL_ID in
+			<foreach collection="channelIds" item="item" open="(" separator="," close=")">
+				#{item}
+			</foreach>
+		</if>
+		<if test="adviserIds != null">
+			AND
+			ba.ADVISER_ID in
+			<foreach collection="adviserIds" item="item" open="(" separator="," close=")">
+				#{item}
+			</foreach>
+		</if>
+		<if test="bookIds != null">
+			AND
+			ba.BOOK_ID in
+			<foreach collection="bookIds" item="item" open="(" separator="," close=")">
+				#{item}
+			</foreach>
+		</if>
+	</select>
 </mapper>
\ No newline at end of file

pom.xml

@@ -118,7 +118,8 @@
         <pcloud-facade-comment.version>2.1.0-RELEASE</pcloud-facade-comment.version>
         <pcloud-facade-voicemessage.version>2.1.0-RELEASE</pcloud-facade-voicemessage.version>
         <pcloud-facade-raystask.version>2.1.0-RELEASE</pcloud-facade-raystask.version>
-        <pcloud-facade-contentcenter.version>2.1.0-RELEASE</pcloud-facade-contentcenter.version>
+        <pcloud-facade-contentcenter.version>2.1.0-SNAPSHOT</pcloud-facade-contentcenter.version>
+        <pcloud-facade-tradecenter.version>2.1.0-RELEASE</pcloud-facade-tradecenter.version>
     </properties>
 
     <dependencyManagement>