获取user信息

src/main/java/com/ydtech/modules/order/controller/InsOrdersController.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ydtech.aop.request.RequestSingleParam;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.exception.SystemException;
+import com.ydtech.modules.admin.model.SysUser;
 import com.ydtech.modules.admin.model.po.SysUserIsDial;
 import com.ydtech.modules.admin.service.SysUserIsDialService;
 import com.ydtech.modules.base.controller.BaseController;
@@ -76,8 +77,8 @@ public class InsOrdersController extends BaseController {
     @PostMapping("/generateOrder")
     @ApiOperation(value = "生成订单")
     public HttpResult<InsOrders> generateOrder(@Validated @RequestBody BaseQuoteInfoVo quoteInfoVo) {
-        String userId = getUserId();
-        InsOrders insOrders = this.insOrdersService.generateOrder(userId, quoteInfoVo);
+        SysUser user = getUser();
+        InsOrders insOrders = this.insOrdersService.generateOrder(user, quoteInfoVo);
         return HttpResult.ok("success", insOrders);
     }
 

src/main/java/com/ydtech/modules/order/service/InsOrdersService.java

@@ -3,6 +3,7 @@ package com.ydtech.modules.order.service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ydtech.core.page.HttpResult;
+import com.ydtech.modules.admin.model.SysUser;
 import com.ydtech.modules.ins.model.InsOrdersExcelVo;
 import com.ydtech.modules.ins.model.ya.CarModelDTO;
 import com.ydtech.modules.order.entity.BasePageResult;
@@ -60,10 +61,11 @@ public interface InsOrdersService extends IService<InsOrders> {
      * @param quoteInfoVo 报价信息
      * @return 订单信息
      */
-    InsOrders generateOrder(String userId, BaseQuoteInfoVo quoteInfoVo);
+    InsOrders generateOrder(SysUser user, BaseQuoteInfoVo quoteInfoVo);
 
 
     BasePageResult<InsOrders> newQueryPageOrder(OrderQueryVo orderQueryVo);
+
     /**
      * 查询订单接口
      *
@@ -85,7 +87,7 @@ public interface InsOrdersService extends IService<InsOrders> {
      * @param companyId
      * @return
      */
-    HttpResult<OrderVo> getByCompanyId(String companyId,String userId);
+    HttpResult<OrderVo> getByCompanyId(String companyId, String userId);
 
     /**
      * 查询订单和子订单
@@ -112,59 +114,65 @@ public interface InsOrdersService extends IService<InsOrders> {
     List<InsAreaCompanyQueryDto> querySuborder(String orderNo);
 
     /**
-     *
      * @param insOrders 订单数据
      * @return true->成功 false->失败
      */
-    boolean saveAndTrajectories(InsOrders insOrders);
+    boolean saveAndTrajectories(SysUser sysUser, InsOrders insOrders);
 
 
     /**
      * 分页查询保单报表信息
+     *
      * @param policyInsuranceReportReqVo
      * @param userId
      * @return
      */
-    BasePageResult<PolicyInsuranceReportResVo> getPolicyInsuranceReport(PolicyInsuranceReportReqVo policyInsuranceReportReqVo,String userId);
+    BasePageResult<PolicyInsuranceReportResVo> getPolicyInsuranceReport(PolicyInsuranceReportReqVo policyInsuranceReportReqVo, String userId);
 
     /**
      * 导出保单报表信息
+     *
      * @param policyInsuranceReportReqVo
      * @return
      */
-    HttpResult<String> exportPolicyInsuranceReport(PolicyInsuranceReportReqVo policyInsuranceReportReqVo,String userId);
+    HttpResult<String> exportPolicyInsuranceReport(PolicyInsuranceReportReqVo policyInsuranceReportReqVo, String userId);
+
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/4/17 15:33
-     *  @Description:  通过用户id和状态查询待客订单的订单接口
+     * @version
+     * @author: hxl
+     * @Date: 2024/4/17 15:33
+     * @Description: 通过用户id和状态查询待客订单的订单接口
      */
     BasePageResult<InsOrders> queryPageHospitalityOrder(OrderQueryVo orderQueryVo);
+
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/4/17 16:11
-     *  @Description:  通过待客用户id查询渠道、代理人、保险公司的相关的订单表
+     * @version
+     * @author: hxl
+     * @Date: 2024/4/17 16:11
+     * @Description: 通过待客用户id查询渠道、代理人、保险公司的相关的订单表
      */
     BasePageResult<InsOrders> queryPageOrderByLinkType(OrderQueryVo orderQueryVo, int type);
+
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/4/18 10:49
-     *  @Description: 查询子订单的数据列表
+     * @version
+     * @author: hxl
+     * @Date: 2024/4/18 10:49
+     * @Description: 查询子订单的数据列表
      */
     BasePageResult<InsOrders> queryPageSubOrders(OrderTaskPoolsVo orderTaskPoolsVo);
+
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/5/6 18:02
-     *  @Description:  任务管理的详细信息
+     * @version
+     * @author: hxl
+     * @Date: 2024/5/6 18:02
+     * @Description: 任务管理的详细信息
      */
     HttpResult<OrderVo> getTaskByCompanyId(String companyId, String userId);
 
 
     /**
      * 转换驾意险对象
+     *
      * @param baseQuoteVo
      * @return
      */
@@ -172,6 +180,7 @@ public interface InsOrdersService extends IService<InsOrders> {
 
     /**
      * 转换紫金驾意险
+     *
      * @param baseQuoteVo
      * @return
      */
@@ -179,27 +188,31 @@ public interface InsOrdersService extends IService<InsOrders> {
 
     /**
      * 通过订单号查询手机号码
+     *
      * @param orderNo
      * @return
      */
-    String getMobileByOrderNo(String orderNo,String type);
+    String getMobileByOrderNo(String orderNo, String type);
 
     /**
      * 获取快到期的保单数量
+     *
      * @return
      */
     int getExpirationInsureCount(OrderExpirationQueryVo orderExpirationQueryVo);
 
     /**
      * 获取快到期的保单
+     *
      * @return
      */
-    Page<OrderExpirationVo> getExpirationInsure(Page page,OrderExpirationQueryVo orderExpirationQueryVo);
+    Page<OrderExpirationVo> getExpirationInsure(Page page, OrderExpirationQueryVo orderExpirationQueryVo);
+
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/6/24 18:14
-     *  @Description:  通过子订单号查询询价信息
+     * @version
+     * @author: hxl
+     * @Date: 2024/6/24 18:14
+     * @Description: 通过子订单号查询询价信息
      */
     InquiryDetalsVo getInquiryDetalsBySubOrderIds(InquiryDetalsQueryDto inquiryDetalsDto);
 }

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

@@ -265,12 +265,13 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
     }
 
     /**
-     * @param userId      当前登录人id
+     * @param user      当前登录人
      * @param quoteInfoVo 报价信息
      * @return
      */
     @Override
-    public InsOrders generateOrder(String userId, BaseQuoteInfoVo quoteInfoVo) {
+    public InsOrders generateOrder(SysUser sysUser, BaseQuoteInfoVo quoteInfoVo) {
+        String userId = sysUser.getId();
         String realUserId = userId;//实际跟单业务人默认登录人
         boolean daikeFlag = false;//是否代客录单业务
         //添加出单员报价的逻辑,
@@ -341,7 +342,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
             // 将报价号返回
             long l = new SnowFlakeUtil().nextId();
             insOrders.setQuoteno(String.valueOf(l));
-            boolean save = this.saveAndTrajectories(insOrders);
+            boolean save = this.saveAndTrajectories( sysUser, insOrders);
             if (!save) {
                 throw new SystemException("订单生成失败");
             }
@@ -893,16 +894,15 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
 
     @Override
     @Transactional
-    public boolean saveAndTrajectories(InsOrders insOrders) {
+    public boolean saveAndTrajectories(SysUser user, InsOrders insOrders) {
         this.baseMapper.insert(insOrders);
-        SaSession saSession = StpUtil.getSessionByLoginId(StpUtil.getLoginId());
-        SysUser sysUser = (SysUser) saSession.get(SaSession.USER);
-        final InsOrdersTrack insOrdersTrack = new InsOrdersTrack(insOrders, sysUser.getId(), sysUser.getName());
+
+        final InsOrdersTrack insOrdersTrack = new InsOrdersTrack(insOrders, user.getId(), user.getName());
         insOrdersTrackService.save(insOrdersTrack);
         return true;
     }
 
-    /**
+    /**user
      * @version
      * @author: hxl
      * @Date: 2024/4/17 15:38