update

1.远程调用修改

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/client/CostsRuleClient.java

@@ -6,7 +6,7 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
-@FeignClient(name="jzg-costsorrule",url = "${feign.client.jzg-costsorrule.url}")
+@FeignClient(name="jzg-costsorrule")
 public interface CostsRuleClient {
 
 

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/client/OrgClient.java

@@ -18,180 +18,176 @@ import org.springframework.web.bind.annotation.*;
 import java.util.List;
 import java.util.Map;
 
-@FeignClient(name="jzg-organization",url = "${feign.client.jzg-org.url}")
+@FeignClient(name = "jzg-organization")
 public interface OrgClient {
 
     /**
      * 查找人员信息地区
+     *
      * @param address
      * @param idCard
      * @return
      */
     @GetMapping(value = "/area/queryByAddress")
-    public HttpResult<PersonAreaVo> queryByAddress(@RequestParam("address") String address,
-                                                   @RequestParam("idCard") String idCard);
+    HttpResult<PersonAreaVo> queryByAddress(@RequestParam("address") String address,
+                                            @RequestParam("idCard") String idCard);
 
     @GetMapping(value = "/agreement/getByCompanyId")
-    public HttpResult<List<PtlAgreement>> getByCompanyId(@RequestParam("companyId") String companyId,
-                                                         @RequestParam("systemCode") String code,
-                                                         @RequestHeader("Authorization") String authToken,
-                                                         @RequestHeader("system_code")String systemCode);
+    HttpResult<List<PtlAgreement>> getByCompanyId(@RequestParam("companyId") String companyId,
+                                                  @RequestParam("systemCode") String code
+    );
+
     @GetMapping(value = "/agreement/getByAgreementId")
-    public PtlAgreement getByAgreementId(@RequestParam String agreementId,
-                                         @RequestHeader("Authorization") String authToken,
-                                         @RequestHeader("system_code")String systemCode);
+    PtlAgreement getByAgreementId(@RequestParam String agreementId);
 
     @GetMapping(value = "/messageTemplate/templateGet")
-    public HttpResult<SysMessageTemplate> templateGet(@RequestParam MessageCodeEnum messageCodeEnum,
-                                                      @RequestHeader("Authorization") String authToken);
+    HttpResult<SysMessageTemplate> templateGet(@RequestParam MessageCodeEnum messageCodeEnum);
 
     @PostMapping(value = "/message/messageAdd")
-    public HttpResult<SysMessageTemplate> messageAdd(@RequestBody MessageAddParam param,
-                                                      @RequestHeader("Authorization") String authToken);
+    HttpResult<SysMessageTemplate> messageAdd(@RequestBody MessageAddParam param);
 
     /**
      * 根据id获取费用信息
+     *
      * @param id
      * @param authToken
      * @return
      */
     @GetMapping(value = "/ptlAgreementCost/queryById")
-    public HttpResult<PtlAgreementCostVo> queryCostById(@RequestParam Long id,
-                                                     @RequestHeader("Authorization") String authToken);
+    HttpResult<PtlAgreementCostVo> queryCostById(@RequestParam Long id);
 
     @GetMapping(value = "/agreement/agreementGet")
-    public HttpResult<AgreementInfoVo> queryAgreementById(@RequestParam String id,
-                                                          @RequestHeader("Authorization") String authToken,
-                                                          @RequestHeader("system_code") String systemCode);
+    HttpResult<AgreementInfoVo> queryAgreementById(@RequestParam String id);
 
     @PostMapping(value = "/ptlAgreementCost/queryByAgreementIdAndProductId")
-    public List<CostsListVo> queryByAgreementIdAndProductId(@RequestBody CostAgreementParam costAgreementParam,
-                                                            @RequestHeader("Authorization") String authToken,@RequestHeader("system_code")String systemCode);
+    List<CostsListVo> queryByAgreementIdAndProductId(@RequestBody CostAgreementParam costAgreementParam);
 
     @GetMapping(value = "/pltAgreement/attr/list")
-    public HttpResult<List<PtlAgreementUndwrtRulesAttr>> list();
+    HttpResult<List<PtlAgreementUndwrtRulesAttr>> list();
 
     @GetMapping(value = "/ptlAgreementCost/queryByCostId")
-    public List<PtlAgreementCostTypeVo> queryByCostId(@RequestParam String costId);
+    List<PtlAgreementCostTypeVo> queryByCostId(@RequestParam String costId);
 
     @GetMapping(value = "/userInfo/getUserByMobile")
-    public SalesmanVo getUserByMobile(@RequestParam String mobile,
-                                      @RequestHeader("Authorization") String authToken,
-                                      @RequestHeader("system_code") String systemCode);
+    SalesmanVo getUserByMobile(@RequestParam String mobile);
 
     /**
      * 获取用户唯一id
+     *
      * @param mobile
      * @param authToken
      * @return
      */
     @GetMapping(value = "/userInfo/getUserOnlyIdByMobile")
-    public HttpResult<SysUser>  getUserOnlyIdByMobile(@RequestParam String mobile,
-                                          @RequestHeader("Authorization") String authToken);
+    HttpResult<SysUser> getUserOnlyIdByMobile(@RequestParam String mobile);
 
     /**
      * 用户账户信息查询
+     *
      * @param userId
      * @param authToken
      * @return
      */
     @GetMapping(value = "/userAccount/accountGet")
-    public HttpResult<SysUserAccount> accountGet(@RequestParam String userId, @RequestHeader("Authorization") String authToken);
+    HttpResult<SysUserAccount> accountGet(@RequestParam String userId);
 
     /**
      * 用户账户信息保存
+     *
      * @param userAccount
      * @param authToken
      * @return
      */
     @PostMapping(value = "/userAccount/saveOrUpdate")
-    public HttpResult saveOrUpdate(@RequestBody SysUserAccount userAccount, @RequestHeader("Authorization") String authToken);
+    HttpResult saveOrUpdate(@RequestBody SysUserAccount userAccount);
 
     /**
      * 获取租户分销设置
      */
     @PostMapping(value = "/sysDistributionSetting/getSettingBySystemCode")
-    public HttpResult<SysDistributionSetting> getSettingBySystemCode();
+    HttpResult<SysDistributionSetting> getSettingBySystemCode();
 
     /**
      * 获取机构
      */
     @GetMapping(value = "/dept/deptGet")
-    public HttpResult<SysDeptVo> deptGet(String id);
+    HttpResult<SysDeptVo> deptGet(String id);
 
     /**
      * 获取租户用户
      */
     @GetMapping(value = "userInfo/getUserInfoByMobile")
-    public HttpResult<SysUserJzgInfo> getUserInfoByMobile(String mobile);
+    HttpResult<SysUserJzgInfo> getUserInfoByMobile(String mobile);
 
     /**
      * 获取上级推荐人
      */
     @GetMapping(value = "esmUserReferrer/getReferrer")
-    public HttpResult<EsmUserReferrer> getReferrer(String id);
+    HttpResult<EsmUserReferrer> getReferrer(String id);
 
 
     /**
      * 获取租户用户
      */
     @GetMapping(value = "userInfo/getUserInfo")
-    public HttpResult<SysUserJzgInfo> getUserInfo(String id);
+    HttpResult<SysUserJzgInfo> getUserInfo(String id);
 
     @GetMapping(value = "userInfo/getUserInfoById")
-    public HttpResult<SysUserJzgInfo> getUserInfoById(String id);
+    HttpResult<SysUserJzgInfo> getUserInfoById(String id);
 
     @PostMapping(value = "receivable/restockInsPlyIncome")
-    public void restockInsPlyIncome(@RequestBody InsOrderAdjust insOrderAdjust);
+    void restockInsPlyIncome(@RequestBody InsOrderAdjust insOrderAdjust);
 
     /**
      * 获取调度动作
      */
     @PostMapping(value = "/ptlAgreementDispatch/getAgreementDispatchAction")
-    public HttpResult<List<PtlAgreementDispatchVo.DispatchVo>> getAgreementDispatchAction(List<String> dispatchIds);
+    HttpResult<List<PtlAgreementDispatchVo.DispatchVo>> getAgreementDispatchAction(List<String> dispatchIds);
 
     /**
      * 获取报价之后的调度动作
+     *
      * @param companyId
      * @return
      */
     @PostMapping(value = "/ptlAgreementDispatch/getAgreementDispatchAfterAction")
-    public HttpResult<List<PtlAgreementDispatchAfterAction>> getAgreementDispatchAfterAction(String companyId);
+    HttpResult<List<PtlAgreementDispatchAfterAction>> getAgreementDispatchAfterAction(String companyId);
 
     /**
      * 执行调度动作
      */
     @PostMapping(value = "executeActions")
-    public HttpResult executeActions(@RequestParam("orderNo") String orderNo,@RequestParam("quoteVo") QuoteVo quoteVo,@RequestParam("actionMap") Map<String, Object> actionMap);
+    HttpResult executeActions(@RequestParam("orderNo") String orderNo, @RequestParam("quoteVo") QuoteVo quoteVo, @RequestParam("actionMap") Map<String, Object> actionMap);
 
     /**
      * 判断新车
      */
     @GetMapping(value = "/newCarJudgeRules/compareNewCar")
-    public HttpResult compareNewCar(@RequestParam("registerDate") String registerDate, @RequestParam("companyId") String companyId, @RequestParam("vehicleType") String vehicleType);
+    HttpResult compareNewCar(@RequestParam("registerDate") String registerDate, @RequestParam("companyId") String companyId, @RequestParam("vehicleType") String vehicleType);
 
     /**
      * 获取费用信息
      */
     @GetMapping(value = "/ptlAgreementCost/queryById")
-    public HttpResult queryCostById(@RequestParam("id") String id, @RequestHeader("Authorization") String authToken,@RequestHeader("system_code")String systemCode);
+    HttpResult queryCostById(@RequestParam("id") String id);
 
     /**
      * 获取承保规则详情
      */
     @GetMapping(value = "/agreementRules/getRuleInfo")
-    public HttpResult getRuleInfo(@RequestParam("ruleId") String ruleId, @RequestHeader("Authorization") String authToken);
+    HttpResult getRuleInfo(@RequestParam("ruleId") String ruleId);
 
     /**
      * 添加应收
+     *
      * @return
      */
     @PostMapping(value = "/receivable/addReceivable")
-    public HttpResult addReceivable(@RequestBody JSONObject requestData, @RequestHeader("Authorization") String authToken);
+    HttpResult addReceivable(@RequestBody JSONObject requestData);
 
     /**
      * 添加用户账户收入记录
      */
     @PostMapping(value = "/userAccount/addUserAccountIncomeLog")
-    public HttpResult addUserAccountIncomeLog(@RequestBody List<SysUserAccountIncomeLog> incomeLogs,@RequestHeader("Authorization") String authToken);
+    HttpResult addUserAccountIncomeLog(@RequestBody List<SysUserAccountIncomeLog> incomeLogs);
 }

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/client/PartnerDistributionClient.java

@@ -8,7 +8,7 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
-@FeignClient(name = "jzg-partner",url = "${feign.client.jzg-partner.url}")
+@FeignClient(name = "jzg-partner")
 public interface PartnerDistributionClient {
 
 

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/client/PlatformClient.java

@@ -17,110 +17,110 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 
-@FeignClient(name="jzg-platform",url = "${feign.client.jzg-platform.url}")
+@FeignClient(name = "jzg-platform", url = "${feign.client.jzg-platform.url}")
 public interface PlatformClient {
 
 
     /**
      * 根据协议id获取协议配置信息
+     *
      * @param agreementId
      * @return HttpResult<PtlAgreementAttribution>
      */
     @GetMapping("/manager/attributionTemplate/getAgreementAttribution")
-    public HttpResult<PtlAgreementAttribution> getAgreementAttribution(
+    HttpResult<PtlAgreementAttribution> getAgreementAttribution(
             @RequestParam("agreementId") String agreementId,
             @RequestHeader("Authorization") String authToken,
             @RequestHeader("system_code") String systemCode);
 
     /**
-     *根据保司ID查询保险公司信息
-     * @param id 保险公司id
+     * 根据保司ID查询保险公司信息
+     *
+     * @param id        保险公司id
      * @param authToken
      * @return HttpResult<EsmInsCompany>
      */
     @GetMapping("/esmInsCompany/findById")
-    public HttpResult<EsmInsCompany> findById(@RequestParam("id") String id, @RequestHeader("Authorization") String authToken);
+    HttpResult<EsmInsCompany> findById(@RequestParam("id") String id);
 
     @GetMapping("/esmInsCompany/findLogoById")
-    public HttpResult<EsmInsCompany> findLogoById(
-            @RequestParam("id") String id,
-            @RequestHeader("Authorization") String authToken);
+    HttpResult<EsmInsCompany> findLogoById(@RequestParam("id") String id);
 
     //根据保司id获取列表
     @GetMapping("/esmInsCompany/getCompanyByIds")
-    public HttpResult<List<EsmInsCompany>> getCompanyByIds(
-            @RequestParam("ids") String ids,
-            @RequestHeader("Authorization") String authToken);
-
+    HttpResult<List<EsmInsCompany>> getCompanyByIds(
+            @RequestParam("ids") String ids);
 
 
     // 获取二维码配置
     @GetMapping("/qrBarcode/queryByCompanyCode")
-    public HttpResult<QrBarcodeConfig> qrBarcodeByCompanyCode(
+    HttpResult<QrBarcodeConfig> qrBarcodeByCompanyCode(
             @RequestParam("companyCode") String companyCode,
-            @RequestParam("apiType") String apiType,
-            @RequestHeader("Authorization") String authToken);
+            @RequestParam("apiType") String apiType);
 
     //上传保单
     @PostMapping("/file/uploadUrl")
-    public HttpResult<SysUploadFiles> uploadUrl(
+    HttpResult<SysUploadFiles> uploadUrl(
             @RequestParam("urlString") String urlString,
             @RequestParam("fileName") String fileName
     );
 
 
     //上传保单文件
-    @PostMapping(value = "/file/upload",consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    @PostMapping(value = "/file/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     HttpResult<SysUploadFiles> upload(@RequestPart("file") MultipartFile file);
 
     /**
      * 通过保险公司id查询下级id及本级id
+     *
      * @param companyId
      * @return
      */
     @GetMapping("/esmInsCompany/getChildCompanyId")
-    public HttpResult<List<String>> getChildCompanyId(@RequestParam String companyId);
+    HttpResult<List<String>> getChildCompanyId(@RequestParam String companyId);
 
     /**
      * 获取保司配置地址
      */
     @GetMapping("/manager/agreementUrl/getAgreementUrlByCompanyId")
-    public HttpResult<PtlAgreementUrl> getAgreementUrlByCompanyId(@RequestParam String companyId);
+    HttpResult<PtlAgreementUrl> getAgreementUrlByCompanyId(@RequestParam String companyId);
 
     /**
      * 获取特约
+     *
      * @return
      */
     @GetMapping("/manager/clause/getById")
-    public InsCompanyClause getClause(@RequestParam String id);
+    InsCompanyClause getClause(@RequestParam String id);
 
     /**
      * 根据Id获取上传信息
+     *
      * @param id
      * @return
      */
     @GetMapping("/file/getUploadFile")
     @Operation(summary = "根据Id获取上传信息", description = "根据Id获取上传信息")
-    public SysUploadFiles getUploadFile(@RequestParam String id);
+    SysUploadFiles getUploadFile(@RequestParam String id);
 
     /**
      * 获取用户的保司信息
+     *
      * @param systemCode
      * @return
      */
     @GetMapping("/system/getUserCompany")
-    public HttpResult<List<EsmInsCompany>> getUserCompany(@RequestParam String systemCode,
-                                                          @RequestHeader("Authorization") String token,
-                                                          @RequestHeader("system_code") String sysCode);
+    HttpResult<List<EsmInsCompany>> getUserCompany(@RequestParam String systemCode);
 
     /**
      * 特别约定列表查询
+     *
      * @param companyClauseVo
      * @param token
      * @return
      */
     @PostMapping("/manager/clause/getClauseList")
-    HttpResult<List<InsCompanyClauseVo>> queryClauseData(@RequestBody CompanyClauseVo companyClauseVo, @RequestHeader("Authorization") String token);
+    HttpResult<List<InsCompanyClauseVo>> queryClauseData(@RequestBody CompanyClauseVo companyClauseVo);
 
 
     @PostMapping("/manager/clause/addClause")

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/aop/aspect/AuditVerificationAspect.java

@@ -95,12 +95,12 @@ public class AuditVerificationAspect {
 
             // 通过费用id 查找规则id
             String costId = insFeeOrders.getCostId();
-            HttpResult httpResult = orgClient.queryCostById(costId,baseController.getToken(),baseController.getSystemCode());
+            HttpResult httpResult = orgClient.queryCostById(costId);
             AssertionUtils.isFail(httpResult.getCode() == 500,"费用查找失败");
             PtlAgreementCost ptlAgreementCost = JSONObject.parseObject(JSONObject.toJSONString(httpResult.getData()),PtlAgreementCost.class);
             AssertionUtils.isFail(Objects.isNull(ptlAgreementCost),"费用查找失败");
             String coverRuleId = ptlAgreementCost.getCoverRuleId();
-            httpResult = orgClient.getRuleInfo(coverRuleId,baseController.getToken());
+            httpResult = orgClient.getRuleInfo(coverRuleId);
             AssertionUtils.isFail(httpResult.getCode() == 500,"承保规则查找失败");
             List<PtlAgreementUndwrtRulesAttrLink> attrLinks = JSONArray.parseArray(JSONObject.toJSONString(httpResult.getData()),PtlAgreementUndwrtRulesAttrLink.class);
 

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/aop/aspect/QuoteVerificationAspect.java

@@ -98,13 +98,13 @@ public class QuoteVerificationAspect {
             // 获取订单其他信息
             InsOrdersOther insOrdersOther = insOrdersOtherService.getById(insOrders.getId());
             // 获取协议信息
-            HttpResult<AgreementInfoVo> ptlAgreement = orgClient.queryAgreementById(insOrders.getAgreementId(), baseController.getToken(),baseController.getAppSystemCode());
+            HttpResult<AgreementInfoVo> ptlAgreement = orgClient.queryAgreementById(insOrders.getAgreementId());
             AgreementInfoVo agreementInfoVo = ptlAgreement.getData();
             // 通过协议id和产品id查询费用列表
             CostAgreementParam costAgreementParam = new CostAgreementParam();
             costAgreementParam.setPtlAgreementId(insOrders.getAgreementId());
             costAgreementParam.setProductId(insOrders.getProductId());
-            List<CostsListVo> costsList = orgClient.queryByAgreementIdAndProductId(costAgreementParam, baseController.getToken(),baseController.getSystemCode());
+            List<CostsListVo> costsList = orgClient.queryByAgreementIdAndProductId(costAgreementParam);
             //先过滤 能源 车辆类型
             List<CostsListVo> agreementProductCosts = this.beforeFilter(costsList,insOrdersCarInfo);
             // 设置默认的优先级

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/consumer/listener/enhance/EnhanceOrderMessageListener.java

@@ -35,7 +35,7 @@ public class EnhanceOrderMessageListener extends EnhanceMessageHandler<OrderMess
                 message.getBody(),
                 message.getReceiverUser(),
                 message.getTplCode());
-        orgClient.messageAdd(param,message.getToken());
+        orgClient.messageAdd(param);
     }
 
     @Override

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/controller/QrCodeController.java

@@ -134,7 +134,7 @@ public class QrCodeController extends BaseController {
         // 获取二维码配置
         HttpResult<QrBarcodeConfig> result = platformClient.qrBarcodeByCompanyCode(
                 orders.getCompanyId(),
-                orders.getApiType(),getToken());
+                orders.getApiType());
         if (Objects.isNull(result.getData())) {
             //重定向到错误页面中
             return getModelAndView("配置已失效,请联系客服处理");
@@ -160,7 +160,7 @@ public class QrCodeController extends BaseController {
         if (Constants.CONFIG_TYPE_2.equals(config.getType()) || Constants.CONFIG_TYPE_1.equals(config.getType())) {
             ModelAndView modelAndView = new ModelAndView();
             // 获取保险公司信息
-            HttpResult<EsmInsCompany> resultCompany = platformClient.findById(orders.getCompanyId(),getToken());
+            HttpResult<EsmInsCompany> resultCompany = platformClient.findById(orders.getCompanyId());
             AssertionUtils.isFail(Objects.isNull(resultCompany.getData()),"获取保险公司信息失败！");
             EsmInsCompany company = resultCompany.getData();
             // 获取保费

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/controller/UnifyOrderManager.java

@@ -212,15 +212,13 @@ public class UnifyOrderManager {
     @PostMapping("/quote")
     @QuoteVerification
     public HttpResult<QuoteResultsVo> quote(@RequestBody QuoteVo quoteVo) throws Exception {
-        HttpResult<EsmInsCompany> esmInsCompanyHttpResult = platformClient.findById(quoteVo.getOrder()
-                .getInsuranceCompanyCode(), baseController.getToken());
+        HttpResult<EsmInsCompany> esmInsCompanyHttpResult = platformClient.findById(quoteVo.getOrder().getInsuranceCompanyCode());
         AssertionUtils.isFail(esmInsCompanyHttpResult.getCode() != 200, esmInsCompanyHttpResult.getMsg());
         String systemCode = getSystemCode();
         String companyName = CompanyConstants.getCompanyNameByCode(esmInsCompanyHttpResult.getData().getCompanyCode());
 
 
-        HttpResult<List<PtlAgreement>> byCompanyId = orgClient.getByCompanyId(esmInsCompanyHttpResult.getData()
-                .getId(),systemCode, baseController.getToken(), systemCode);
+        HttpResult<List<PtlAgreement>> byCompanyId = orgClient.getByCompanyId(esmInsCompanyHttpResult.getData().getId(),systemCode);
         if (byCompanyId.getData().isEmpty()) {
             AssertionUtils.isFail(true, "保司未配置协议");
         }
@@ -291,7 +289,7 @@ public class UnifyOrderManager {
         //获取保司实体
         InsOrders insOrders = insOrdersService.getById(underwritingVo.getOrder().getOrdersNo());
         AssertionUtils.isFail(Objects.isNull(insOrders), "订单不存在");
-        HttpResult<EsmInsCompany> esmInsCompanyHttpResult = platformClient.findById(insOrders.getCompanyId(), baseController.getToken());
+        HttpResult<EsmInsCompany> esmInsCompanyHttpResult = platformClient.findById(insOrders.getCompanyId());
         underwritingVo.getOrder().setInsuranceCompanyCode(esmInsCompanyHttpResult.getData().getCompanyCode());
         underwritingVo.getOrder().setInsuranceCompanyId(esmInsCompanyHttpResult.getData().getId());
         QuotationBaseService quoteService = companyFactory.getUnderwritingService(insOrders, esmInsCompanyHttpResult.getData()
@@ -406,7 +404,7 @@ public class UnifyOrderManager {
         InsOrders insOrders = insOrdersService.getById(paymentLinkVo.getOrder().getOrdersNo());
         AssertionUtils.isFail(Objects.isNull(insOrders), "订单不存在");
         InsOrdersCarInfo insOrdersCarInfo = insOrdersCarInfoService.getByOrderId(insOrders.getId());
-        HttpResult<EsmInsCompany> esmInsCompanyHttpResult = platformClient.findById(insOrders.getCompanyId(), baseController.getToken());
+        HttpResult<EsmInsCompany> esmInsCompanyHttpResult = platformClient.findById(insOrders.getCompanyId());
         paymentLinkVo.getOrder().setInsuranceCompanyCode(esmInsCompanyHttpResult.getData().getCompanyCode());
         paymentLinkVo.getOrder().setInsuranceCompanyId(esmInsCompanyHttpResult.getData().getId());
 
@@ -438,11 +436,11 @@ public class UnifyOrderManager {
             throw new TokenExpireException("登录过期");
         }
         InsOrders insOrders = insOrdersService.getById(insuranceUploadImageVo.getOrder().getOrdersNo());
-        HttpResult<EsmInsCompany> esmInsCompanyHttpResult = platformClient.findById(insOrders.getCompanyId(), baseController.getToken());
+        HttpResult<EsmInsCompany> esmInsCompanyHttpResult = platformClient.findById(insOrders.getCompanyId());
         String systemCode = getSystemCode();
 
         //先默认第一个协议
-        HttpResult<List<PtlAgreement>> byCompanyId = orgClient.getByCompanyId(insOrders.getCompanyId(),systemCode, baseController.getToken(), systemCode);
+        HttpResult<List<PtlAgreement>> byCompanyId = orgClient.getByCompanyId(insOrders.getCompanyId(),systemCode);
         if (byCompanyId.getData().isEmpty()) {
             AssertionUtils.isFail(true, "保司未配置协议");
         }
@@ -469,11 +467,11 @@ public class UnifyOrderManager {
         }
         InsOrders insOrders = insOrdersService.getById(clauseDataVo.getOrder().getOrdersNo());
         InsOrdersCosts costs = insOrdersCostsService.getById(clauseDataVo.getOrder().getOrdersNo());
-        HttpResult<EsmInsCompany> esmInsCompanyHttpResult = platformClient.findById(insOrders.getCompanyId(), baseController.getToken());
+        HttpResult<EsmInsCompany> esmInsCompanyHttpResult = platformClient.findById(insOrders.getCompanyId());
         String systemCode = getSystemCode();
 
         //先默认第一个协议
-        HttpResult<List<PtlAgreement>> byCompanyId = orgClient.getByCompanyId(insOrders.getCompanyId(),systemCode, baseController.getToken(), systemCode);
+        HttpResult<List<PtlAgreement>> byCompanyId = orgClient.getByCompanyId(insOrders.getCompanyId(),systemCode);
         if (byCompanyId.getData().isEmpty()) {
             AssertionUtils.isFail(true, "保司未配置协议");
         }
@@ -481,7 +479,7 @@ public class UnifyOrderManager {
         // 获取特约列表
         CompanyClauseVo companyClauseVo = new CompanyClauseVo();
         companyClauseVo.setCompanyId(insOrders.getCompanyId());
-        HttpResult<List<InsCompanyClauseVo>> clauseDataResult = platformClient.queryClauseData(companyClauseVo, baseController.getToken());
+        HttpResult<List<InsCompanyClauseVo>> clauseDataResult = platformClient.queryClauseData(companyClauseVo);
         if (clauseDataResult.getData().isEmpty()) {
             AssertionUtils.isFail(true, "保司未配置特约");
         }
@@ -523,7 +521,7 @@ public class UnifyOrderManager {
 
         InsOrders insOrders = insOrdersService.getById(orderStatusVo.getOrder().getOrdersNo());
         AssertionUtils.isFail(Objects.isNull(insOrders), "订单不存在");
-        HttpResult<EsmInsCompany> esmInsCompanyHttpResult = platformClient.findById(insOrders.getCompanyId(), baseController.getToken());
+        HttpResult<EsmInsCompany> esmInsCompanyHttpResult = platformClient.findById(insOrders.getCompanyId());
         orderStatusVo.getOrder().setAgreementId(insOrders.getAgreementId());
         orderStatusVo.getOrder().setInsuranceCompanyCode(esmInsCompanyHttpResult.getData().getCompanyCode());
         orderStatusVo.getOrder().setInsuranceCompanyId(esmInsCompanyHttpResult.getData().getId());

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/factory/CompanyFactory.java

@@ -274,7 +274,7 @@ public class CompanyFactory {
         //设置归属信息
         String token = baseController.getToken();
         String systemCode = baseController.getAppSystemCode();
-        HttpResult<EsmInsCompany> esmInsCompanyHttpResult = platformClient.findById(insOrders.getCompanyId(), baseController.getToken());
+        HttpResult<EsmInsCompany> esmInsCompanyHttpResult = platformClient.findById(insOrders.getCompanyId());
         AssertionUtils.isFail(esmInsCompanyHttpResult.getCode() != 200, "保司代码错误");
         downloadPolicyVo.getOrder().setInsuranceCompanyCode(insOrders.getCompanyId());
         downloadPolicyVo.setRisks(insOrdersRiskService.list(new LambdaUpdateWrapper<InsOrdersRisk>()

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsFeeAuditServiceImpl.java

@@ -155,8 +155,7 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
         insFeeAudit.setOrderNo(orders.getId());
 
         // 获取协议信息
-        HttpResult<AgreementInfoVo> result = orgClient.queryAgreementById(orders.getAgreementId()
-                ,baseController.getToken(), baseController.getAppSystemCode());
+        HttpResult<AgreementInfoVo> result = orgClient.queryAgreementById(orders.getAgreementId());
         AssertionUtils.isFail(Objects.isNull(result.getData()),"获取协议失败！");
         AgreementInfoVo agreementInfoVo = result.getData();
         AgreementVo agreementVo = agreementInfoVo.getAgreement();
@@ -323,8 +322,8 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
 
             // 更新用户账户
             feeOrders = feeOrdersService.getById(param.getOrderNo());
-            HttpResult<SysUser> sysUserResult = orgClient.getUserOnlyIdByMobile(orders.getRealQuoteUserId(), baseController.getToken());
-            HttpResult<SysUserAccount> result = orgClient.accountGet(sysUserResult.getData().getId(), baseController.getToken());
+            HttpResult<SysUser> sysUserResult = orgClient.getUserOnlyIdByMobile(orders.getRealQuoteUserId());
+            HttpResult<SysUserAccount> result = orgClient.accountGet(sysUserResult.getData().getId());
             AssertionUtils.isFail(result.getCode() != 200,"获取用户账户失败！");
             userAccount = result.getData();
 
@@ -443,14 +442,14 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
                 userAccount.setSumAmount(feeOrders.getTotalReceivablePremium().add(userAccount.getSumAmount()));
                 userAccount.setSumAmountUnpaid(feeOrders.getTotalReceivablePremium().add(userAccount.getSumAmount()));
             }
-            orgClient.saveOrUpdate(userAccount, baseController.getToken());
+            orgClient.saveOrUpdate(userAccount);
 
             // 进入应收表
             List<String> orderNos = new ArrayList<>();
             orderNos.add(audit.getOrderNo());
             JSONObject requestData = new JSONObject();
             requestData.put("orderNos",orderNos);
-            HttpResult httpResult = orgClient.addReceivable(requestData, baseController.getToken());
+            HttpResult httpResult = orgClient.addReceivable(requestData);
             AssertionUtils.isFail(httpResult.getCode() == 500,"应收出错");
 
             // 一级分销费用户进账
@@ -458,7 +457,7 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
                 HttpResult<SysUserJzgInfo> jzgInfoResult = orgClient.getUserInfoById(feeOrders.getFirstDistributorId());
                 AssertionUtils.isFail(jzgInfoResult.getCode() != 200,"获取用户失败！");
                 SysUserJzgInfo jzgInfo = jzgInfoResult.getData();
-                HttpResult<SysUserAccount> jzgAccountResult = orgClient.accountGet(jzgInfo.getUserId(), baseController.getToken());
+                HttpResult<SysUserAccount> jzgAccountResult = orgClient.accountGet(jzgInfo.getUserId());
                 AssertionUtils.isFail(jzgAccountResult.getCode() != 200,"获取用户账户失败！");
                 distributor1 = jzgAccountResult.getData();
                 verifySysAccount(distributor1,jzgInfo,feeOrders);
@@ -468,7 +467,7 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
                 HttpResult<SysUserJzgInfo> jzgInfoResult = orgClient.getUserInfoById(feeOrders.getSecondDistributorId());
                 AssertionUtils.isFail(jzgInfoResult.getCode() != 200,"获取用户失败！");
                 SysUserJzgInfo jzgInfo = jzgInfoResult.getData();
-                HttpResult<SysUserAccount> jzgAccountResult = orgClient.accountGet(jzgInfo.getUserId(), baseController.getToken());
+                HttpResult<SysUserAccount> jzgAccountResult = orgClient.accountGet(jzgInfo.getUserId());
                 AssertionUtils.isFail(jzgAccountResult.getCode() != 200,"获取用户账户失败！");
                 distributor2 = jzgAccountResult.getData();
                 verifySysAccount(distributor2,jzgInfo,feeOrders);
@@ -478,7 +477,7 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
                 HttpResult<SysUserJzgInfo> jzgInfoResult = orgClient.getUserInfoById(feeOrders.getThirdDistributorId());
                 AssertionUtils.isFail(jzgInfoResult.getCode() != 200,"获取用户失败！");
                 SysUserJzgInfo jzgInfo = jzgInfoResult.getData();
-                HttpResult<SysUserAccount> jzgAccountResult = orgClient.accountGet(jzgInfo.getUserId(), baseController.getToken());
+                HttpResult<SysUserAccount> jzgAccountResult = orgClient.accountGet(jzgInfo.getUserId());
                 AssertionUtils.isFail(jzgAccountResult.getCode() != 200,"获取用户账户失败！");
                 distributor3 = jzgAccountResult.getData();
                 verifySysAccount(distributor3,jzgInfo,feeOrders);
@@ -494,7 +493,7 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
 
         // 增加账户的金额记录
         List<SysUserAccountIncomeLog>builderIncomeLog = this.builderIncomeLog(param.getOrderNo(),feeOrders,userAccount,distributor1,distributor2,distributor3);
-        HttpResult result = orgClient.addUserAccountIncomeLog(builderIncomeLog,baseController.getToken());
+        HttpResult result = orgClient.addUserAccountIncomeLog(builderIncomeLog);
         AssertionUtils.isFail(result.getCode() != 200,"账户记录添加失败,审核失败");
 
     }
@@ -570,7 +569,7 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
             userAccount.setSumAmount(feeOrders.getFirstDistributionFee().add(userAccount.getSumAmount()));
             userAccount.setSumAmountUnpaid(feeOrders.getFirstDistributionFee().add(userAccount.getSumAmountUnpaid()));
         }
-        orgClient.saveOrUpdate(userAccount, baseController.getToken());
+        orgClient.saveOrUpdate(userAccount);
     }
 
     @Override
@@ -612,8 +611,7 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
             this.getRecordCost(auditCostInfoVos, record, costTypeVos,feeOrders);
         }else {
             // 获取协议信息
-            HttpResult<AgreementInfoVo> result = orgClient.queryAgreementById(feeOrders.getAgreementId()
-                    ,baseController.getToken(), baseController.getAppSystemCode());
+            HttpResult<AgreementInfoVo> result = orgClient.queryAgreementById(feeOrders.getAgreementId());
             AssertionUtils.isFail(Objects.isNull(result.getData()),"获取协议失败！");
             AgreementInfoVo agreementInfoVo = result.getData();
             this.getAuditCost(auditCostInfoVos,costTypeVos,feeOrders,agreementInfoVo.getAgreement());

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsFeeOrdersServiceImpl.java

@@ -75,7 +75,7 @@ public class InsFeeOrdersServiceImpl extends ServiceImpl<InsFeeOrdersMapper, Ins
 
         String systemCode = getSystemCode();
         // 获取协议信息
-        PtlAgreement ptlAgreement = orgClient.getByAgreementId(insOrders.getAgreementId(), baseController.getToken(),systemCode);
+        PtlAgreement ptlAgreement = orgClient.getByAgreementId(insOrders.getAgreementId());
         // 获取费用信息
         InsFeeOrders insFeeOrders = insFeeOrdersMapper.selectById(insOrders.getId());
         // 保费

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsOrdersQrcodeServiceImpl.java

@@ -93,8 +93,7 @@ public class InsOrdersQrcodeServiceImpl extends ServiceImpl<InsOrdersQrcodeMappe
                 new LambdaQueryWrapper<InsOrdersExternalFee>()
                         .eq(InsOrdersExternalFee::getOrderNo, orders.getId()));
 
-        HttpResult<PtlAgreementCostVo> result = orgClient.queryCostById(ordersExternalFee.getCostId()
-                ,baseController.getToken());
+        HttpResult<PtlAgreementCostVo> result = orgClient.queryCostById(ordersExternalFee.getCostId());
         AssertionUtils.isFail(Objects.isNull(result.getData()),"获取费用失败！");
         PtlAgreementCostVo costVo = result.getData();
         LocalDateTime costsStartDate = LocalDateTimeUtils.convert(costVo.getEffectiveTime());
@@ -109,8 +108,7 @@ public class InsOrdersQrcodeServiceImpl extends ServiceImpl<InsOrdersQrcodeMappe
 
     @Override
     public boolean agreementValidated(InsOrders orders) {
-        HttpResult<AgreementInfoVo> result = orgClient.queryAgreementById(orders.getAgreementId()
-                ,baseController.getToken(), baseController.getAppSystemCode());
+        HttpResult<AgreementInfoVo> result = orgClient.queryAgreementById(orders.getAgreementId());
         AssertionUtils.isFail(Objects.isNull(result.getData()),"获取协议失败！");
         AgreementInfoVo agreementInfoVo = result.getData();
         AgreementVo agreementVo = agreementInfoVo.getAgreement();

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsOrdersServiceImpl.java

@@ -158,7 +158,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
             InsOrders insOrders = ordersAdd.getInsOrders();
             insOrders.setQuoteNo(SnowFlakeUtil.getSnowFlakeId());
             insOrders.setCompanyId(ordersAdd.getInsOrdersOtherInfo().getCompanyId());
-            HttpResult<EsmInsCompany> esmInsCompanyHttpResult = platformClient.findById(ordersAdd.getInsOrdersOtherInfo().getCompanyId(), baseController.getToken());
+            HttpResult<EsmInsCompany> esmInsCompanyHttpResult = platformClient.findById(ordersAdd.getInsOrdersOtherInfo().getCompanyId());
             String companyName = CompanyConstants.getCompanyNameByCode(esmInsCompanyHttpResult.getData().getCompanyCode());
             insOrders.setCompanyName(companyName);
             insOrders.setSigningTime(ordersAdd.getInsOrdersOtherInfo().getSigningTime());
@@ -398,14 +398,14 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         }
         // 协议名称、协议类型
         if (Objects.nonNull(insOrdersVo.getInsOrders().getAgreementId())) {
-            HttpResult<AgreementInfoVo> ptlAgreement = orgClient.queryAgreementById(insOrdersVo.getInsOrders().getAgreementId(), baseController.getToken(), baseController.getAppSystemCode());
+            HttpResult<AgreementInfoVo> ptlAgreement = orgClient.queryAgreementById(insOrdersVo.getInsOrders().getAgreementId());
             AssertionUtils.isFail(ptlAgreement.getCode() == 500, ptlAgreement.getMsg() + ",请联系管理处理");
             insOrdersVo.setAgreementType(ptlAgreement.getData().getAgreement().getAgreementType());
             insOrdersVo.setAgreementName(ptlAgreement.getData().getAgreement().getAgreementName());
         }
 
         // 业务员信息
-        SalesmanVo salesmanInfo = orgClient.getUserByMobile(insOrdersVo.getCreateBy(), baseController.getToken(), baseController.getAppSystemCode());
+        SalesmanVo salesmanInfo = orgClient.getUserByMobile(insOrdersVo.getCreateBy());
         if (Objects.nonNull(salesmanInfo)) {
             InsOrdersVo.Salesman salesman = new InsOrdersVo.Salesman();
             salesman.setName(salesmanInfo.getName());
@@ -771,8 +771,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
     @Override
     public void orderStatusMessage(InsOrders insOrders, InsOrdersCarInfo carInfo, InsOrdersCosts ordersCosts, String token, MessageCodeEnum tplCode) {
         // 获取消息模板 并替换内容
-        HttpResult<SysMessageTemplate> result = orgClient.templateGet(tplCode,
-                baseController.getToken());
+        HttpResult<SysMessageTemplate> result = orgClient.templateGet(tplCode);
         SysMessageTemplate template = result.getData();
         AssertionUtils.isFail(Objects.isNull(template), "获取模板失败！");
         Map<String, Object> valuesMap = new HashMap<>();
@@ -1080,7 +1079,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         QuoteEchoVo resultVo = new QuoteEchoVo(insOrdersVo);
         //获取保司信息
         String companyId = insOrdersVo.getInsOrders().getCompanyId();
-        HttpResult<EsmInsCompany> esmInsCompanyHttpResult = platformClient.findLogoById(companyId, baseController.getToken());
+        HttpResult<EsmInsCompany> esmInsCompanyHttpResult = platformClient.findLogoById(companyId);
         if (esmInsCompanyHttpResult.getCode() == 200) {
             resultVo.setInsCompanyVo(esmInsCompanyHttpResult.getData());
         }
@@ -1136,7 +1135,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         if (insFeeOrders != null) {
             resultVo.setInsFeeOrders(new InsFeeOrdersVo(insFeeOrders));
             List<PtlAgreementCostTypeVo> ptlAgreementCostTypeList = orgClient.queryByCostId(insFeeOrders.getCostId());
-            PtlAgreement ptlAgreement = orgClient.getByAgreementId(insOrdersVo.getInsOrders().getAgreementId(), baseController.getToken(), systemCode);
+            PtlAgreement ptlAgreement = orgClient.getByAgreementId(insOrdersVo.getInsOrders().getAgreementId());
             //resultVo.setCostRatio(new PtlAgreementCostRatioVo(ptlAgreementCostTypeList, ptlAgreement));
             resultVo.setCostRatio(new PtlAgreementCostRatioVo(insFeeOrders));
         }
@@ -1181,7 +1180,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
     @Override
     public List<HistoryQuoteResultVo> getHistoryQuoteByLicenseNo(String licenseNo) {
         List<HistoryQuoteResultVo> historyQuoteByLicenseNo = insOrdersMapper.getHistoryQuoteByLicenseNo(licenseNo);
-        HttpResult<List<EsmInsCompany>> userCompanyResult = platformClient.getUserCompany(baseController.getAppSystemCode(), baseController.getToken(), baseController.getAppSystemCode());
+        HttpResult<List<EsmInsCompany>> userCompanyResult = platformClient.getUserCompany(baseController.getAppSystemCode());
         List<EsmInsCompany> userCompany = userCompanyResult.getData();
         historyQuoteByLicenseNo.forEach(item -> {
             EsmInsCompany esmInsCompany = userCompany.stream().filter(x -> x.getId().equals(item.getCompanyId())).findFirst().orElse(null);
@@ -1200,7 +1199,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
                 .groupBy(InsOrders::getCompanyId));
         List<String> companyIds = insOrders.stream().filter(v -> !Objects.isNull(v) && StringUtils.isNotEmpty(v.getCompanyId())).map(InsOrders::getCompanyId).collect(Collectors.toList());
         String joined = String.join(",", companyIds);
-        HttpResult<List<EsmInsCompany>> companyByIds = platformClient.getCompanyByIds(joined, baseController.getToken());
+        HttpResult<List<EsmInsCompany>> companyByIds = platformClient.getCompanyByIds(joined);
         return companyByIds.getData();
     }