Merge branch 'feature/1004450' into 'master'

feat: [1004450] ERP设置权限查看数据，GMV,扫码量，bookid

See merge request rays/pcloud-book!1241

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

@@ -791,6 +791,19 @@ public class BookDto extends BaseDto {
      */
     private Boolean xiaoRuiEducation;
 
+    /**
+     * 书刊销售额
+     */
+    private BigDecimal bookGmv;
+
+    public BigDecimal getBookGmv() {
+        return bookGmv;
+    }
+
+    public void setBookGmv(BigDecimal bookGmv) {
+        this.bookGmv = bookGmv;
+    }
+
     public Boolean getXiaoRuiEducation() {
         return xiaoRuiEducation;
     }

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

@@ -1497,10 +1497,19 @@ public class BookAdviserBizImpl implements BookAdviserBiz {
 				bookDataStatisticsDTO.setAdviserId(bookGroupDTO.getCreateUser());
 				bookDataStatisticsDTO.setBookId(bookGroupDTO.getBookId());
 				bookDataStatisticsDTO.setChannelId(bookGroupDTO.getChannelId());
-				if(groupUserCountDTO != null){
-					bookDataStatisticsDTO.setScanCount(groupUserCountDTO.getCount().longValue());
-					bookDataStatisticsDTO.setUserCount(groupUserCountDTO.getUserCount().longValue());
-				}
+                bookDataStatisticsDTO.setScanCount(0L);
+                bookDataStatisticsDTO.setUserCount(0L);
+                if(groupUserCountDTO != null){
+                    bookDataStatisticsDTO.setScanCount(groupUserCountDTO.getCount().longValue());
+                    bookDataStatisticsDTO.setUserCount(groupUserCountDTO.getUserCount().longValue());
+                }
+				if(resultMap.containsKey(bookDataStatisticsDTO.getBookChannelAdviserId())){
+                    BookDataStatisticsDTO bookDataStatisticsDTO1 = resultMap.get(bookDataStatisticsDTO.getBookChannelAdviserId());
+                    if(null!=bookDataStatisticsDTO1){
+                        bookDataStatisticsDTO.setScanCount(bookDataStatisticsDTO1.getScanCount() + bookDataStatisticsDTO.getScanCount());
+                        bookDataStatisticsDTO.setUserCount(bookDataStatisticsDTO1.getUserCount() + bookDataStatisticsDTO.getUserCount());
+                    }
+                }
 				bookDataStatisticsDTO.setBookCategory(JoinGroupTypeEnum.getBookTypeName(bookGroupDTO.getJoinGroupType()));
 				bookDataStatisticsDTO.setJoinGroupType(bookGroupDTO.getJoinGroupType());
 				/*if(rightsMap.containsKey(bookGroupDTO.getBookId())){

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

@@ -52,6 +52,7 @@ import com.pcloud.book.consumer.label.LabelConsr;
 import com.pcloud.book.consumer.message.MessageConsr;
 import com.pcloud.book.consumer.raystask.MainLineConsr;
 import com.pcloud.book.consumer.resource.ProductConsr;
+import com.pcloud.book.consumer.trade.TradeConsr;
 import com.pcloud.book.consumer.user.*;
 import com.pcloud.book.consumer.wechat.WechatConsr;
 import com.pcloud.book.copyright.biz.BookAuthInfoBiz;
@@ -264,6 +265,8 @@ public class BookBizImpl implements BookBiz {
 
     @Autowired
     private SceneRecordService sceneRecordService;
+    @Autowired
+    private TradeConsr tradeConsr;
     /**
      * 创建书籍,同时建立与编辑的推广关系
      */
@@ -807,6 +810,7 @@ public class BookBizImpl implements BookBiz {
             paramMap.put("adviserIds", bookDetailDTO.getAdviserIds());
             List<BookDto> bookDtos = bookDao.listBookGroupByBookIds(bookDetailDTO.getBookIds(), bookDetailDTO.getChannelIds(),bookDetailDTO.getAdviserIds());
             List<Long> xiaoRuiEducation = channelConsr.isXiaoRuiEducation(bookDetailDTO.getBookIds());
+            Map<Long, BigDecimal> booksGmv = tradeConsr.getBooksGmv(bookDetailDTO.getBookIds());
             if (!ListUtils.isEmpty(bookDtos)) {
                 for (BookDto bookDto : bookDtos) {
                     bookDto.setXiaoRuiEducation(false);
@@ -814,6 +818,9 @@ public class BookBizImpl implements BookBiz {
                     if(CollUtil.isNotEmpty(xiaoRuiEducation) && xiaoRuiEducation.contains(bookDto.getBookId())){
                         bookDto.setXiaoRuiEducation(true);
                     }
+                    if(CollUtil.isNotEmpty(booksGmv) && booksGmv.containsKey(bookDto.getBookId())){
+                        bookDto.setBookGmv(booksGmv.get(bookDto.getBookId()));
+                    }
                 }
             }
         }

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

@@ -312,4 +312,21 @@ public class TradeConsr {
         }
         return new HashMap<>();
     }
+
+    /**
+     * 获取书刊销售额
+     * @param bookIds
+     * @return
+     */
+    public Map<Long, BigDecimal> getBooksGmv(List<Long> bookIds) {
+        if (CollUtil.isEmpty(bookIds)) {
+            return new HashMap<>();
+        }
+        try {
+            return ResponseHandleUtil.parseMap(orderFormService.getBooksGmv(bookIds), Long.class,BigDecimal.class);
+        } catch (Exception e) {
+            LOGGER.error("查询书刊销售额失败.[getBooksGmv]:{}", e.getMessage(), e);
+        }
+        return new HashMap<>();
+    }
 }