添加机构来源添加电销类型

报价页面待客录单添加用户id用于判断协议是否授权

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

@@ -6,13 +6,15 @@ import com.ydtech.constants.enums.dict.InsOrderStatusEnum;
 import com.ydtech.constants.enums.dict.agreement.ProductsType;
 import com.ydtech.constants.sys.SystemConstant;
 import com.ydtech.core.page.HttpResult;
+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.service.CostsCalcService;
-import com.ydtech.modules.fee.service.FeeRuleSchemeNewService;
 import com.ydtech.modules.esm.model.EsmInsCompany;
 import com.ydtech.modules.esm.service.EsmInsCompanyService;
+import com.ydtech.modules.fee.service.CostsCalcService;
+import com.ydtech.modules.fee.service.FeeRuleSchemeNewService;
 import com.ydtech.modules.ins.model.vo.KindInfoVo;
 import com.ydtech.modules.ins.model.vo.QuoteRespVo;
 import com.ydtech.modules.ins.model.vo.RiskInfoVo;
@@ -22,9 +24,9 @@ import com.ydtech.modules.order.entity.InsAreaCompanyAccidentalDriving;
 import com.ydtech.modules.order.entity.InsOrders;
 import com.ydtech.modules.order.entity.vo.BaseQuoteInfoVo;
 import com.ydtech.modules.order.entity.vo.BaseQuoteVo;
-import com.ydtech.modules.order.service.InsAreaCompanyService;
 import com.ydtech.modules.order.entity.vo.SubOrderExportFeeVo;
 import com.ydtech.modules.order.service.InsAreaCompanyAccidentalDrivingService;
+import com.ydtech.modules.order.service.InsAreaCompanyService;
 import com.ydtech.modules.order.service.InsOrdersService;
 import com.ydtech.modules.protocol.service.PtlAgreementDeptService;
 import com.ydtech.modules.protocol.service.impl.TaxSourceServiceImpl;
@@ -71,6 +73,9 @@ public class QuoteVerificationAspect {
 
     private final InsFeeOrderNewService insFeeOrderNewService;
 
+
+    private final SysUserService sysUserService;
+
     @AfterReturning(pointcut = "@annotation(com.ydtech.modules.order.aop.QuoteVerification)", returning = "result")
     public void doAfter(HttpResult<QuoteRespVo> result){
         //计算费用因子
@@ -112,13 +117,18 @@ public class QuoteVerificationAspect {
                 String agreementId = ((BaseQuoteVo<?>) arg).getAgreementId();
                 String orderno = ((BaseQuoteVo<?>) arg).getOrderNo();
                 String deptId = ((BaseQuoteVo<?>) arg).getDeptId();
-
-                // 判断协议是否可以报价（代客录单时，机构需要传过来 没传为空时，为车险录单进来的 直接取登录用户机构即可）
-                if (StringUtils.isEmpty(deptId)) {
-                    deptId = new BaseController().getDeptId();
+                String userId = ((BaseQuoteVo<?>) arg).getUserId();
+                if(StringUtils.isEmpty(userId)){
+                     //通过用户id查询所在的机构
+                    SysUser user = sysUserService.getById(userId);
+                    deptId=user.getDeptId();
+                }else{
+                    // 判断协议是否可以报价（代客录单时，机构需要传过来 没传为空时，为车险录单进来的 直接取登录用户机构即可）
+                    if (StringUtils.isEmpty(deptId)) {
+                        deptId = new BaseController().getDeptId();
+                    }
+                    userId = new BaseController().getUserId();
                 }
-                String userId = new BaseController().getUserId();
-
                 //税源查询
                 BaseQuoteInfoVo quoteInfo = insOrdersComponents.getQuoteInfo(orderno, agreementId);
                 String productid ;

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

@@ -46,4 +46,7 @@ public class BaseQuoteVo<T> {
     @ApiModelProperty("上一次订单号")
     private String lastCompanyId;
 
+    @ApiModelProperty("用户id")
+    private String  userId;
+
 }

src/main/resources/mapper/modules/order/InsOrdersMapper.xml

@@ -818,6 +818,7 @@
         CASE dept.management_source
         WHEN '1' THEN '渠道'
         WHEN '2' THEN '个代'
+        WHEN '3' THEN '电销'
         ELSE '' END
         AS managementSource
         from