|
|
@@ -838,14 +838,15 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
|
|
|
|
|
|
// 应收金额(取第一条)
|
|
|
InsFeeFollowOrder firstFollow = followOrderMap.get(followIds.get(0));
|
|
|
-// BigDecimal receivablePremium = Optional.ofNullable(firstFollow)
|
|
|
-// .map(InsFeeFollowOrder::getReceivablePremium)
|
|
|
-// .orElse(BigDecimal.ZERO);
|
|
|
+ BigDecimal receivablePremium = Optional.ofNullable(firstFollow)
|
|
|
+ .map(InsFeeFollowOrder::getReceivablePremium)
|
|
|
+ .orElse(BigDecimal.ZERO);
|
|
|
// 对账金额
|
|
|
BigDecimal reconciliationAmount = Optional.ofNullable(firstFollow)
|
|
|
.map(InsFeeFollowOrder::getReconciliationAmount)
|
|
|
.orElse(BigDecimal.ZERO);
|
|
|
- vo.setTotalReceivable(reconciliationAmount);
|
|
|
+ vo.setTotalReceivable(receivablePremium);
|
|
|
+ vo.setTotalReconciliationAmount(reconciliationAmount);
|
|
|
|
|
|
// 已开票总额
|
|
|
BigDecimal totalInvoiced = followIds.stream()
|