|
@@ -327,8 +327,17 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
|
|
|
Page<InsPlyIncome> page = baseMapper.getReceivablePage(page1, receivableQueryVo);
|
|
Page<InsPlyIncome> page = baseMapper.getReceivablePage(page1, receivableQueryVo);
|
|
|
List<InsPlyIncomeOrder> res = page.getRecords().stream()
|
|
List<InsPlyIncomeOrder> res = page.getRecords().stream()
|
|
|
.map(action -> new InsPlyIncomeOrder(action.getId(), action.getOrderNo())).toList();
|
|
.map(action -> new InsPlyIncomeOrder(action.getId(), action.getOrderNo())).toList();
|
|
|
- BigDecimal totalAmount = page.getRecords().stream()
|
|
|
|
|
- .map(action -> new BigDecimal(Objects.toString(action.getReceivableAmount(), "0"))).reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
|
|
|
|
|
+ BigDecimal totalAmount = BigDecimal.ZERO;
|
|
|
|
|
+ if ("3".equals(receivableQueryVo.getInvoiceType())){
|
|
|
|
|
+ totalAmount = page.getRecords().stream()
|
|
|
|
|
+ .map(action -> new BigDecimal(Objects.toString(action.getJySuperviseCostsPremiums(), "0"))).reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
|
|
|
+ } else if ("4".equals(receivableQueryVo.getInvoiceType())){
|
|
|
|
|
+ totalAmount = page.getRecords().stream()
|
|
|
|
|
+ .map(action -> new BigDecimal(Objects.toString(action.getJyOtherCostsPremiums(), "0"))).reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
|
|
|
+ }else{
|
|
|
|
|
+ totalAmount = page.getRecords().stream()
|
|
|
|
|
+ .map(action -> new BigDecimal(Objects.toString(action.getReceivableAmount(), "0"))).reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
InsPlyIncomeVO vo = new InsPlyIncomeVO(null, res,Objects.toString(totalAmount,"0"));
|
|
InsPlyIncomeVO vo = new InsPlyIncomeVO(null, res,Objects.toString(totalAmount,"0"));
|
|
|
log.info("获取私有/平台协议手续费应收列表的id集合。receivableQueryVo=[{}]. ids.size=[{}]", JSONUtil.toJsonStr(receivableQueryVo), CollUtil.size(res));
|
|
log.info("获取私有/平台协议手续费应收列表的id集合。receivableQueryVo=[{}]. ids.size=[{}]", JSONUtil.toJsonStr(receivableQueryVo), CollUtil.size(res));
|