|
@@ -128,8 +128,10 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
|
|
|
private static final String JY_INVOICING_COMMISSION_LOCK = "JY_INVOICING_COMMISSION_LOCK:";
|
|
private static final String JY_INVOICING_COMMISSION_LOCK = "JY_INVOICING_COMMISSION_LOCK:";
|
|
|
// 驾意险跟单费结算所
|
|
// 驾意险跟单费结算所
|
|
|
private static final String JY_INVOICING_OTHER_LOCK = "JY_INVOICING_OTHER_LOCK:";
|
|
private static final String JY_INVOICING_OTHER_LOCK = "JY_INVOICING_OTHER_LOCK:";
|
|
|
- // 驾意险跟单费结算所
|
|
|
|
|
|
|
+ // 平台车险结算锁
|
|
|
private static final String PT_INVOICING_COMMISSION_LOCK = "PT_INVOICING_COMMISSION_LOCK:";
|
|
private static final String PT_INVOICING_COMMISSION_LOCK = "PT_INVOICING_COMMISSION_LOCK:";
|
|
|
|
|
+ // 平台非车险结算锁
|
|
|
|
|
+ private static final String PT_INVOICING_OTHER_LOCK = "PT_INVOICING_OTHER_LOCK:";
|
|
|
|
|
|
|
|
|
|
|
|
|
// @Override
|
|
// @Override
|
|
@@ -497,6 +499,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
|
|
|
return false;
|
|
return false;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ // 开票类型 1、手续费 2、跟单费 3、驾意险手续费 4、驾意险跟单费 5、平台应收-车险 6、平台应收-非车险
|
|
|
// 3. 根据开票类型获取Redis锁前缀
|
|
// 3. 根据开票类型获取Redis锁前缀
|
|
|
String redisKeyPrefix = switch (invoicingVo.getInvoiceType()) {
|
|
String redisKeyPrefix = switch (invoicingVo.getInvoiceType()) {
|
|
|
case "1" -> CAR_INVOICING_COMMISSION_LOCK;
|
|
case "1" -> CAR_INVOICING_COMMISSION_LOCK;
|
|
@@ -504,6 +507,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
|
|
|
case "3" -> JY_INVOICING_COMMISSION_LOCK;
|
|
case "3" -> JY_INVOICING_COMMISSION_LOCK;
|
|
|
case "4" -> JY_INVOICING_OTHER_LOCK;
|
|
case "4" -> JY_INVOICING_OTHER_LOCK;
|
|
|
case "5" -> PT_INVOICING_COMMISSION_LOCK;
|
|
case "5" -> PT_INVOICING_COMMISSION_LOCK;
|
|
|
|
|
+ case "6" -> PT_INVOICING_OTHER_LOCK;
|
|
|
default -> throw new SystemException("不支持的开票类型");
|
|
default -> throw new SystemException("不支持的开票类型");
|
|
|
};
|
|
};
|
|
|
|
|
|
|
@@ -620,7 +624,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
|
|
|
invoice.setId(IdGenerate.nextId());
|
|
invoice.setId(IdGenerate.nextId());
|
|
|
invoice.setCompanyId(invoicingVo.getCompanyId());
|
|
invoice.setCompanyId(invoicingVo.getCompanyId());
|
|
|
invoice.setInvoiceType(invoicingVo.getInvoiceType());
|
|
invoice.setInvoiceType(invoicingVo.getInvoiceType());
|
|
|
- // 开票类型 1、手续费 2、跟单费 3、驾意险手续费 4、驾意险跟单费 5、平台应收
|
|
|
|
|
|
|
+ // 开票类型 1、手续费 2、跟单费 3、驾意险手续费 4、驾意险跟单费 5、平台应收-车险 6、平台应收-非车险
|
|
|
if("1".equals(invoicingVo.getInvoiceType()) || "2".equals(invoicingVo.getInvoiceType())){
|
|
if("1".equals(invoicingVo.getInvoiceType()) || "2".equals(invoicingVo.getInvoiceType())){
|
|
|
invoice.setInvoiceRiskType("10");
|
|
invoice.setInvoiceRiskType("10");
|
|
|
}else if("5".equals(invoicingVo.getInvoiceType())){
|
|
}else if("5".equals(invoicingVo.getInvoiceType())){
|
|
@@ -710,7 +714,7 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
|
|
|
// 获取应收的金额
|
|
// 获取应收的金额
|
|
|
InsPlyIncomeInvoice insPlyIncomeInvoice = insPlyIncomeInvoiceMapper.selectById(settlementVo.getInvoicingId());
|
|
InsPlyIncomeInvoice insPlyIncomeInvoice = insPlyIncomeInvoiceMapper.selectById(settlementVo.getInvoicingId());
|
|
|
AssertionUtils.isFail(Objects.isNull(insPlyIncomeInvoice), "发票数据不存在");
|
|
AssertionUtils.isFail(Objects.isNull(insPlyIncomeInvoice), "发票数据不存在");
|
|
|
- // 实际已经收的了金额
|
|
|
|
|
|
|
+ // 实际已经收了的金额
|
|
|
BigDecimal actualReceivedAmount = this.getInvoicingAmount(settlementVo.getInvoicingId());
|
|
BigDecimal actualReceivedAmount = this.getInvoicingAmount(settlementVo.getInvoicingId());
|
|
|
|
|
|
|
|
// 所有需要结算的金额
|
|
// 所有需要结算的金额
|