Merge branch 'erpInter' into 'master'

feat:[none]erp接口加字段

See merge request rays/pcloud-book!1430

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

@@ -1027,7 +1027,8 @@ public class BookAdviserBizImpl implements BookAdviserBiz {
 			List<Long> adviserIds = Lists.newArrayList(setAdviserIds);
 			List<Long> channelIds = Lists.newArrayList(setChannelIds);
 			List<Long> bookIds = Lists.newArrayList(setBookIds);
-
+			Map<String, BookDataStatisticsDTO> stringBookDataStatisticsDTOMap = mapBookDataStatistics(adviserIds, bookIds, channelIds);
+			List<Long> xiaoRuiEducation = channelConsr.isXiaoRuiEducation(bookIds);
 			Map<Long, UserLogin> userLoginInfoMap= new HashMap<>();
 			Map<Long, AdviserBaseInfoDto> adviserAgentMap = new HashMap<>();
 			Map<Long, String> channelNameMap = new HashMap<>();
@@ -1050,6 +1051,20 @@ public class BookAdviserBizImpl implements BookAdviserBiz {
 			}
 			List<Long> list = bookFundBiz.listHaveFundBooks(bookIds);
 			for (ErpAdviserBookVO bookVO : bookVOS) {
+
+				if(bookVO.getAdviserId()!=null &&bookVO.getChannelId()!=null &&bookVO.getBookId()!=null ) {
+					String key = bookVO.getBookId() + "_" + bookVO.getChannelId() + "_" + bookVO.getAdviserId();
+					if(stringBookDataStatisticsDTOMap.containsKey(key)){
+						BookDataStatisticsDTO bookDataStatisticsDTO = stringBookDataStatisticsDTOMap.get(key);
+						bookVO.setScanCount(bookDataStatisticsDTO.getScanCount().intValue());
+						bookVO.setUserCount(bookDataStatisticsDTO.getUserCount().intValue());
+					}
+				}
+				if(bookVO.getBookId()!=null){
+					if(xiaoRuiEducation.contains(bookVO.getBookId())){
+						bookVO.setXiaoRuiEducation(1);
+					}
+				}
 				Long adviserId = bookVO.getAdviserId();
 				if(adviserId != null && MapUtils.isNotEmpty(userLoginInfoMap) && userLoginInfoMap.containsKey(adviserId)) {
 					UserLogin userLogin = userLoginInfoMap.get(adviserId);

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

@@ -60,4 +60,8 @@ public class ErpAdviserBookVO implements Serializable {
     @ApiModelProperty("手机号")
     private String phoneNum;
 
+    private int scanCount;
+    private int userCount;
+    private int xiaoRuiEducation;
+
 }