费用校验-审核订单时 添加 调整费用比例功能

src/main/java/com/ydtech/modules/fee/service/impl/FeeRuleSchemeServiceImpl.java

@@ -1313,6 +1313,7 @@ public class FeeRuleSchemeServiceImpl implements FeeRuleSchemeService {
         OrderFeeVo jqOrderFeeVo = new OrderFeeVo();
         OrderFeeVo syOrderFeeVo = new OrderFeeVo();
         OrderFeeVo fcOrderFeeVo = new OrderFeeVo();
+        AdjustFeeDescVo adjustFeeDescVo=new AdjustFeeDescVo();//费用审核时使用
         InsAreaCompany insAreaCompany = insAreaCompanyService.getByIdIsExist(companyId);
         InsFeeOrder insFeeOrder = insFeeOrderService.getByInsOrderNo(insAreaCompany.getId());
 
@@ -1355,6 +1356,23 @@ public class FeeRuleSchemeServiceImpl implements FeeRuleSchemeService {
             queryOrderFeeVo.setSyCoderFeeVo(syOrderFeeVo);
             queryOrderFeeVo.setFcCoderFeeVo(fcOrderFeeVo);
             queryOrderFeeVo.setOrderCommissionVo(orderCommissionVo);
+            //添加费用审核时 使用参数
+            adjustFeeDescVo.setJqPremium(convertToString(insFeeOrder.getJqNoTaxPremium()));
+            adjustFeeDescVo.setJqCommissionRate(convertToString(insFeeOrder.getJqSuperviseCostsProportion()));
+            adjustFeeDescVo.setJqCommissionAmount(convertToString(insFeeOrder.getJqSuperviseCostsPremiums()));
+            adjustFeeDescVo.setJqOtherFeeRate(convertToString(insFeeOrder.getJqCostsProportion().subtract(insFeeOrder.getJqSuperviseCostsProportion())));
+            adjustFeeDescVo.setJqOtherFeeAmount(convertToString(insFeeOrder.getJqCostsPremiums().subtract(insFeeOrder.getJqSuperviseCostsPremiums())));
+            adjustFeeDescVo.setJqAllFeeRate(convertToString(insFeeOrder.getJqCostsProportion()));
+            adjustFeeDescVo.setJqAllFeeAmount(convertToString(insFeeOrder.getJqCostsPremiums()));
+
+            adjustFeeDescVo.setSyPremium(convertToString(insFeeOrder.getSyNoTaxPremium()));
+            adjustFeeDescVo.setSyCommissionRate(convertToString(insFeeOrder.getSySuperviseCostsProportion()));
+            adjustFeeDescVo.setSyCommissionAmount(convertToString(insFeeOrder.getSySuperviseCostsPremiums()));
+            adjustFeeDescVo.setSyOtherFeeRate(convertToString(insFeeOrder.getSyCostsProportion().subtract(insFeeOrder.getSySuperviseCostsProportion())));
+            adjustFeeDescVo.setSyOtherFeeAmount(convertToString(insFeeOrder.getSyCostsPremiums().subtract(insFeeOrder.getSySuperviseCostsPremiums())));
+            adjustFeeDescVo.setSyAllFeeRate(convertToString(insFeeOrder.getSyCostsProportion()));
+            adjustFeeDescVo.setSyAllFeeAmount(convertToString(insFeeOrder.getSyCostsPremiums()));
+            queryOrderFeeVo.setAdjustFeeDescVo(adjustFeeDescVo);
         }
         return queryOrderFeeVo;
     }

src/main/java/com/ydtech/modules/order/entity/vo/AdjustFeeDescVo.java

@@ -0,0 +1,39 @@
+package com.ydtech.modules.order.entity.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AdjustFeeDescVo {
+
+    @ApiModelProperty("交强总费用比例")
+    private String jqAllFeeRate;
+    @ApiModelProperty("交强手续费比例")
+    private String jqCommissionRate;
+    @ApiModelProperty("交强跟单费比例")
+    private String jqOtherFeeRate;
+    @ApiModelProperty("交强保费")
+    private String jqPremium;
+    @ApiModelProperty("交强总费用金额")
+    private String jqAllFeeAmount;
+    @ApiModelProperty("交强手续费金额")
+    private String jqCommissionAmount;
+    @ApiModelProperty("交强跟单费金额")
+    private String jqOtherFeeAmount;
+
+    @ApiModelProperty("商业总费用比例")
+    private String syAllFeeRate;
+    @ApiModelProperty("商业手续费比例")
+    private String syCommissionRate;
+    @ApiModelProperty("商业跟单费比例")
+    private String syOtherFeeRate;
+    @ApiModelProperty("商业保费")
+    private String syPremium;
+    @ApiModelProperty("交强总费用金额")
+    private String syAllFeeAmount;
+    @ApiModelProperty("交强手续费金额")
+    private String syCommissionAmount;
+    @ApiModelProperty("交强跟单费金额")
+    private String syOtherFeeAmount;
+
+}

src/main/java/com/ydtech/modules/order/entity/vo/OrderVo.java

@@ -346,4 +346,9 @@ public class OrderVo implements Serializable {
      */
     private QueryOrderCommissionVo orderCommissionVo;
 
+    /**
+     * 费用审核时调整费用使用
+     */
+    private AdjustFeeDescVo adjustFeeDescVo;
+
 }

src/main/java/com/ydtech/modules/order/entity/vo/QueryOrderFeeVo.java

@@ -22,6 +22,8 @@ public class QueryOrderFeeVo implements Serializable {
     private OrderFeeVo fcCoderFeeVo;
     @JsonProperty("orderCommissionVo")
     private QueryOrderCommissionVo orderCommissionVo;
+    @JsonProperty("adjustFeeDescVo")
+    private AdjustFeeDescVo adjustFeeDescVo;
 
 
 }

src/main/java/com/ydtech/modules/order/service/impl/InsOrdersServiceImpl.java

@@ -495,7 +495,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         //新增费用明细信息
         QueryOrderFeeVo queryOrderFeeVo = feeRuleSchemeService.queryFeeOrderInfo(companyId);
         orderAndAreaCompany.setOrderCommissionVo(queryOrderFeeVo.getOrderCommissionVo());
-
+        orderAndAreaCompany.setAdjustFeeDescVo(queryOrderFeeVo.getAdjustFeeDescVo());
         boolean isShowOrderFee = false;
         //如果是财务菜单进入的，不再进行权限控制，所有都可查看
         if ("accountingUser".equals(userId)) {