添加出单员的不能查询优惠的限制

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

@@ -2,7 +2,10 @@ package com.ydtech.modules.fee.service.impl;
 
 import com.ydtech.exception.SystemException;
 import com.ydtech.modules.admin.model.SysUser;
+import com.ydtech.modules.admin.model.SysUserRole;
+import com.ydtech.modules.admin.service.SysUserRoleService;
 import com.ydtech.modules.admin.service.SysUserService;
+import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.fee.dto.FeeFactorInfoDto;
 import com.ydtech.modules.fee.dto.FeeSchemeReqDto;
 import com.ydtech.modules.fee.dto.FeeSchemeResDto;
@@ -64,6 +67,9 @@ public class FeeRuleSchemeServiceImpl implements FeeRuleSchemeService {
     @Resource
     private InsFeeOrderNewService insFeeOrderNewService;
 
+    @Resource
+    private SysUserRoleService sysUserRoleService;
+
     /**
      * 根据跟单信息，以及配置的费用因子，获取合适的跟单费用
      *
@@ -2703,14 +2709,14 @@ public class FeeRuleSchemeServiceImpl implements FeeRuleSchemeService {
                 insFeeOrderNew.getJqPremium(), insFeeOrderNew.getJqCostsExportProportion(),
                  insFeeOrderNew.getJqExportOtherCostsProportion(),
                 insFeeOrderNew.getJqExportSuperviseCostsPremiums(), insFeeOrderNew.getJqExportOtherCostsPremiums());
-        exportFeeList.add(jqExportFee);
+        //exportFeeList.add(jqExportFee);
 
         //交强
         FeeOrderNewVo.ExportFee syExportFee = this.assignExportFee("商业险",
                 insFeeOrderNew.getSyPremium(), insFeeOrderNew.getSyCostsExportProportion(),
                 insFeeOrderNew.getSyExportOtherCostsProportion(),
                 insFeeOrderNew.getSyExportSuperviseCostsPremiums(), insFeeOrderNew.getSyExportOtherCostsPremiums());
-        exportFeeList.add(syExportFee);
+        //exportFeeList.add(syExportFee);
 
 
         //交强
@@ -2718,9 +2724,21 @@ public class FeeRuleSchemeServiceImpl implements FeeRuleSchemeService {
                 insFeeOrderNew.getNoPremium(), insFeeOrderNew.getNoCostsExportProportion(),
 insFeeOrderNew.getNoExportOtherCostsProportion(),
                 insFeeOrderNew.getNoExportSuperviseCostsPremiums(), insFeeOrderNew.getNoExportOtherCostsPremiums());
+       // exportFeeList.add(noExportFee);
+        //add  by  hxl   添加出单员不能查看优惠的限制    2024-07-11
+        String userId = new BaseController().getUserId();
+        SysUserRole sysUserRole = sysUserRoleService.selectByUserId(userId);
+        if(sysUserRole!=null && sysUserRole.getRoleId()==19){
+            jqExportFee.setTotalAmount(BigDecimal.ZERO);
+            jqExportFee.setTotalProportion(BigDecimal.ZERO);
+            syExportFee.setTotalAmount(BigDecimal.ZERO);
+            syExportFee.setTotalProportion(BigDecimal.ZERO);
+            noExportFee.setTotalAmount(BigDecimal.ZERO);
+            noExportFee.setTotalProportion(BigDecimal.ZERO);
+        }
+        exportFeeList.add(jqExportFee);
+        exportFeeList.add(syExportFee);
         exportFeeList.add(noExportFee);
-
-
         //endregion
 
         feeOrderNewVo.setEntranceFee(entranceFeeList);

src/main/java/com/ydtech/modules/order/aop/aspect/QuoteVerificationAspect.java

@@ -11,6 +11,7 @@ import com.ydtech.modules.admin.model.SysUser;
 import com.ydtech.modules.admin.model.SysUserRole;
 import com.ydtech.modules.admin.service.SysUserRoleService;
 import com.ydtech.modules.admin.service.SysUserService;
+import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.esm.model.EsmInsCompany;
 import com.ydtech.modules.esm.service.EsmInsCompanyService;
 import com.ydtech.modules.fee.service.CostsCalcService;
@@ -108,14 +109,19 @@ public class QuoteVerificationAspect {
                 InsFeeOrderNew insFeeOrderNew = insFeeOrderNewService.getInsFeeOrderNewByCompanyId(insAreaCompany.getId());
                 if (insFeeOrderNew != null) {
                     //出口
-                    SubOrderExportFeeVo subOrderExportFeeVo = costsCalcService.getExportFee(insFeeOrderNew);
-
-                    result.getData().setJqExportFee(subOrderExportFeeVo.getJqExportCosts());
-                    result.getData().setSyExportFee(subOrderExportFeeVo.getSyExportCosts());
-                    result.getData().setNoExportFee(subOrderExportFeeVo.getNoExportCosts());
-                    result.getData().setSumExportFee(subOrderExportFeeVo.getJqExportCosts()
-                            .add(subOrderExportFeeVo.getSyExportCosts())
-                            .add(subOrderExportFeeVo.getNoExportCosts()));
+                    //add  by  hxl   添加出单员不能查看优惠的限制    2024-07-11
+                    String userId = new BaseController().getUserId();
+                    SysUserRole sysUserRole = sysUserRoleService.selectByUserId(userId);
+                    if(sysUserRole!=null && sysUserRole.getRoleId()!=19){
+                        //出口
+                        SubOrderExportFeeVo subOrderExportFeeVo = costsCalcService.getExportFee(insFeeOrderNew);
+                        result.getData().setJqExportFee(subOrderExportFeeVo.getJqExportCosts());
+                        result.getData().setSyExportFee(subOrderExportFeeVo.getSyExportCosts());
+                        result.getData().setNoExportFee(subOrderExportFeeVo.getNoExportCosts());
+                        result.getData().setSumExportFee(subOrderExportFeeVo.getJqExportCosts()
+                                .add(subOrderExportFeeVo.getSyExportCosts())
+                                .add(subOrderExportFeeVo.getNoExportCosts()));
+                    }
                 }else{
                     //输出费用匹配失败日志
                     result.getData().setFeeNoDescription(logs.toString());