|
@@ -2834,8 +2834,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
|
|
|
vo.setPartnerCompanyId(partnerCompanyId);
|
|
vo.setPartnerCompanyId(partnerCompanyId);
|
|
|
vo.setReceivablePremium(receivable);
|
|
vo.setReceivablePremium(receivable);
|
|
|
vo.setInvoiced(invoiced);
|
|
vo.setInvoiced(invoiced);
|
|
|
- // 未开票金额 = 应收保费 - 已开票金额
|
|
|
|
|
- vo.setUninvoiced(receivable.subtract(invoiced));
|
|
|
|
|
|
|
+ vo.setUninvoiced(BigDecimal.ZERO);
|
|
|
|
|
|
|
|
// --- 查询数据库获取对账信息 ---
|
|
// --- 查询数据库获取对账信息 ---
|
|
|
// 构造查询条件:年、月、合作方ID
|
|
// 构造查询条件:年、月、合作方ID
|
|
@@ -2850,6 +2849,9 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
|
|
|
vo.setReconciliationAmount(dbOrder.getReconciliationAmount());
|
|
vo.setReconciliationAmount(dbOrder.getReconciliationAmount());
|
|
|
vo.setFalselyIncreasedDifference(dbOrder.getFalselyIncreasedDifference());
|
|
vo.setFalselyIncreasedDifference(dbOrder.getFalselyIncreasedDifference());
|
|
|
vo.setFalselyIncreasedReason(dbOrder.getFalselyIncreasedReason());
|
|
vo.setFalselyIncreasedReason(dbOrder.getFalselyIncreasedReason());
|
|
|
|
|
+ // 未开票金额 = 应收保费 - 已开票金额,这是原逻辑
|
|
|
|
|
+ // 现在按wwq的要求改成:未开票金额 = 对账金额 - 已开票金额
|
|
|
|
|
+ vo.setUninvoiced(dbOrder.getReconciliationAmount().subtract(invoiced));
|
|
|
} else {
|
|
} else {
|
|
|
// 数据库无记录,使用默认值或DTO里的值
|
|
// 数据库无记录,使用默认值或DTO里的值
|
|
|
vo.setReconciliationAmount(null);
|
|
vo.setReconciliationAmount(null);
|