|
|
@@ -1217,7 +1217,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
|
|
|
newVo.setTotalReceivable(totalOtherReceivable);
|
|
|
newVo.setInvoiceType(invoiceType);
|
|
|
newVo.setTotalInvoiced(BigDecimal.ZERO);
|
|
|
- newVo.setTotalUnInvoiced(BigDecimal.ZERO);
|
|
|
+ newVo.setTotalUnInvoiced(totalOtherReceivable);
|
|
|
newVo.setTotalSettlementAmount(BigDecimal.ZERO);
|
|
|
newVo.setTotalUnSettlementAmount(BigDecimal.ZERO);
|
|
|
|
|
|
@@ -1231,6 +1231,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
|
|
|
if (CollUtil.isNotEmpty(insFeeFollowOrderReconciliations)){
|
|
|
InsFeeFollowOrderReconciliation insFeeFollowOrderReconciliation = CollUtil.getFirst(insFeeFollowOrderReconciliations);
|
|
|
newVo.setTotalReconciliationAmount(insFeeFollowOrderReconciliation.getReconciliationAmount());
|
|
|
+ newVo.setTotalUnInvoiced(insFeeFollowOrderReconciliation.getReconciliationAmount());
|
|
|
}
|
|
|
|
|
|
newVo.setCompanyName(getCompanyName(partnerCompanyId, companyMap));
|
|
|
@@ -4622,7 +4623,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
|
|
|
vo.setPartnerCompanyId(partnerCompanyId);
|
|
|
vo.setReceivablePremium(receivable);
|
|
|
vo.setInvoiced(invoiced);
|
|
|
- vo.setUninvoiced(BigDecimal.ZERO);
|
|
|
+ vo.setUninvoiced(receivable);
|
|
|
|
|
|
// --- 查询数据库获取对账信息 ---
|
|
|
// 构造查询条件:年、月、合作方ID
|