1002881 平台端资源管理-书刊管理收益优化

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

@@ -649,6 +649,9 @@ public class BookDto extends BaseDto {
     @ApiModelProperty("目的标签名称")
     private String purLabelName;
 
+    @ApiModelProperty("书刊所有收益")
+    private BigDecimal allBookIncome;
+
     public Integer getIsOpenRobotProcess() {
         return isOpenRobotProcess;
     }
@@ -1770,6 +1773,14 @@ public class BookDto extends BaseDto {
         this.purLabelName = purLabelName;
     }
 
+    public BigDecimal getAllBookIncome() {
+        return allBookIncome;
+    }
+
+    public void setAllBookIncome(BigDecimal allBookIncome) {
+        this.allBookIncome = allBookIncome;
+    }
+
     @Override
     public String toString() {
         return "BookDto{" +
@@ -1903,6 +1914,9 @@ public class BookDto extends BaseDto {
                 ", proLabelName='" + proLabelName + '\'' +
                 ", depLabelName='" + depLabelName + '\'' +
                 ", purLabelName='" + purLabelName + '\'' +
-                '}';
+                ", allBookIncome=" + allBookIncome +
+                ", isOpenRobotProcess=" + isOpenRobotProcess +
+                ", classifyId=" + classifyId +
+                "} " + super.toString();
     }
 }

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

@@ -79,6 +79,7 @@ import com.pcloud.resourcecenter.product.dto.SpecificationDto;
 import com.pcloud.settlementcenter.pay.constants.PayConstant;
 import com.pcloud.settlementcenter.record.dto.AgentBookIncomeDTO;
 import com.pcloud.settlementcenter.record.dto.AgentBookIncomeParamDTO;
+import com.pcloud.settlementcenter.record.dto.AllBookIncomeParamDTO;
 import com.pcloud.settlementcenter.record.dto.BookIncomeDto;
 import com.pcloud.usercenter.common.dto.BookCaseParamDto;
 import com.pcloud.usercenter.party.adviser.dto.AdviserBaseInfoDto;
@@ -1457,6 +1458,11 @@ public class BookSet {
             return;
         }
         Map<String, BigDecimal> incomeMap = bookConsr.getBookIncome(bookIdList, channelIdList, adviserIdList);
+        AllBookIncomeParamDTO paramDTO=new AllBookIncomeParamDTO();
+        paramDTO.setBookIds(bookIdList);
+        paramDTO.setAdviserIds(adviserIdList);
+        paramDTO.setChannelIds(channelIdList);
+        Map<String, BigDecimal> getAllBookIncome = settlementConsr.getAllBookIncome(paramDTO);
         // 设置图书收益，如果没有查到，则默认图书总收益为0
         if (incomeMap != null && !incomeMap.isEmpty()) {
             for (Object obj : recordList) {
@@ -1470,6 +1476,8 @@ public class BookSet {
                     bookDto.setIncome(new BigDecimal(0));
                 }
                 bookDto.setIncome(income);
+                BigDecimal allBookIncome = getAllBookIncome.get(key);
+                bookDto.setAllBookIncome(allBookIncome != null ? allBookIncome : BigDecimal.ZERO);
             }
         }
     }

pcloud-service-book/src/main/java/com/pcloud/book/consumer/settlement/SettlementConsr.java

@@ -8,6 +8,7 @@ import com.pcloud.common.utils.ListUtils;
 import com.pcloud.common.utils.ResponseHandleUtil;
 import com.pcloud.settlementcenter.record.dto.AgentBookIncomeDTO;
 import com.pcloud.settlementcenter.record.dto.AgentBookIncomeParamDTO;
+import com.pcloud.settlementcenter.record.dto.AllBookIncomeParamDTO;
 import com.pcloud.settlementcenter.record.dto.ProductStaticUnderAppMapDTO;
 import com.pcloud.settlementcenter.record.dto.ResourcesStatisticVO;
 import com.pcloud.settlementcenter.record.service.BookService;
@@ -110,4 +111,20 @@ public class SettlementConsr {
 		}
 		return agentBookIncomeDTO;
 	}
+
+	@ParamLog("获取书刊收益")
+	public Map<String, BigDecimal> getAllBookIncome(AllBookIncomeParamDTO paramDTO) throws BizException {
+		Map<String, BigDecimal> map = new HashMap<>();
+		if (paramDTO == null || ListUtils.isEmpty(paramDTO.getBookIds())
+				|| ListUtils.isEmpty(paramDTO.getAdviserIds())
+				|| ListUtils.isEmpty(paramDTO.getChannelIds())) {
+			return map;
+		}
+		try {
+			map = ResponseHandleUtil.parseMapResponse(settlementService.getAllBookIncome(paramDTO), String.class, BigDecimal.class);
+		} catch (Exception e) {
+			LOGGER.error("获取书刊收益.[getAllBookIncome]:" + e.getMessage(), e);
+		}
+		return map;
+	}
 }