1.用户查询金额bug修改

src/main/java/com/ydtech/modules/admin/service/impl/SysUserAccountServiceImpl.java

@@ -477,78 +477,77 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
 
     private void willAmount(String quoteno, BigDecimal willHalding, BigDecimal willDocumentary,SysUserAccountVo sysUserAccountVo) {
         InsFeeOrderNew insFeeOrderNew = insFeeOrderNewService.getInsFeeOrderNewByCompanyId(quoteno);
-        //交强手续费出口比例
-        BigDecimal jqExportProceduresFee = insFeeOrderNew.getJqPremium().multiply(insFeeOrderNew.getJqSuperviseCostsProportion().divide(new BigDecimal(100))).setScale(2,BigDecimal.ROUND_DOWN);
-        //商业手续费出口比例
-        BigDecimal syExportProceduresFee = insFeeOrderNew.getSyPremium().multiply(insFeeOrderNew.getSySuperviseCostsProportion().divide(new BigDecimal(100))).setScale(2,BigDecimal.ROUND_DOWN);
-        //非车手续费出口比例
-        BigDecimal noExportProceduresFee = insFeeOrderNew.getNoPremium().multiply(insFeeOrderNew.getNoSuperviseCostsProportion().divide(new BigDecimal(100))).setScale(2,BigDecimal.ROUND_DOWN);
-        //用户出口手续费
-
-        if(sysUserAccountVo.getWillHalding()==null){
-            sysUserAccountVo.setWillHalding(BigDecimal.ZERO);
-        }
-        sysUserAccountVo.setWillHalding(sysUserAccountVo.getWillHalding().add(jqExportProceduresFee).add(syExportProceduresFee).add(noExportProceduresFee));
-
-        //非车出口比例
-        //总机构 交强管理比例
-        BigDecimal sumJqDeptProportion = insFeeOrderNew.getJqDeptProportionLevel1()
-                .add(insFeeOrderNew.getJqDeptProportionLevel2())
-                .add(insFeeOrderNew.getJqDeptProportionLevel3())
-                .add(insFeeOrderNew.getJqDeptProportionLevel4())
-                .add(insFeeOrderNew.getJqDeptProportionLevel5());
-
-        //总机构 商业管理比例
-        BigDecimal sumSyDeptProportion = insFeeOrderNew.getSyDeptProportionLevel1()
-                .add(insFeeOrderNew.getSyDeptProportionLevel2())
-                .add(insFeeOrderNew.getSyDeptProportionLevel3())
-                .add(insFeeOrderNew.getSyDeptProportionLevel4())
-                .add(insFeeOrderNew.getSyDeptProportionLevel5());
-
-        //总机构 非车管理比例
-        BigDecimal sumNoDeptProportion = insFeeOrderNew.getNoDeptProportionLevel1()
-                .add(insFeeOrderNew.getNoDeptProportionLevel2())
-                .add(insFeeOrderNew.getNoDeptProportionLevel3())
-                .add(insFeeOrderNew.getNoDeptProportionLevel4())
-                .add(insFeeOrderNew.getNoDeptProportionLevel5());
-        BigDecimal noExportProceduresProportion = new BigDecimal(0);
-        //总分销比例
-        BigDecimal sumRetail = insFeeOrderNew.getFirstDetailProportion().add(insFeeOrderNew.getSecondDetailProportion()).add(insFeeOrderNew.getThirdDetailProportion());
-        if(insFeeOrderNew.getNoCostsProportion().compareTo(sumNoDeptProportion.add(sumRetail))>0){
-            noExportProceduresProportion = insFeeOrderNew.getNoCostsProportion().subtract(sumNoDeptProportion).subtract(sumRetail);
-        }
-        //商业出口比例
-        BigDecimal syExportProceduresProportion = new BigDecimal(0);
-        if(insFeeOrderNew.getSyCostsProportion().compareTo(sumSyDeptProportion.add(sumRetail))>0){
-            syExportProceduresProportion = insFeeOrderNew.getSyCostsProportion().subtract(sumSyDeptProportion).subtract(sumRetail);
-        }
-        //交强出口比例
-        BigDecimal jqExportProceduresProportion = new BigDecimal(0);
-        if(insFeeOrderNew.getJqCostsProportion().compareTo(sumJqDeptProportion.add(sumRetail))>0){
-            jqExportProceduresProportion = insFeeOrderNew.getJqCostsProportion().subtract(sumJqDeptProportion).subtract(sumRetail);
-        }
-        //交强跟单出口费用
-        BigDecimal jqExportOtherFee = insFeeOrderNew.getJqPremium()
-                .multiply(jqExportProceduresProportion
-                        .subtract(insFeeOrderNew.getJqSuperviseCostsProportion()).divide(new BigDecimal(100))).setScale(2,BigDecimal.ROUND_DOWN);
-
-        //商业跟单出口比例
-        BigDecimal syExportOtherFee = insFeeOrderNew.getSyPremium()
-                .multiply(syExportProceduresProportion
-                        .subtract(insFeeOrderNew.getSySuperviseCostsProportion()).divide(new BigDecimal(100))).setScale(2,BigDecimal.ROUND_DOWN);
-        //非车跟单出口比例
-        BigDecimal noExportOtherFee = insFeeOrderNew.getNoPremium()
-                .multiply(noExportProceduresProportion
-                        .subtract(insFeeOrderNew.getNoSuperviseCostsProportion()).divide(new BigDecimal(100))).setScale(2,BigDecimal.ROUND_DOWN);
-        //用户出口跟单费
-        if(sysUserAccountVo.getWillDocumentary()==null){
-            sysUserAccountVo.setWillDocumentary(BigDecimal.ZERO);
-        }
-        sysUserAccountVo.setWillDocumentary(sysUserAccountVo.getWillDocumentary().add(jqExportOtherFee).add(syExportOtherFee).add(noExportOtherFee));
+        if(ObjectUtils.isNotEmpty(insFeeOrderNew)){
+            //交强手续费出口比例
+            BigDecimal jqExportProceduresFee = insFeeOrderNew.getJqPremium().multiply(insFeeOrderNew.getJqSuperviseCostsProportion().divide(new BigDecimal(100))).setScale(2,BigDecimal.ROUND_DOWN);
+            //商业手续费出口比例
+            BigDecimal syExportProceduresFee = insFeeOrderNew.getSyPremium().multiply(insFeeOrderNew.getSySuperviseCostsProportion().divide(new BigDecimal(100))).setScale(2,BigDecimal.ROUND_DOWN);
+            //非车手续费出口比例
+            BigDecimal noExportProceduresFee = insFeeOrderNew.getNoPremium().multiply(insFeeOrderNew.getNoSuperviseCostsProportion().divide(new BigDecimal(100))).setScale(2,BigDecimal.ROUND_DOWN);
+            //用户出口手续费
 
-    }
+            if(sysUserAccountVo.getWillHalding()==null){
+                sysUserAccountVo.setWillHalding(BigDecimal.ZERO);
+            }
+            sysUserAccountVo.setWillHalding(sysUserAccountVo.getWillHalding().add(jqExportProceduresFee).add(syExportProceduresFee).add(noExportProceduresFee));
 
+            //非车出口比例
+            //总机构 交强管理比例
+            BigDecimal sumJqDeptProportion = insFeeOrderNew.getJqDeptProportionLevel1()
+                    .add(insFeeOrderNew.getJqDeptProportionLevel2())
+                    .add(insFeeOrderNew.getJqDeptProportionLevel3())
+                    .add(insFeeOrderNew.getJqDeptProportionLevel4())
+                    .add(insFeeOrderNew.getJqDeptProportionLevel5());
+
+            //总机构 商业管理比例
+            BigDecimal sumSyDeptProportion = insFeeOrderNew.getSyDeptProportionLevel1()
+                    .add(insFeeOrderNew.getSyDeptProportionLevel2())
+                    .add(insFeeOrderNew.getSyDeptProportionLevel3())
+                    .add(insFeeOrderNew.getSyDeptProportionLevel4())
+                    .add(insFeeOrderNew.getSyDeptProportionLevel5());
+
+            //总机构 非车管理比例
+            BigDecimal sumNoDeptProportion = insFeeOrderNew.getNoDeptProportionLevel1()
+                    .add(insFeeOrderNew.getNoDeptProportionLevel2())
+                    .add(insFeeOrderNew.getNoDeptProportionLevel3())
+                    .add(insFeeOrderNew.getNoDeptProportionLevel4())
+                    .add(insFeeOrderNew.getNoDeptProportionLevel5());
+            BigDecimal noExportProceduresProportion = new BigDecimal(0);
+            //总分销比例
+            BigDecimal sumRetail = insFeeOrderNew.getFirstDetailProportion().add(insFeeOrderNew.getSecondDetailProportion()).add(insFeeOrderNew.getThirdDetailProportion());
+            if(insFeeOrderNew.getNoCostsProportion().compareTo(sumNoDeptProportion.add(sumRetail))>0){
+                noExportProceduresProportion = insFeeOrderNew.getNoCostsProportion().subtract(sumNoDeptProportion).subtract(sumRetail);
+            }
+            //商业出口比例
+            BigDecimal syExportProceduresProportion = new BigDecimal(0);
+            if(insFeeOrderNew.getSyCostsProportion().compareTo(sumSyDeptProportion.add(sumRetail))>0){
+                syExportProceduresProportion = insFeeOrderNew.getSyCostsProportion().subtract(sumSyDeptProportion).subtract(sumRetail);
+            }
+            //交强出口比例
+            BigDecimal jqExportProceduresProportion = new BigDecimal(0);
+            if(insFeeOrderNew.getJqCostsProportion().compareTo(sumJqDeptProportion.add(sumRetail))>0){
+                jqExportProceduresProportion = insFeeOrderNew.getJqCostsProportion().subtract(sumJqDeptProportion).subtract(sumRetail);
+            }
+            //交强跟单出口费用
+            BigDecimal jqExportOtherFee = insFeeOrderNew.getJqPremium()
+                    .multiply(jqExportProceduresProportion
+                            .subtract(insFeeOrderNew.getJqSuperviseCostsProportion()).divide(new BigDecimal(100))).setScale(2,BigDecimal.ROUND_DOWN);
 
+            //商业跟单出口比例
+            BigDecimal syExportOtherFee = insFeeOrderNew.getSyPremium()
+                    .multiply(syExportProceduresProportion
+                            .subtract(insFeeOrderNew.getSySuperviseCostsProportion()).divide(new BigDecimal(100))).setScale(2,BigDecimal.ROUND_DOWN);
+            //非车跟单出口比例
+            BigDecimal noExportOtherFee = insFeeOrderNew.getNoPremium()
+                    .multiply(noExportProceduresProportion
+                            .subtract(insFeeOrderNew.getNoSuperviseCostsProportion()).divide(new BigDecimal(100))).setScale(2,BigDecimal.ROUND_DOWN);
+            //用户出口跟单费
+            if(sysUserAccountVo.getWillDocumentary()==null){
+                sysUserAccountVo.setWillDocumentary(BigDecimal.ZERO);
+            }
+            sysUserAccountVo.setWillDocumentary(sysUserAccountVo.getWillDocumentary().add(jqExportOtherFee).add(syExportOtherFee).add(noExportOtherFee));
+        }
+    }
 }