Commit 9af44ce4 by daixing

fix 资源收益

parent c1a8a019
...@@ -1158,7 +1158,11 @@ public class BookGroupBizImpl implements BookGroupBiz { ...@@ -1158,7 +1158,11 @@ public class BookGroupBizImpl implements BookGroupBiz {
e.setTotalSale(BigDecimal.ZERO); e.setTotalSale(BigDecimal.ZERO);
} }
e.setType("APP"); e.setType("APP");
e.setTotalIncome(rescourceIncome.get(e.getRescourceId())); if (null == rescourceIncome.get(e.getRescourceId())){
e.setTotalIncome(BigDecimal.ZERO);
}else {
e.setTotalIncome(rescourceIncome.get(e.getRescourceId()));
}
}); });
}else { }else {
productDtoMap = productConsr.getProBasesByIds(rescourceIds); productDtoMap = productConsr.getProBasesByIds(rescourceIds);
...@@ -1167,7 +1171,11 @@ public class BookGroupBizImpl implements BookGroupBiz { ...@@ -1167,7 +1171,11 @@ public class BookGroupBizImpl implements BookGroupBiz {
e.setRescourceName(productDtoMap.get(e.getRescourceId()).getProductName()); e.setRescourceName(productDtoMap.get(e.getRescourceId()).getProductName());
} }
e.setType("PRODUCT"); e.setType("PRODUCT");
e.setTotalIncome(rescourceIncome.get(e.getRescourceId())); if (null == rescourceIncome.get(e.getRescourceId())){
e.setTotalIncome(BigDecimal.ZERO);
}else {
e.setTotalIncome(rescourceIncome.get(e.getRescourceId()));
}
if (!MapUtils.isEmpty(saleDetail4Group) && null != saleDetail4Group.get(e.getRescourceId())){ if (!MapUtils.isEmpty(saleDetail4Group) && null != saleDetail4Group.get(e.getRescourceId())){
e.setSaleCount(saleDetail4Group.get(e.getRescourceId()).getSaleCount()); e.setSaleCount(saleDetail4Group.get(e.getRescourceId()).getSaleCount());
e.setTotalSale(new BigDecimal(saleDetail4Group.get(e.getRescourceId()).getSaleMoney())); e.setTotalSale(new BigDecimal(saleDetail4Group.get(e.getRescourceId()).getSaleMoney()));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment