|
|
@@ -1483,22 +1483,23 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
|
|
|
|
|
|
// 私有手续费 应收金额
|
|
|
// 交强的总手续费(jq_commission_premium) + 商业的总手续费(sy_commission_premium)
|
|
|
- BigDecimal result = switch (invoiceType) {
|
|
|
- case "1" -> jqCommissionPremium.add(syCommissionPremium);
|
|
|
- case "2" ->
|
|
|
+ InvoiceTypeEnum invoiceTypeEnum = InvoiceTypeEnum.getByCode(invoiceType);
|
|
|
+ BigDecimal result = switch (invoiceTypeEnum) {
|
|
|
+ case FEE_1 -> jqCommissionPremium.add(syCommissionPremium);
|
|
|
+ case FEE_2 ->
|
|
|
// 交强的总跟单费(jq_follow_premium) + 商业的总跟单费(sy_follow_premium)
|
|
|
jqFollowPremium.add(syFollowPremium);
|
|
|
- case "3" ->
|
|
|
+ case FEE_3 ->
|
|
|
// 驾意险的总手续费(jy_commission_premium)
|
|
|
jyCommissionPremium;
|
|
|
- case "4" ->
|
|
|
+ case FEE_4 ->
|
|
|
// 驾意险的总跟单费(jy_follow_premium)
|
|
|
jyFollowPremium;
|
|
|
- case "5" ->
|
|
|
- // 现在平台不区分车险非车险了,所以都统计到一起
|
|
|
+ case FEE_5 ->
|
|
|
+ // 现在平台不区分车险非车险了,所以都统计到一起
|
|
|
// 交强的总手续费(jq_commission_premium) + 商业的总手续费(sy_commission_premium) + 交强的总跟单费(jq_follow_premium) + 商业的总跟单费(sy_follow_premium) + 驾意险的总手续费(jy_commission_premium) + 驾意险的总跟单费(jy_follow_premium)
|
|
|
jqCommissionPremium.add(syCommissionPremium).add(jqFollowPremium).add(syFollowPremium).add(jyCommissionPremium).add(jyFollowPremium);
|
|
|
- case "6" ->
|
|
|
+ case FEE_6 ->
|
|
|
// 驾意险的总手续费(jy_commission_premium) + 驾意险的总跟单费(jy_follow_premium)
|
|
|
jyCommissionPremium.add(jyFollowPremium);
|
|
|
default -> null;
|