ins_fee_order_new 新增出口费用字段

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

@@ -46,22 +46,14 @@ import java.util.stream.Collectors;
 public class FeeRuleSchemeServiceImpl implements FeeRuleSchemeService {
     @Resource
     private PtlAgreementProductCostsService ptlAgreementProductCostsService;
-    @Resource
-    private InsOrdersService insOrdersService;
+
     @Resource
     private InsFeeOrderService insFeeOrderService;
     @Resource
     private InsCopyFeeOrderService insCopyFeeOrderService;
     @Resource
     private SysUserService sysUserService;
-    @Resource
-    private SysDeptService sysDeptService;
-    @Resource
-    private EsmRetailService esmRetailService;
-    @Resource
-    private EsmUserReferrerService esmUserReferrerService;
-    @Resource
-    private InsAreaCompanyService insAreaCompanyService;
+
     @Resource
     private PtlAgreementService ptlAgreementService;
     @Resource

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

@@ -340,6 +340,37 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
 
         //endregion
 
+        //region 出口费用
+
+        //交强出口手续费比例
+        FeeOrderNewVo.ExportFee jqExportFee = feeRuleSchemeService.calcExportFee(insFeeOrderNew.getJqPremium(), insFeeOrderNew.getJqCostsExportProportion(),
+                insFeeOrderNew.getJqCostsProportion(), jqDeptRadio, retailRadio, taxRadio);
+
+        //商业出口手续费比例
+        FeeOrderNewVo.ExportFee syExportFee = feeRuleSchemeService.calcExportFee(insFeeOrderNew.getSyPremium(), insFeeOrderNew.getSyCostsExportProportion(),
+                insFeeOrderNew.getSyCostsProportion(), syDeptRadio, retailRadio, taxRadio);
+
+        //交强出口手续费比例
+        FeeOrderNewVo.ExportFee noExportFee = feeRuleSchemeService.calcExportFee(insFeeOrderNew.getNoPremium(), insFeeOrderNew.getNoCostsExportProportion(),
+                insFeeOrderNew.getNoCostsProportion(), noDeptRadio, retailRadio, taxRadio);
+
+        //出口手续费用
+        insFeeOrderNew.setJqExportSuperviseCostsPremiums(jqExportFee.getSuperviseCostsPremiums());
+        insFeeOrderNew.setSyExportSuperviseCostsPremiums(syExportFee.getSuperviseCostsPremiums());
+        insFeeOrderNew.setNoExportSuperviseCostsPremiums(noExportFee.getSuperviseCostsPremiums());
+
+        //出口其他费用比例
+        insFeeOrderNew.setJqExportOtherCostsProportion(jqExportFee.getOtherCostsProportion());
+        insFeeOrderNew.setSyExportOtherCostsProportion(syExportFee.getOtherCostsProportion());
+        insFeeOrderNew.setNoExportOtherCostsProportion(noExportFee.getOtherCostsProportion());
+
+        //出口其他费用
+        insFeeOrderNew.setJqExportOtherCostsPremiums(jqExportFee.getOtherCostsPremiums());
+        insFeeOrderNew.setSyExportOtherCostsPremiums(syExportFee.getOtherCostsPremiums());
+        insFeeOrderNew.setNoExportOtherCostsPremiums(noExportFee.getOtherCostsPremiums());
+
+        //endregion
+
 
         insFeeOrderNewService.saveOrUpdate(insFeeOrderNew);
     }

src/main/java/com/ydtech/modules/fnc/service/impl/InsFeeAuditServiceImpl.java

@@ -13,6 +13,7 @@ import com.ydtech.modules.admin.model.vo.SysUserBaseVO;
 import com.ydtech.modules.admin.service.*;
 import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.esm.service.EsmUserReferrerService;
+import com.ydtech.modules.fee.service.FeeRuleSchemeNewService;
 import com.ydtech.modules.fnc.dao.FncInsAreaCompanyMapper;
 import com.ydtech.modules.fnc.dao.InsPlyIncomeMapper;
 import com.ydtech.modules.fnc.entity.InsFeeAudit;
@@ -32,6 +33,8 @@ import com.ydtech.modules.fnc.entity.InsAreaCompany;
 import com.ydtech.modules.order.entity.InsFeeOrder;
 import com.ydtech.modules.order.entity.InsOrders;
 import com.ydtech.modules.order.service.InsFeeOrderService;
+import com.ydtech.modules.protocol.entity.po.PtlAgreement;
+import com.ydtech.modules.protocol.service.PtlAgreementService;
 import com.ydtech.modules.protocols.entity.po.InsFeeOrderNew;
 import com.ydtech.modules.protocols.service.InsFeeOrderNewService;
 import com.ydtech.utils.DateUtil;
@@ -63,8 +66,6 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
     private final InsOrdersMapper insOrdersMapper;
     private final InsPlyIncomeMapper insPlyIncomeMapper;
 
-    private final InsFeeOrderService insFeeOrderService;
-
     private final FncInsAreaCompanyMapper insAreaCompanyMapper;
 
     private final InsDeptFeeService insDeptFeeService;
@@ -90,11 +91,13 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
     @Autowired
     private InsPlyIncomeService insPlyIncomeService;
 
+    @Autowired
+    private PtlAgreementService ptlAgreementService;
+
 
-    public InsFeeAuditServiceImpl(FncInsAreaCompanyMapper insAreaCompanyMapper, InsOrdersMapper insOrdersMapper, InsFeeOrderService insFeeOrderService,InsDeptFeeService insDeptFeeService,EsmUserReferrerService esmUserReferrerService,SysUserService sysUserService,InsCommissionService insCommissionService,InsCompanyFeeService insCompanyFeeService,InsPlyIncomeMapper insPlyIncomeMapper) {
+    public InsFeeAuditServiceImpl(FncInsAreaCompanyMapper insAreaCompanyMapper, InsOrdersMapper insOrdersMapper, InsDeptFeeService insDeptFeeService,EsmUserReferrerService esmUserReferrerService,SysUserService sysUserService,InsCommissionService insCommissionService,InsCompanyFeeService insCompanyFeeService,InsPlyIncomeMapper insPlyIncomeMapper) {
         this.insAreaCompanyMapper = insAreaCompanyMapper;
         this.insOrdersMapper = insOrdersMapper;
-        this.insFeeOrderService=insFeeOrderService;
         this.insDeptFeeService=insDeptFeeService;
         this.esmUserReferrerService=esmUserReferrerService;
         this.sysUserService=sysUserService;
@@ -413,17 +416,13 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
             if (ObjectUtils.isNotEmpty(insFeeOrderNew) ) {
 //                手续非佣金  =  交强监管费用 + 商业监管费用 + 非车监管费用
 //                非跟单费用  = 交强非跟单费用 + 商业非跟单费用 + 非车非跟单费用
-                //手续费入口费用
-//                BigDecimal jqPremiumAmount = this.zeroBigdecimal(insFeeOrderNew.getJqSuperviseCostsPremiums());//交强监管费
-//                BigDecimal syPremiumAmount = this.zeroBigdecimal(insFeeOrderNew.getSySuperviseCostsPremiums());//商业监管费
-//                BigDecimal noPremiumAmount = this.zeroBigdecimal(insFeeOrderNew.getNoSuperviseCostsPremiums());//非车监管费用
-//                BigDecimal totalPremiumAmount = jqPremiumAmount.add(syPremiumAmount).add(noPremiumAmount);    // 手续非佣金
-//                //其他费用入口费用
-//                BigDecimal jqOtherCostsPremiums  =this.zeroBigdecimal(insFeeOrderNew.getJqOtherCostsPremiums());//交强其他费用
-//                BigDecimal syOtherCostsPremiums  =this.zeroBigdecimal(insFeeOrderNew.getSyOtherCostsPremiums()); //商业其他费用
-//                BigDecimal noOtherCostsProportion = this.zeroBigdecimal(insFeeOrderNew.getNoOtherCostsPremiums());//非车其他费用
-//                BigDecimal totalOtherPremiumAmount = jqOtherCostsPremiums.add(syOtherCostsPremiums).add(noOtherCostsProportion);  //非跟单费用
+                PtlAgreement ptlAgreement = ptlAgreementService.getById(insAreaCompany.getAgreementId());
+                BigDecimal taxRadio = new BigDecimal("1.00");
+                if (ptlAgreement.getWithTax().equals("否")) {
+                    taxRadio = new BigDecimal("1.06");
+                }
 
+                
                 //总机构 交强管理比例
                 BigDecimal sumJqDeptProportion = insFeeOrderNew.getJqDeptProportionLevel1()
                         .add(insFeeOrderNew.getJqDeptProportionLevel2())

src/main/java/com/ydtech/modules/protocols/entity/po/InsFeeOrderNew.java

@@ -363,6 +363,44 @@ public class InsFeeOrderNew {
     @TableField(value = "dept_distribution")
     private BigDecimal deptDistribution;
 
+
+    @ApiModelProperty(value = "交强手续费出口金额")
+    @TableField(value = "jq_export_supervise_costs_premiums")
+    private BigDecimal jqExportSuperviseCostsPremiums;
+
+    @ApiModelProperty(value = "商业手续费出口金额")
+    @TableField(value = "sy_export_supervise_costs_premiums")
+    private BigDecimal syExportSuperviseCostsPremiums;
+
+    @ApiModelProperty(value = "非车手续费出口金额")
+    @TableField(value = "no_export_supervise_costs_premiums")
+    private BigDecimal noExportSuperviseCostsPremiums;
+
+    @ApiModelProperty(value = "交强其他费用出口比例")
+    @TableField(value = "jq_export_other_costs_proportion")
+    private BigDecimal jqExportOtherCostsProportion;
+
+    @ApiModelProperty(value = "商业其他费用出口比例")
+    @TableField(value = "sy_export_other_costs_proportion")
+    private BigDecimal  syExportOtherCostsProportion;
+
+    @ApiModelProperty(value = "非车其他费用出口比例")
+    @TableField(value = "no_export_other_costs_proportion")
+    private BigDecimal noExportOtherCostsProportion;
+
+    @ApiModelProperty(value = "交强其他费用出口金额")
+    @TableField(value = "jq_export_other_costs_premiums")
+    private BigDecimal jqExportOtherCostsPremiums;
+
+    @ApiModelProperty(value = "商业其他费用出口金额")
+    @TableField(value = "sy_export_other_costs_premiums")
+    private BigDecimal syExportOtherCostsPremiums;
+
+    @ApiModelProperty(value = "非车其他费用出口金额")
+    @TableField(value = "no_export_other_costs_premiums")
+    private BigDecimal noExportOtherCostsPremiums;
+
+
     @ApiModelProperty(value = "签单日期")
     @TableField(exist = false)
     private LocalDate signingTime;