소스 검색

1.平台结算编辑添加手续费金额 跟单费金额

wuhp 2 년 전
부모
커밋
1aabb54cba

+ 7 - 1
src/main/java/com/ydtech/modules/fnc/service/impl/InsPlyIncomeServiceImpl.java

@@ -1350,11 +1350,17 @@ handlingProportion,
             insPlyIncome.setOtherFeerate(this.calculateTotal(jqOtherCostsProportion, syOtherCostsProportion, noOtherCostsProportion));
             //跟单费比例
             insPlyIncome.setAllFeeValue(this.calculateTotal(insPlyIncome.getCommissionFeevalue(), insPlyIncome.getOtherFeevalue(), null)); // 总费用 =  手续费+跟单费
+            insPlyIncome.setReceivableAmount(this.calculateTotal(insPlyIncome.getCommissionFeevalue(), insPlyIncome.getOtherFeevalue(), null));
             //应收比例 交强应收比例=交强手续费比例+交强非跟单比例
             insPlyIncome.setJqReceivableProportion(this.calculateTotal(jqSuperviseCostsProportion, jqOtherCostsProportion, null)); //交强应收
             insPlyIncome.setSyReceivableProportion(this.calculateTotal(sySuperviseCostsProportion, syOtherCostsProportion, null)); //商业应收
             insPlyIncome.setNoReceivableProportion(this.calculateTotal(noSuperviseCostsProportion, noOtherCostsProportion, null)); //非车应收
-
+            if(insPlyIncomeVo.getPtCommissionFeevalue()!=null  &&  insPlyIncomeVo.getPtCommissionFeevalue().compareTo(BigDecimal.ZERO) >0){
+                insPlyIncome.setCommissionFeevalue(insPlyIncomeVo.getPtCommissionFeevalue());
+            }
+            if(insPlyIncomeVo.getPtOtherFeevalue()!=null  &&  insPlyIncomeVo.getPtOtherFeevalue().compareTo(BigDecimal.ZERO) >0){
+                insPlyIncome.setOtherFeevalue(insPlyIncomeVo.getPtOtherFeevalue());
+            }
         } else {
             BigDecimal divisor = new BigDecimal("1.06"); // 最好是使用字符串来避免精度损失
             BigDecimal jqNoTaxPremium = insPlyIncomeVo.getJqPremium();// 交强手续费  按照思路  交强不含税保费* 交强手续费比例  =交强手续费

+ 6 - 0
src/main/java/com/ydtech/modules/fnc/vo/InsPlyIncomeVo.java

@@ -398,4 +398,10 @@ public class InsPlyIncomeVo implements Serializable {
     @ApiModelProperty("是否外部订单")
     private String isExternal;
 
+
+    @ApiModelProperty("平台手续费金额编辑")
+    private BigDecimal ptCommissionFeevalue;
+
+    @ApiModelProperty("平台其他费用金额编辑")
+    private BigDecimal ptOtherFeevalue;
 }