update

1.修改远程调用

authentication/pom.xml

@@ -33,6 +33,12 @@
             <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
         </dependency>
 
+        <!-- 负载均衡器 -->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-loadbalancer</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-openfeign</artifactId>

authentication/src/main/java/com/jzg/client/PartnerDistributionClient.java

@@ -7,15 +7,15 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestParam;
 
-@FeignClient(name = "jzg-partner",url = "${feign.client.jzg-partner.url}")
+@FeignClient(name = "jzg-partner")
 public interface PartnerDistributionClient {
 
 
-    @GetMapping("partner/isTherePartner")
-    HttpResult<Boolean> isTherePartner(@RequestParam String userId,@RequestParam String systemCode);
+    @GetMapping("/partner/isTherePartner")
+    HttpResult<Boolean> isTherePartner(@RequestParam String userId, @RequestParam String systemCode);
 
 
-    @GetMapping("partnerDistribution/initializeCommissionDetails")
-    HttpResult<Boolean> initializeCommissionDetails(@RequestParam String userId,@RequestHeader("Authorization") String token);
+    @GetMapping("/partnerDistribution/initializeCommissionDetails")
+    HttpResult<Boolean> initializeCommissionDetails(@RequestParam String userId);
 
 }

authentication/src/main/java/com/jzg/controller/AppAuthController.java

@@ -43,7 +43,7 @@ import java.io.IOException;
 import java.util.regex.Pattern;
 
 @Slf4j
-@Tag(name="APP授权接口")
+@Tag(name = "APP授权接口")
 @RestController
 @RequestMapping("appAuth")
 public class AppAuthController extends BaseController {
@@ -72,8 +72,8 @@ public class AppAuthController extends BaseController {
     @Operation(summary = "登录接口",
             description = "登录接口",
             responses = {
-                    @ApiResponse(responseCode = "200",description = "登录成功"),
-                    @ApiResponse(responseCode = "403",description = "登录失败")
+                    @ApiResponse(responseCode = "200", description = "登录成功"),
+                    @ApiResponse(responseCode = "403", description = "登录失败")
             })
     @PostMapping("appLogin")
     public void login(@RequestBody AppLoginFormVo loginFormVo) throws ServletException, IOException {
@@ -82,32 +82,31 @@ public class AppAuthController extends BaseController {
     }
 
 
-
     @Operation(summary = "合伙人登录接口",
             description = "合伙人登录接口",
             responses = {
-                    @ApiResponse(responseCode = "200",description = "登录成功"),
-                    @ApiResponse(responseCode = "403",description = "登录失败")
+                    @ApiResponse(responseCode = "200", description = "登录成功"),
+                    @ApiResponse(responseCode = "403", description = "登录失败")
             })
     @PostMapping("partnerAppLogin")
     public void partnerAppLogin(@RequestBody AppLoginFormVo loginFormVo) throws ServletException, IOException {
         try {
             SysUser sysUser = sysUserService.getOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getMobile, loginFormVo.getMobile()));
-            if (ObjectUtil.isNull(sysUser)){
+            if (ObjectUtil.isNull(sysUser)) {
                 throw new ServletException("当前用户不存在或已注销");
             }
             SysUserJzgInfo sysUserJzgInfo = sysUserJzgInfoMapper.selectOne(new LambdaQueryWrapper<>(SysUserJzgInfo.class)
                     .eq(SysUserJzgInfo::getUserId, sysUser.getId())
                     .eq(SysUserJzgInfo::getSystemCode, loginFormVo.getSystem()));
-            HttpResult<Boolean> isTherePartner = partnerDistributionClient.isTherePartner(sysUserJzgInfo.getId(),loginFormVo.getSystem());
-            if (200 == isTherePartner.getCode()){
-                if (!isTherePartner.getData()){
+            HttpResult<Boolean> isTherePartner = partnerDistributionClient.isTherePartner(sysUserJzgInfo.getId(), loginFormVo.getSystem());
+            if (200 == isTherePartner.getCode()) {
+                if (!isTherePartner.getData()) {
                     throw new ServletException("当前用户无登录权限");
                 }
             }
             modifyPass(loginFormVo);
-            partnerCommissionService.initializePartnerCommission(sysUserJzgInfo.getId(),tokenStore.getTokenByUsername(loginFormVo.getMobile()));
-        }catch (Exception e){
+            partnerCommissionService.initializePartnerCommission(sysUserJzgInfo.getId());
+        } catch (Exception e) {
             throw new ServletException("当前用户不存在或已注销");
         }
     }
@@ -124,10 +123,9 @@ public class AppAuthController extends BaseController {
     }
 
 
-
     @PostMapping("modifyPass")
     @Operation(summary = "修改密码")
-    public HttpResult modifyPass(@RequestBody ModifyAppLoginVo appLoginVo){
+    public HttpResult modifyPass(@RequestBody ModifyAppLoginVo appLoginVo) {
         SysUser sysUser = sysUserService.getOne(new LambdaQueryWrapper<SysUser>()
                 .eq(SysUser::getUsername, appLoginVo.getMobile())
                 .or()
@@ -135,21 +133,18 @@ public class AppAuthController extends BaseController {
         //检验密码
         String passwordPattern = "^(?=.*[A-Za-z])(?=.*\\d)[A-Za-z\\d]{8,20}$";
         Pattern pattern = Pattern.compile(passwordPattern);
-        if(!pattern.matcher(appLoginVo.getNewPassWord()).matches()){
+        if (!pattern.matcher(appLoginVo.getNewPassWord()).matches()) {
             throw new SystemException("密码格式错误");
         }
         //如果旧密码一致更改密码
-        if(!PasswordUtils.encode(appLoginVo.getOldPassWord(),sysUser.getSalt()).equals(sysUser.getPassword()))
-        {
+        if (!PasswordUtils.encode(appLoginVo.getOldPassWord(), sysUser.getSalt()).equals(sysUser.getPassword())) {
             throw new SystemException("旧密码错误");
         }
-        sysUser.setPassword(PasswordUtils.encode(appLoginVo.getNewPassWord(),sysUser.getSalt()));
+        sysUser.setPassword(PasswordUtils.encode(appLoginVo.getNewPassWord(), sysUser.getSalt()));
         return sysUserService.updateById(sysUser) ? HttpResult.ok("密码修改成功") : HttpResult.error("密码修改失败");
     }
 
 
-
-
     @Operation(summary = "短信验证码登录")
     @PostMapping("smsCodeLogin")
     public void smsCodeLogin(@Validated @RequestBody AppSmsCodeLogin smsCodeLogin) throws ServletException, IOException {
@@ -172,7 +167,7 @@ public class AppAuthController extends BaseController {
 //        if (!Objects.equals(smsCodeLogin.getSmsCode(), smsCode)){
 //            throw new SystemException("短信验证码错误");
 //        }
-        if(ObjectUtil.isNull(sysUser)){
+        if (ObjectUtil.isNull(sysUser)) {
             register(smsCodeLogin);
         }
         AppLoginFormVo loginFormVo = new AppLoginFormVo();
@@ -183,13 +178,13 @@ public class AppAuthController extends BaseController {
 
 
     @Transactional(rollbackFor = Exception.class)
-    public void register(AppSmsCodeLogin smsCodeLogin){
+    public void register(AppSmsCodeLogin smsCodeLogin) {
         SysUser sysUser = new SysUser();
         sysUser.setMobile(smsCodeLogin.getMobile());
         sysUser.setUsername(smsCodeLogin.getMobile());
         String salt = PasswordUtils.getSalt();
         sysUser.setSalt(salt);
-        sysUser.setPassword(PasswordUtils.encode("12345678",salt));
+        sysUser.setPassword(PasswordUtils.encode("12345678", salt));
         sysUserService.save(sysUser);
         SysUserJzgInfo sysUserJzgInfo = new SysUserJzgInfo();
         sysUserJzgInfo.setName(sysUser.getMobile());

authentication/src/main/java/com/jzg/service/InitializePartnerCommissionService.java

@@ -5,7 +5,7 @@ public interface InitializePartnerCommissionService {
 
 
 
-    void initializePartnerCommission(String userId,String token);
+    void initializePartnerCommission(String userId);
 
 
 }

authentication/src/main/java/com/jzg/service/impl/InitializePartnerCommissionServiceImpl.java

@@ -16,9 +16,9 @@ public class InitializePartnerCommissionServiceImpl implements InitializePartner
 
     @Async
     @Override
-    public void initializePartnerCommission(String userId,String token) {
+    public void initializePartnerCommission(String userId) {
         try {
-            distributionClient.initializeCommissionDetails(userId,token);
+            distributionClient.initializeCommissionDetails(userId);
         }catch (Exception e){
             e.printStackTrace();
         }

authentication/src/main/resources/application-prod.yml

@@ -1,8 +1,6 @@
 server:
   port: 8081
 spring:
-  application:
-    name: jzg-auth
   cloud:
     nacos:
       server-addr: 172.24.144.227:8848

authentication/src/main/resources/application-test.yml

@@ -1,8 +1,6 @@
 server:
   port: 9081
 spring:
-  application:
-    name: jzg-auth
   cloud:
     nacos:
       server-addr: 192.168.0.250:8848

authentication/src/main/resources/application.yml

@@ -2,6 +2,8 @@ server:
   port: 8081
 
 spring:
+  application:
+    name: jzg-auth
   profiles:
     active: dev
   main:

commons/pom.xml

@@ -127,6 +127,11 @@
             <version>5.8.26</version>
             <scope>compile</scope>
         </dependency>
+
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

commons/src/main/java/com/jzg/commons/config/BaseFeignConfig.java

@@ -0,0 +1,33 @@
+package com.jzg.commons.config;
+
+import feign.RequestInterceptor;
+import jakarta.servlet.http.HttpServletRequest;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.context.request.RequestAttributes;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+@Configuration
+public class BaseFeignConfig {
+
+    @Bean
+    public RequestInterceptor requestInterceptor() {
+        //拦截器 设置Token
+        return requestTemplate -> {
+            RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes();
+            if (requestAttributes instanceof ServletRequestAttributes) {
+                HttpServletRequest request = ((ServletRequestAttributes) requestAttributes).getRequest();
+                String token = request.getHeader("Authorization");
+                if (token != null) {
+                    requestTemplate.header("Authorization", token);
+                }
+                String systemCode = request.getHeader("system_code");
+                if (systemCode != null) {
+                    requestTemplate.header("system_code", token);
+                }
+            }
+        };
+    }
+
+}

commons/src/main/java/com/jzg/commons/config/resttemplate/RestTemplateConfig.java

@@ -5,6 +5,7 @@ import org.apache.hc.client5.http.config.RequestConfig;
 import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
 import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager;
 import org.apache.hc.core5.util.Timeout;
+import org.springframework.cloud.client.loadbalancer.LoadBalanced;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
@@ -47,6 +48,7 @@ public class RestTemplateConfig {
     private static final int CONNECTION_REQUEST_TIMEOUT = 1000;
 
     @Bean("restTemplate")
+    @LoadBalanced
     @Primary
     public RestTemplate restTemplate() throws NoSuchAlgorithmException, KeyManagementException {
         RestTemplate restTemplate = new RestTemplate(httpRequestFactory());

partner/pom.xml

@@ -24,6 +24,13 @@
             <artifactId>commons</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
+
+        <!-- 负载均衡器 -->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-loadbalancer</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-openfeign</artifactId>

partner/src/main/java/com/jzg/client/OrganizationClient.java

@@ -8,19 +8,19 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestParam;
 
-@FeignClient(name="jzg-organization",url = "${feign.client.jzg-org.url}")
+@FeignClient(name = "jzg-organization")
 public interface OrganizationClient {
 
 
     @GetMapping("userInfo/getUserInfoById")
-    HttpResult<SysUserJzgInfo> getUserInfoById(@RequestParam String id,@RequestHeader("Authorization") String token);
+    HttpResult<SysUserJzgInfo> getUserInfoById(@RequestParam String id);
 
 
     @GetMapping("userInfo/getUserInfoByUserId")
-    HttpResult<SysUserJzgInfo> getUserInfoByUserId(@RequestParam String userId,@RequestHeader("Authorization") String token);
+    HttpResult<SysUserJzgInfo> getUserInfoByUserId(@RequestParam String userId);
 
 
     @GetMapping(value = "userInfo/selectByUserIdInfo")
-    SysUserJzgInfo selectByUserIdInfo(@RequestParam String userId,@RequestHeader("Authorization") String token);
+    SysUserJzgInfo selectByUserIdInfo(@RequestParam String userId);
 
 }

partner/src/main/java/com/jzg/controller/DistributionController.java

@@ -21,20 +21,19 @@ public class DistributionController extends BaseController {
 
 
     @PostMapping("generateDistributionData")
-    public HttpResult distribution(@RequestBody DistributionVo vo){
+    public HttpResult distribution(@RequestBody DistributionVo vo) {
         try {
-            DistributionUtils.newSaveFeeInfo(vo.getInsOrders(),vo.getOrdersCosts(),vo.getLicenseNo(),baseController.getToken());
-        }catch (Exception e){
+            DistributionUtils.newSaveFeeInfo(vo.getInsOrders(), vo.getOrdersCosts(), vo.getLicenseNo());
+        } catch (Exception e) {
             e.printStackTrace();
-            log.error("合伙人分销明细数据生成失败：{}",e.getMessage());
+            log.error("合伙人分销明细数据生成失败：{}", e.getMessage());
         }
         return HttpResult.ok();
     }
 
 
-
     @GetMapping("initializeCommissionDetails")
-    public void initializeCommissionDetails(@RequestParam String userId){
+    public void initializeCommissionDetails(@RequestParam String userId) {
         SpringUtil.getBean(UpdateRatioUtils.class).loginBefore(userId);
         SpringUtil.getBean(UpdateRatioUtils.class).loginChange(userId);
     }

partner/src/main/java/com/jzg/controller/PartnerUserController.java

@@ -33,34 +33,34 @@ public class PartnerUserController extends BaseController {
     private PartnerUserService partnerUserService;
 
     @PostMapping("teamInvitation")
-    public boolean teamInvitation(@RequestBody SysUserJzgInfo info){
+    public boolean teamInvitation(@RequestBody SysUserJzgInfo info) {
         return partnerUserService.teamInvitation(info);
     }
 
     @GetMapping("isTherePartner")
-    public HttpResult isTherePartner(@RequestParam String userId,@RequestParam String systemCode){
-        return partnerUserService.isTherePartner(userId,systemCode);
+    public HttpResult isTherePartner(@RequestParam String userId, @RequestParam String systemCode) {
+        return partnerUserService.isTherePartner(userId, systemCode);
     }
 
     @PostMapping("addPartnerRule")
-    public HttpResult addPartnerRule(@RequestBody SysUserVo sysUserVo){
-        return partnerUserService.addPartnerRule(sysUserVo,sysUserVo.getGradeList(),getToken());
+    public HttpResult addPartnerRule(@RequestBody SysUserVo sysUserVo) {
+        return partnerUserService.addPartnerRule(sysUserVo, sysUserVo.getGradeList(), getToken());
     }
 
     @GetMapping("partnerDetails")
-    public HttpResult partnerDetails(@RequestParam String userId){
+    public HttpResult partnerDetails(@RequestParam String userId) {
         return partnerUserService.partnerDetails(userId);
     }
 
     @GetMapping("searchUserStudios")
-    public PartnerUser searchUserStudios(@RequestParam String userId){
+    public PartnerUser searchUserStudios(@RequestParam String userId) {
         return partnerUserService.searchUserStudios(userId);
     }
 
 
     @GetMapping("enableDisable")
-    public HttpResult enableDisable(@RequestParam("userId") String userId,@RequestParam("status")boolean status ){
-        return partnerUserService.enableDisable(userId, status,getToken());
+    public HttpResult enableDisable(@RequestParam("userId") String userId, @RequestParam("status") boolean status) {
+        return partnerUserService.enableDisable(userId, status, getToken());
     }
 
 
@@ -68,7 +68,7 @@ public class PartnerUserController extends BaseController {
     public HttpResult add(@RequestBody PartnerUser partnerUser) {
         boolean exists = partnerUserService.exists(new LambdaQueryWrapper<>(PartnerUser.class).eq(PartnerUser::getUserId, partnerUser.getUserId())
                 .eq(PartnerUser::getGrade, partnerUser.getGrade()));
-        if (exists){
+        if (exists) {
             return HttpResult.error("已存在业务员身份");
         }
         return HttpResult.ok(partnerUserService.save(partnerUser) ? "添加成功" : "添加失败");
@@ -77,11 +77,10 @@ public class PartnerUserController extends BaseController {
 
     @PostMapping("/update")
     public HttpResult update(@RequestBody PartnerUser partnerUser) {
-        return HttpResult.ok(partnerUserService.updateById(partnerUser)  ? "修改成功" : "修改失败");
+        return HttpResult.ok(partnerUserService.updateById(partnerUser) ? "修改成功" : "修改失败");
     }
 
 
-
     @PostMapping("/queryPage")
     public HttpResult queryPage(@RequestBody QueryVo queryVo) {
         return HttpResult.ok(partnerUserService.queryPage(queryVo));
@@ -89,28 +88,31 @@ public class PartnerUserController extends BaseController {
 
     /**
      * 用户关系查询
+     *
      * @param id
      * @returns
      */
     @GetMapping("relationalQuery")
     public HttpResult relationalQuery(@RequestParam("id") String id) {
-        return HttpResult.ok(partnerUserService.relationalQuery(id,getToken()));
+        return HttpResult.ok(partnerUserService.relationalQuery(id));
     }
 
 
     /**
      * 选择上级推荐人
+     *
      * @param level
      * @return
      */
     @GetMapping("selectRecommender")
-    public HttpResult selectRecommender(@RequestParam(value = "level",required = false) String level) {
+    public HttpResult selectRecommender(@RequestParam(value = "level", required = false) String level) {
         return HttpResult.ok(partnerUserService.selectRecommender(level));
     }
 
 
     /**
      * 验证是否满足升级条件
+     *
      * @param userGradeParam
      * @return
      */
@@ -123,6 +125,7 @@ public class PartnerUserController extends BaseController {
 
     /**
      * 提交合伙人变更申请
+     *
      * @param userGradeParam
      * @return
      */
@@ -135,6 +138,7 @@ public class PartnerUserController extends BaseController {
 
     /**
      * 合伙人头像修改
+     *
      * @param partnerUser
      * @return
      */
@@ -146,16 +150,18 @@ public class PartnerUserController extends BaseController {
 
     /**
      * 我的佣金比例
+     *
      * @return
      */
     @GetMapping("commissionRate")
     public HttpResult commissionRate(@RequestParam("grade") String grade) {
-        return partnerUserService.commissionRate(getUserId(),grade,getToken());
+        return partnerUserService.commissionRate(getUserId(), grade, getToken());
     }
 
 
     /**
      * 我的佣金比例
+     *
      * @return
      */
     @GetMapping("myCommissionRate")
@@ -166,16 +172,18 @@ public class PartnerUserController extends BaseController {
 
     /**
      * 查询当前用户的身份
+     *
      * @param userId
      * @return
      */
     @GetMapping("getUserGradeList")
-    public HttpResult getUserGradeList(@RequestParam(value = "userId",required = false) String userId) {
-        return HttpResult.ok(partnerUserService.getUserGradeList(userId,getToken()));
+    public HttpResult getUserGradeList(@RequestParam(value = "userId", required = false) String userId) {
+        return HttpResult.ok(partnerUserService.getUserGradeList(userId, getToken()));
     }
 
     /**
      * 查询当前用户的身份
+     *
      * @param userId
      * @return
      */
@@ -185,53 +193,55 @@ public class PartnerUserController extends BaseController {
     }
 
 
-
     /**
      * 新增用户身份
+     *
      * @param > map
      * @return
      */
     @PostMapping("addUserIdentity")
-    public HttpResult addUserIdentity(@RequestBody Map<String,Object> map) {
-        return partnerUserService.addUserIdentity(map,getToken());
+    public HttpResult addUserIdentity(@RequestBody Map<String, Object> map) {
+        return partnerUserService.addUserIdentity(map, getToken());
     }
 
     /**
      * 未降级完成任务
+     *
      * @param grade
      * @return
      */
     @GetMapping("queryDowngradeTask")
     public HttpResult queryDowngradeTask(@RequestParam(value = "grade") String grade) {
-        return partnerUserService.queryDowngradeTask(grade,getUserId());
+        return partnerUserService.queryDowngradeTask(grade, getUserId());
     }
 
 
     /**
      * 已降级完成任务
+     *
      * @param grade
      * @return
      */
     @GetMapping("degradedTask")
     public HttpResult degradedTask(@RequestParam(value = "grade") String grade) {
-        return partnerUserService.degradedTask(grade,getUserId());
+        return partnerUserService.degradedTask(grade, getUserId());
     }
 
 
-
     /**
      * 已降级完成任务
+     *
      * @return
      */
     @GetMapping("checkCommissionExpireTime")
     public void checkCommissionExpireTime() {
-         SpringUtil.getBean(TimedTaskUtils.class).checkCommissionExpireTime();
+        SpringUtil.getBean(TimedTaskUtils.class).checkCommissionExpireTime();
     }
 
 
-
     /**
      * 联系客服
+     *
      * @return
      */
     @GetMapping("contactCustomerService")

partner/src/main/java/com/jzg/service/PartnerUserService.java

@@ -25,7 +25,7 @@ public interface PartnerUserService extends IService<PartnerUser> {
     IPage<PartnerUserVo> queryPage(QueryVo queryVo);
 
 
-    List<RelationalVo>  relationalQuery(String id,String token);
+    List<RelationalVo>  relationalQuery(String id);
 
     List<Map<String,String>> selectRecommender(String level);
 

partner/src/main/java/com/jzg/utils/DistributionUtils.java

@@ -59,12 +59,12 @@ public class DistributionUtils {
     /**
      * 保存新的费用信息
      */
-    public static void newSaveFeeInfo(InsOrders insOrders, InsOrdersCosts ordersCosts, String licenseNo,String token) {
+    public static void newSaveFeeInfo(InsOrders insOrders, InsOrdersCosts ordersCosts, String licenseNo) {
         if (Objects.isNull(insOrders) || Objects.isNull(ordersCosts) || Objects.isNull(licenseNo)
                 || Objects.isNull(insOrders.getRealQuoteUserId())) {
             throw new IllegalArgumentException("入参不能为空，订单信息与用户ID必须有效");
         }
-        HttpResult<SysUserJzgInfo> userInfoById = organizationClient.getUserInfoById(insOrders.getRealQuoteUserId(),token);
+        HttpResult<SysUserJzgInfo> userInfoById = organizationClient.getUserInfoById(insOrders.getRealQuoteUserId());
         if (200 != userInfoById.getCode()){
             throw new RuntimeException("获取用户信息异常");
         }

pom.xml

@@ -42,6 +42,7 @@
     <rocket.version>1.0-SNAPSHOT</rocket.version>
     <seate.version>1.7.0</seate.version>
     <weixin-java.version>4.7.0</weixin-java.version>
+    <spring-cloud.version>2022.0.0</spring-cloud.version>
   </properties>
 
 
@@ -98,10 +99,21 @@
       <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
     </dependency>
 
+
+
   </dependencies>
+
   <dependencyManagement>
     <dependencies>
 
+      <dependency>
+        <groupId>org.springframework.cloud</groupId>
+        <artifactId>spring-cloud-dependencies</artifactId>
+        <version>${spring-cloud.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+
       <dependency>
         <groupId>com.alibaba.cloud</groupId>
         <artifactId>spring-cloud-alibaba-dependencies</artifactId>
@@ -110,7 +122,6 @@
         <scope>import</scope>
       </dependency>
 
-
       <dependency>
         <groupId>org.springframework.cloud</groupId>
         <artifactId>spring-cloud-starter-openfeign</artifactId>
@@ -160,13 +171,6 @@
         <version>3.0.0</version>
       </dependency>
 
-      <dependency>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-webflux</artifactId>
-      </dependency>
-
-
-
       <!-- 数据库驱动，如 MySQL -->
       <dependency>
         <groupId>mysql</groupId>

tenant/costsorrule/pom.xml

@@ -23,6 +23,7 @@
             <version>1.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
+
     </dependencies>
     <build>
         <plugins>

tenant/costsorrule/src/main/java/com/jzg/costsorrule/client/QuoteClient.java

@@ -11,11 +11,12 @@ import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 
-@FeignClient(name="jzg-insurance",url = "${feign.client.jzg-insurance.url}")
+@FeignClient(name = "jzg-insurance")
 public interface QuoteClient {
 
     /**
      * 新旧车判断
+     *
      * @param registerDate
      * @param companyId
      * @param vehicleType
@@ -25,6 +26,4 @@ public interface QuoteClient {
     public HttpResult compareNewCar(@RequestParam("registerDate") String registerDate, @RequestParam("companyId") String companyId, @RequestParam("vehicleType") String vehicleType);
 
 
-
-
 }

tenant/openfeign/pom.xml

@@ -1,84 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>com.jzg</groupId>
-        <artifactId>tenant</artifactId>
-        <version>1.0-SNAPSHOT</version>
-    </parent>
-    <artifactId>openfeign</artifactId>
-    <packaging>jar</packaging>
-    <name>openfeign Maven Webapp</name>
-    <url>http://maven.apache.org</url>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-            <version>3.0.0</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-openfeign</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>repackage</id>
-                        <phase>none</phase>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy-dependencies</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>copy-dependencies</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}/lib</outputDirectory>
-                            <overWriteReleases>false</overWriteReleases>
-                            <overWriteSnapshots>false</overWriteSnapshots>
-                            <overWriteIfNewer>true</overWriteIfNewer>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <addClasspath>true</addClasspath>
-                            <classpathPrefix>lib/</classpathPrefix>
-                            <mainClass>com.jzg.organization.OrganizationApplication</mainClass> <!-- 替换为你的主类 -->
-                            <useUniqueVersions>false</useUniqueVersions>
-                        </manifest>
-                        <manifestEntries>
-                            <Class-Path>config/</Class-Path>
-                        </manifestEntries>
-                    </archive>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-resources-plugin</artifactId>
-                <version>3.1.0</version>
-            </plugin>
-        </plugins>
-    </build>
-</project>

tenant/openfeign/src/main/java/com/jzg/openfeign/OpenFeignApplication.java

@@ -1,18 +0,0 @@
-package com.jzg.openfeign;
-
-import org.mybatis.spring.annotation.MapperScan;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-//import org.springframework.cloud.openfeign.EnableFeignClients;
-import org.springframework.context.annotation.ComponentScan;
-
-@SpringBootApplication
-//@EnableFeignClients
-@ComponentScan(basePackages = "com.jzg")
-@MapperScan("com.jzg")
-public class OpenFeignApplication {
-    public static void main(String[] args) {
-        SpringApplication.run(OpenFeignApplication.class, args);
-    }
-
-}

tenant/openfeign/src/main/java/com/jzg/openfeign/client/SystemClient.java

@@ -1,9 +0,0 @@
-//package com.jzg.openfeign.client;
-//
-//import org.springframework.cloud.openfeign.FeignClient;
-//
-//@FeignClient("system")
-//public interface SystemClient {
-//
-//
-//}

tenant/openfeign/src/main/java/com/jzg/openfeign/config/FeignConfig.java

@@ -1,27 +0,0 @@
-//package com.jzg.openfeign.config;
-//
-//import feign.RequestInterceptor;
-//import jakarta.servlet.http.HttpServletRequest;
-//import org.springframework.context.annotation.Bean;
-//import org.springframework.context.annotation.Configuration;
-//import org.springframework.web.context.request.RequestAttributes;
-//import org.springframework.web.context.request.RequestContextHolder;
-//import org.springframework.web.context.request.ServletRequestAttributes;
-//
-//@Configuration
-//public class FeignConfig {
-//    @Bean
-//    public RequestInterceptor requestInterceptor() {
-//        //拦截器 设置Token
-//        return requestTemplate -> {
-//            RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes();
-//            if (requestAttributes instanceof ServletRequestAttributes) {
-//                HttpServletRequest request = ((ServletRequestAttributes) requestAttributes).getRequest();
-//                String token = request.getHeader("Authorization");
-//                if (token != null) {
-//                    requestTemplate.header("Authorization", token);
-//                }
-//            }
-//        };
-//    }
-//}

tenant/openfeign/src/main/java/com/jzg/openfeign/entity/po/SysArea.java

@@ -1,7 +0,0 @@
-package com.jzg.openfeign.entity.po;
-
-import lombok.Data;
-
-@Data
-public class SysArea {
-}

tenant/openfeign/src/main/java/com/jzg/openfeign/mapper/SysAreaMapper.java

@@ -1,4 +0,0 @@
-package com.jzg.openfeign.mapper;
-
-public class SysAreaMapper {
-}

tenant/openfeign/src/main/resources/application.yml

@@ -1,41 +0,0 @@
-server:
-  port: 8085
-spring:
-  redis:
-    redisson:
-      address: redis://127.0.0.1:16379
-      password: 123456
-      database: 0
-
-  datasource:
-      url: jdbc:mysql://39.98.239.48:3366/platform?serverTimezone=Asia/Shanghai&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&rewriteBatchedStatements=true
-      username: root
-      password: '@RqGHG#KZ*C9ytkQ'
-      driverClassName: com.mysql.cj.jdbc.Driver
-  cloud:
-    nacos:
-      config:
-        import-check.enabled: false
-
-mybatis-plus:
-  mapper-locations: classpath*:/mapper/*Mapper.xml
-  global-config:
-    db-config:
-      logic-delete-field: is_delete
-      logic-delete-value: 1
-      logic-not-delete-value: 0
-  configuration:
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-
-config:
-  sso: 1
-
-#多租户配置
-tenant:
-  enable: true
-  column: system_code
-  filterTables:
-  ignoreTables:
-    - sys_system
-    - sys_role_perms
-  ignoreLoginNames:

tenant/organization/pom.xml

@@ -16,6 +16,12 @@
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
 
+        <!-- 负载均衡器 -->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-loadbalancer</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-openfeign</artifactId>
@@ -60,6 +66,12 @@
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-xml</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.jzg</groupId>
+            <artifactId>quotation-summary</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
 
     </dependencies>
     <build>

tenant/organization/src/main/java/com/jzg/organization/client/CostsRuleClient.java

@@ -7,7 +7,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/organization/src/main/java/com/jzg/organization/client/EsmInsCompanyClient.java

@@ -10,12 +10,13 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
-@FeignClient(name="jzg-platform",url = "${feign.client.jzg-platform.url}")
+@FeignClient(name = "jzg-platform")
 public interface EsmInsCompanyClient {
 
 
     /**
      * 根据id获取保险公司信息
+     *
      * @param id
      * @return
      */
@@ -24,6 +25,7 @@ public interface EsmInsCompanyClient {
 
     /**
      * 查找存在协议的保险公司列表
+     *
      * @return
      */
     @GetMapping("/esmInsCompany/liveCompanyList")
@@ -34,23 +36,21 @@ public interface EsmInsCompanyClient {
 
     /**
      * 获取用户的保司信息
+     *
      * @param systemCode
      * @return
      */
     @GetMapping("/system/getUserCompany")
-    public HttpResult<List<EsmInsCompany>> getUserCompany(@RequestParam String systemCode,
-                                                          @RequestHeader("Authorization") String token,
-                                                          @RequestHeader("system_code") String sysCode);
+    public HttpResult<List<EsmInsCompany>> getUserCompany(@RequestParam String systemCode);
 
     /**
      * 获取保司账号信息
-     * @param id
+     *
+     * @param agreementId 协议id
      * @return
      */
     @GetMapping("/manager/attributionTemplate/getAgreementAttribution")
-    public HttpResult<PtlAgreementAttribution> getAgreementAttribution(            @RequestParam("agreementId") String agreementId,
-                                                                                   @RequestHeader("Authorization") String authToken,
-                                                                                   @RequestHeader("system_code") String systemCode);
+    public HttpResult<PtlAgreementAttribution> getAgreementAttribution(@RequestParam("agreementId") String agreementId);
 
 
     @PostMapping("/esmInsCompany/getParentIds")

tenant/organization/src/main/java/com/jzg/organization/client/OrgClient.java

@@ -7,12 +7,11 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestHeader;
 
-@FeignClient(name="jzg-org",url = "${feign.client.jzg-org.url}")
+@FeignClient(name="jzg-org")
 public interface OrgClient {
 
     @PostMapping("/ptlAgreementDispatch/getAgreementDispatch")
-    public HttpResult getAgreementDispatch(@RequestBody PtlAgreementDispatchQuery ptlAgreementDispatchQuery,
-                                           @RequestHeader("Authorization") String token,@RequestHeader("system_code") String sysCode);
+    public HttpResult getAgreementDispatch(@RequestBody PtlAgreementDispatchQuery ptlAgreementDispatchQuery);
 
 
 }

tenant/organization/src/main/java/com/jzg/organization/client/PartnerDistributionClient.java

@@ -8,22 +8,22 @@ import com.jzg.commons.entity.vo.SysUserVo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
-@FeignClient(name = "jzg-partner",url = "${feign.client.jzg-partner.url}")
+@FeignClient(name = "jzg-partner")
 public interface PartnerDistributionClient {
 
 
     @PostMapping("partner/addPartnerRule")
-    HttpResult addPartnerRule(@RequestBody SysUserVo sysUserVo,@RequestHeader("Authorization") String token);
+    HttpResult addPartnerRule(@RequestBody SysUserVo sysUserVo);
 
 
     @GetMapping("partner/searchUserStudios")
-    PartnerUserVo searchUserStudios(@RequestParam String userId,@RequestHeader("Authorization") String token);
+    PartnerUserVo searchUserStudios(@RequestParam String userId);
 
     @PostMapping("partner/save")
-    HttpResult add(@RequestBody PartnerUserVo partnerUser,@RequestHeader("Authorization") String token);
+    HttpResult add(@RequestBody PartnerUserVo partnerUser);
 
 
     @PostMapping("partner/teamInvitation")
-    boolean teamInvitation(@RequestBody SysUserJzgInfo info,@RequestHeader("Authorization") String token,@RequestHeader("system_code")String systemCode);
+    boolean teamInvitation(@RequestBody SysUserJzgInfo info);
 
 }

tenant/organization/src/main/java/com/jzg/organization/client/QuoteClient.java

@@ -11,47 +11,47 @@ import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 
-@FeignClient(name="jzg-insurance",url = "${feign.client.jzg-insurance.url}")
+@FeignClient(name = "jzg-insurance")
 public interface QuoteClient {
 
     @GetMapping(value = "/supplementOrder/selectById")
-    public HttpResult getOrdersById(String id);
+    HttpResult getOrdersById(String id);
 
     @PostMapping(value = "/insFeeOrder/getInsFeeOrdersList")
-    public List<InsFeeOrders> getInsFeeOrdersList(@RequestBody InsFeeOrdersParam param);
+    List<InsFeeOrders> getInsFeeOrdersList(@RequestBody InsFeeOrdersParam param);
 
     @PostMapping(value = "/insFeeOrder/getInsFeeOrderByUserId")
-    public List<InsFeeOrders> getInsFeeOrderByUserId(@RequestBody InsFeeOrdersParam param);
+    List<InsFeeOrders> getInsFeeOrderByUserId(@RequestBody InsFeeOrdersParam param);
 
     @GetMapping(value = "/insFeeOrder/getInsFeeOrderListByTopReferrerIdAndUserId")
-    public List<InsFeeOrders> getInsFeeOrderListByTopReferrerIdAndUserId(@RequestParam("userId") String userId,@RequestParam("topReferrerId") String topReferrerId);
+    List<InsFeeOrders> getInsFeeOrderListByTopReferrerIdAndUserId(@RequestParam("userId") String userId, @RequestParam("topReferrerId") String topReferrerId);
 
     @GetMapping(value = "/insFeeOrder/getInsFeeOrderAudit")
-    public List<InsFeeOrders> getInsFeeOrderAudit(@RequestParam("userId") String userId);
+    List<InsFeeOrders> getInsFeeOrderAudit(@RequestParam("userId") String userId);
 
     @GetMapping(value = "/insFeeOrder/getInsFeeOrderByOrderNo")
-    public List<InsFeeOrders> getInsFeeOrderByOrderNo(@RequestParam("orderNo") String orderNo);
+    List<InsFeeOrders> getInsFeeOrderByOrderNo(@RequestParam("orderNo") String orderNo);
 
     /**
      * 更改对接人
+     *
      * @param orderNo
      * @param name
      * @param phone
      * @return
      */
     @GetMapping(value = "/supplementOrder/changePerson")
-    public HttpResult changePerson(@RequestParam("orderNo") String orderNo, @RequestParam("name") String name,@RequestParam("phone") String phone);
+    HttpResult changePerson(@RequestParam("orderNo") String orderNo, @RequestParam("name") String name, @RequestParam("phone") String phone);
 
 
     /**
      * 订单更改为补录
+     *
      * @param orderNo
      * @return
      */
     @GetMapping(value = "/supplementOrder/changeSupplementOrder")
-    public HttpResult changeSupplementOrder(@RequestParam("orderNo") String orderNo);
-
-
+    HttpResult changeSupplementOrder(@RequestParam("orderNo") String orderNo);
 
 
 }

tenant/organization/src/main/java/com/jzg/organization/service/impl/PtlAgreementDispatchServiceImpl.java

@@ -192,7 +192,7 @@ public class PtlAgreementDispatchServiceImpl extends ServiceImpl<PtlAgreementDis
                             }
                         }else if("change_bs_account".equals(action.getActionCode())){
                             if(Objects.nonNull(action.getActionJson().get("accountId"))) {
-                                HttpResult<PtlAgreementAttribution> agreementAttribution = esmInsCompanyClient.getAgreementAttribution(action.getActionJson().get("accountId").toString(), baseController.getToken(), baseController.getUserSystemCode());
+                                HttpResult<PtlAgreementAttribution> agreementAttribution = esmInsCompanyClient.getAgreementAttribution(action.getActionJson().get("accountId").toString());
                                 if (agreementAttribution.getCode() == 200) {
                                     PtlAgreementAttribution data = agreementAttribution.getData();
                                     action.getActionJson().put("userName", data.getUsername());
@@ -221,7 +221,7 @@ public class PtlAgreementDispatchServiceImpl extends ServiceImpl<PtlAgreementDis
                             }
                         }
                     }else if("change_bs_account".equals(afterAction.getActionCode())){
-                        HttpResult<PtlAgreementAttribution> agreementAttribution = esmInsCompanyClient.getAgreementAttribution(afterAction.getActionJson().get("accountId").toString(), baseController.getToken(), baseController.getUserSystemCode());
+                        HttpResult<PtlAgreementAttribution> agreementAttribution = esmInsCompanyClient.getAgreementAttribution(afterAction.getActionJson().get("accountId").toString());
                         if(agreementAttribution.getCode() == 200){
                             PtlAgreementAttribution data = agreementAttribution.getData();
                             afterAction.getActionJson().put("userName",data.getUsername());

tenant/organization/src/main/java/com/jzg/organization/service/impl/PtlSchemeServiceImpl.java

@@ -37,7 +37,6 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 
-
 @Service
 public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme> implements PtlSchemeService {
 
@@ -119,29 +118,32 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
 
     /**
      * 清空驾意险数据
+     *
      * @param ptlSchemeInfoList
      */
-    private void cleanDrivingIntention(List<PtlSchemeInfo> ptlSchemeInfoList){
+    private void cleanDrivingIntention(List<PtlSchemeInfo> ptlSchemeInfoList) {
         List<String> ids = ptlSchemeInfoList.stream().map(info -> info.getId()).collect(Collectors.toList());
         ptlSchemeInsuranceDrivingIntentionMapper.delete(new LambdaQueryWrapper<PtlSchemeInsuranceDrivingIntention>()
-               .in(PtlSchemeInsuranceDrivingIntention::getSchemeInfoId, ids));
+                .in(PtlSchemeInsuranceDrivingIntention::getSchemeInfoId, ids));
     }
 
     /**
      * 清空险种数据
+     *
      * @param ptlSchemeInfoList
      */
-    private void cleanInsurance(List<PtlSchemeInfo> ptlSchemeInfoList){
+    private void cleanInsurance(List<PtlSchemeInfo> ptlSchemeInfoList) {
         List<String> ids = ptlSchemeInfoList.stream().map(info -> info.getId()).collect(Collectors.toList());
         ptlSchemeInsuranceMapper.delete(new LambdaQueryWrapper<PtlSchemeInsurance>()
-               .in(PtlSchemeInsurance::getSchemeInfoId, ids));
+                .in(PtlSchemeInsurance::getSchemeInfoId, ids));
     }
 
     /**
      * 清空规则
+     *
      * @return
      */
-    private void cleanRules(PtlScheme ptlScheme){
+    private void cleanRules(PtlScheme ptlScheme) {
         ptlSchemeRulesAttrLinkMapper.delete(new LambdaQueryWrapper<PtlSchemeRulesAttrLink>()
                 .eq(PtlSchemeRulesAttrLink::getSchemeId, ptlScheme.getId()));
     }
@@ -151,17 +153,17 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
         //获取方案信息
         PtlSchemeInfo ptlSchemeInfo = ptlSchemeInfoMapper.selectOne(new LambdaQueryWrapper<PtlSchemeInfo>()
                 .eq(PtlSchemeInfo::getId, id));
-        AssertionUtils.isFail(Objects.isNull(ptlSchemeInfo),"方案不存在");
+        AssertionUtils.isFail(Objects.isNull(ptlSchemeInfo), "方案不存在");
         //获取方案信息
         PtlScheme ptlScheme = ptlSchemeMapper.selectOne(new LambdaQueryWrapper<PtlScheme>()
                 .eq(PtlScheme::getId, ptlSchemeInfo.getSchemeId()));
 
-        AssertionUtils.isFail(Objects.isNull(ptlScheme),"方案不存在");
+        AssertionUtils.isFail(Objects.isNull(ptlScheme), "方案不存在");
 
         //获取商业险
         List<PtlSchemeInsuranceVo> ptlSchemeInsurances = ptlSchemeInsuranceMapper.getSchemeInsurance(ptlSchemeInfo.getId());
-        ptlSchemeInsurances.forEach(item->{
-            item.getOptionVos().forEach(option->{
+        ptlSchemeInsurances.forEach(item -> {
+            item.getOptionVos().forEach(option -> {
                 item.getOptionId().add(option.getOptionId());
             });
         });
@@ -200,13 +202,13 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
         List<PtlAgreementUndwrtRulesAttr> agreementRulesVo = rulesGet(ptlScheme.getCompanyId(), ptlScheme.getId());
 
         //拼装返回数据
-        PtlSchemeQueryVo vo = new PtlSchemeQueryVo(ptlScheme,ptlSchemeInfo,ptlSchemeInsurancesNew,ptlSchemeInsuranceDrivingIntentions,ptlSchemeRulesAttrLinks,agreementRulesVo);
+        PtlSchemeQueryVo vo = new PtlSchemeQueryVo(ptlScheme, ptlSchemeInfo, ptlSchemeInsurancesNew, ptlSchemeInsuranceDrivingIntentions, ptlSchemeRulesAttrLinks, agreementRulesVo);
 
         return vo;
     }
 
     @Override
-    public PtlSchemeQueryVo getSchemeAll(String companyId,String productId,String schemeType,String energyType,String vehicleType,String carnature) {
+    public PtlSchemeQueryVo getSchemeAll(String companyId, String productId, String schemeType, String energyType, String vehicleType, String carnature) {
         //获取方案信息
         PtlScheme ptlScheme = ptlSchemeMapper.selectOne(new LambdaQueryWrapper<PtlScheme>()
                 .eq(PtlScheme::getCompanyId, companyId)
@@ -215,14 +217,14 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
                 .eq(PtlScheme::getEnergyType, energyType)
                 .eq(PtlScheme::getProductId, productId));
 
-        if(Objects.isNull(ptlScheme)){
+        if (Objects.isNull(ptlScheme)) {
             throw new NoneException("方案不存在");
         }
 
         //获取方案信息
         List<PtlSchemeInfo> ptlSchemeInfos = ptlSchemeInfoMapper.selectList(new LambdaQueryWrapper<PtlSchemeInfo>()
                 .eq(PtlSchemeInfo::getSchemeId, ptlScheme.getId())
-                .eq(PtlSchemeInfo::getSchemeType,  schemeType));
+                .eq(PtlSchemeInfo::getSchemeType, schemeType));
 
         List<PtlSchemeQueryVo.Scheme> schemes = new ArrayList<>();
         ptlSchemeInfos.forEach(ptlSchemeInfo -> {
@@ -234,8 +236,8 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
 
             //获取商业险
             List<PtlSchemeInsuranceVo> ptlSchemeInsurances = ptlSchemeInsuranceMapper.getSchemeInsurance(ptlSchemeInfo.getId());
-            ptlSchemeInsurances.forEach(item->{
-                item.getOptionVos().forEach(option->{
+            ptlSchemeInsurances.forEach(item -> {
+                item.getOptionVos().forEach(option -> {
                     item.getOptionId().add(option.getOptionId());
                 });
             });
@@ -254,13 +256,13 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
         List<PtlAgreementUndwrtRulesAttr> agreementRulesVo = rulesGet(ptlScheme.getCompanyId(), ptlScheme.getId());
 
         //拼装返回数据
-        PtlSchemeQueryVo vo = new PtlSchemeQueryVo(ptlScheme,ptlSchemeInfos,schemes,ptlSchemeRulesAttrLinks,agreementRulesVo);
+        PtlSchemeQueryVo vo = new PtlSchemeQueryVo(ptlScheme, ptlSchemeInfos, schemes, ptlSchemeRulesAttrLinks, agreementRulesVo);
 
         return vo;
     }
 
     @Override
-    public Page<PtlSchemeVo> getSchemePage(Page page,PtlSchemeVo ptlSchemeVo) {
+    public Page<PtlSchemeVo> getSchemePage(Page page, PtlSchemeVo ptlSchemeVo) {
         Page<PtlSchemeVo> schemePage = ptlSchemeMapper.getSchemePage(page, ptlSchemeVo);
         return schemePage;
     }
@@ -285,8 +287,8 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
                 .collect(Collectors.toMap(PtlAgreementUndwrtRulesAttr::getAttrCode, attr -> attr));
         List<PtlAgreementUndwrtRulesAttr> newAttrList = new ArrayList<>();
         linkList.forEach(link -> {
-            if(attrMap.containsKey(link.getAttrCode())) {
-                PtlAgreementUndwrtRulesAttr attr= attrMap.get(link.getAttrCode());
+            if (attrMap.containsKey(link.getAttrCode())) {
+                PtlAgreementUndwrtRulesAttr attr = attrMap.get(link.getAttrCode());
                 //处理多选和下拉
                 if ("checkbox".equals(attr.getAttrType()) || "select".equals(attr.getAttrType()) || "inputTag".equals(attr.getAttrType())) {
                     if (null != link.getMin()) {
@@ -295,7 +297,7 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
                         attr.setMax(link.getMax());
                         attr.setOperator(link.getOperator());
                     }
-                }else{
+                } else {
                     attr.setId(link.getId());
                     attr.setMin(link.getMin());
                     attr.setMax(link.getMax());
@@ -310,7 +312,7 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
 
     @Override
     public List<EsmInsCompanyResVo> getCompanyList(String systemCode) {
-        HttpResult<List<EsmInsCompany>> companyListResult = esmInsCompanyClient.getUserCompany(systemCode,baseController.getToken(),systemCode);
+        HttpResult<List<EsmInsCompany>> companyListResult = esmInsCompanyClient.getUserCompany(systemCode);
         List<EsmInsCompany> companyList = companyListResult.getData();
         return BeanUtil.copyToList(companyList, EsmInsCompanyResVo.class);
     }
@@ -325,37 +327,37 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
     PtlAgreementDeptService ptlAgreementDeptService;
 
     @Override
-    public List<PtlAgreementInsCompanyVo> ruleFilterCompany(SchemeRuleFilterVo schemeRuleFilterVo){
+    public List<PtlAgreementInsCompanyVo> ruleFilterCompany(SchemeRuleFilterVo schemeRuleFilterVo) {
         //如果用户租户code为App  则使用参数传来的租户code
         String systemCode = "";
-        if("APP".equals(baseController.getUserSystemCode())){
+        if ("APP".equals(baseController.getUserSystemCode())) {
             systemCode = baseController.getAppSystemCode();
-        }else{
+        } else {
             systemCode = baseController.getUserSystemCode();
         }
         //根据权限获取所有保司
-        HttpResult<List<EsmInsCompany>> companyListResult = esmInsCompanyClient.getUserCompany(systemCode,baseController.getToken(),systemCode);
-        AssertionUtils.isFail(companyListResult.getCode()!=200,companyListResult.getMsg());
+        HttpResult<List<EsmInsCompany>> companyListResult = esmInsCompanyClient.getUserCompany(systemCode);
+        AssertionUtils.isFail(companyListResult.getCode() != 200, companyListResult.getMsg());
         List<EsmInsCompany> companyList = companyListResult.getData();
         //根据基本规则 能源、车辆类型、使用性质获取方案
         List<PtlScheme> ptlSchemes = ptlSchemeMapper.selectList(new LambdaQueryWrapper<PtlScheme>()
                 .eq(PtlScheme::getEnergyType, schemeRuleFilterVo.getCarInfo().getEnergyTypeCode())
                 .like(PtlScheme::getCarnature, schemeRuleFilterVo.getCarInfo().getCarNatureCode())
                 .like(PtlScheme::getVehicleType, schemeRuleFilterVo.getCarInfo().getCarKindCode())
-                .eq(PtlScheme::getProductId,schemeRuleFilterVo.getProductId())
+                .eq(PtlScheme::getProductId, schemeRuleFilterVo.getProductId())
                 .eq(PtlScheme::getIsDelete, 0));
 
         // 查找规则
         List<String> ptlSchemeIds = ptlSchemes.stream().map(PtlScheme::getId).collect(Collectors.toList());
 
-        AssertionUtils.isFail(ptlSchemeIds.isEmpty(),"没有可报价的保险公司");
+        AssertionUtils.isFail(ptlSchemeIds.isEmpty(), "没有可报价的保险公司");
 
         List<PtlSchemeRulesAttrLink> ptlSchemeRulesAttrLinks = ptlSchemeRulesAttrLinkMapper.selectList(new LambdaQueryWrapper<PtlSchemeRulesAttrLink>()
-               .in(PtlSchemeRulesAttrLink::getSchemeId, ptlSchemeIds));
+                .in(PtlSchemeRulesAttrLink::getSchemeId, ptlSchemeIds));
 
         // 将规则根据schemeId聚合转换成Map
         Map<String, List<PtlSchemeRulesAttrLink>> ptlSchemeRulesAttrLinkMap = ptlSchemeRulesAttrLinks.stream()
-              .collect(Collectors.groupingBy(PtlSchemeRulesAttrLink::getSchemeId));
+                .collect(Collectors.groupingBy(PtlSchemeRulesAttrLink::getSchemeId));
 
         ValidateSchemeRuleVo validateSchemeRuleVo = new ValidateSchemeRuleVo();
         validateSchemeRuleVo.builderQuoteVo(schemeRuleFilterVo, redissonClient);
@@ -368,11 +370,11 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
         List<String> companyIds = ptlSchemes.stream().map(ptlScheme -> ptlScheme.getCompanyId()).collect(Collectors.toList());
         companyList.removeIf(company -> !companyIds.contains(company.getId()));
         List<PtlAgreementInsCompanyVo> resVo = new ArrayList<>();
-        companyList.forEach(company->{
+        companyList.forEach(company -> {
             PtlAgreementInsCompanyVo vo = new PtlAgreementInsCompanyVo();
-            BeanUtil.copyProperties(company,vo);
+            BeanUtil.copyProperties(company, vo);
             vo.setCnName(vo.getCode());
-            vo.setLogo(MinioUtils.getPresignedObjectUrl(bucketName,company.getLogo()));
+            vo.setLogo(MinioUtils.getPresignedObjectUrl(bucketName, company.getLogo()));
             resVo.add(vo);
         });
 
@@ -380,14 +382,14 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
         dispatchRuleVos.setQuoteVo(validateSchemeRuleVo.getQuoteVo());
         //2.协议调度规则数据拼接
         String finalSystemCode = systemCode;
-        companyList.forEach(company->{
+        companyList.forEach(company -> {
             PtlAgreementDispatchQuery query = new PtlAgreementDispatchQuery();
             query.setCompanyId(company.getId());
-            HttpResult agreementDispatch = orgClient.getAgreementDispatch(query,baseController.getToken(), finalSystemCode);
-            if(agreementDispatch.getCode() == 200){
+            HttpResult agreementDispatch = orgClient.getAgreementDispatch(query);
+            if (agreementDispatch.getCode() == 200) {
                 ObjectMapper mapper = new ObjectMapper();
                 List<PtlAgreementDispatchVo.DispatchVo> vos = new ArrayList<>();
-                Map<String, Object> data = (Map<String, Object>)agreementDispatch.getData();
+                Map<String, Object> data = (Map<String, Object>) agreementDispatch.getData();
 
                 Object dispatchVosObj = data.get("dispatchVos");
                 if (dispatchVosObj instanceof List) {
@@ -399,7 +401,7 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
                 }
 
                 // 根据section 分组 进行拆分 规则
-                for (PtlAgreementDispatchVo.DispatchVo vo : vos){
+                for (PtlAgreementDispatchVo.DispatchVo vo : vos) {
                     List<PtlAgreementDispatchRulesAttrLink> attrLinks = vo.getAttrLinks();
                     Map<String, List<PtlAgreementDispatchRulesAttrLink>> grouped =
                             attrLinks.stream()
@@ -420,20 +422,20 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
 //
         // 3. 校验调度数据
         HttpResult httpResult = costsRuleClient.validateDispatchRule(dispatchRuleVos);
-        if(httpResult.getCode() == 200){
+        if (httpResult.getCode() == 200) {
             // 返回了调度id  通过调度id 查询动作
             List<PtlAgreementDispatchVo.DispatchVo> agreementDispatchAction = ptlAgreementDispatchService.getAgreementDispatchAction((List<String>) httpResult.getData());
             // 如果动作中存在替换协议则 保司标志置为调度
-            resVo.forEach(company->{
+            resVo.forEach(company -> {
                 company.setIsDispatch(0);
                 PtlAgreementDispatchVo.DispatchVo ptlAgreementDispatchVo = agreementDispatchAction.stream().filter(x -> x.getCompanyId().contains(company.getId())).findFirst().orElse(null);
-                if(ptlAgreementDispatchVo != null){
+                if (ptlAgreementDispatchVo != null) {
                     PtlAgreementDispatchAction action1 = ptlAgreementDispatchVo.getActions().stream().filter(action -> action.getActionCode().equals(ActionEnum.SPECIFY_AGREEMENT.getCode())).findFirst().orElse(null);
-                    if(action1 != null){
+                    if (action1 != null) {
                         //将调度字段设为1
                         company.setIsDispatch(1);
                         // 如果等于置顶协议 则 设置调用协议id
-                        if(action1.getActionCode().equals("specify_agreement")){
+                        if (action1.getActionCode().equals("specify_agreement")) {
                             company.setDispatchAgreementId(action1.getActionJson().getString("agreementId"));
                         }
                         company.setDispatchId(ptlAgreementDispatchVo.getDispatchId());
@@ -445,7 +447,7 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
     }
 
     @Override
-    public SchemeResultVo getSchemeResult(String companyId,String productId){
+    public SchemeResultVo getSchemeResult(String companyId, String productId) {
         List<SchemeResultVo.SchemeVo> schemeInsuranceInfo = ptlSchemeMapper.getSchemeInsuranceInfo(companyId, productId);
         List<SchemeResultVo.SchemeVo> schemeDrivingInfo = ptlSchemeMapper.getSchemeDrivingInfo(companyId, productId);
         // 创建一个 Map，Key: info.id, Value: List<Driving>
@@ -468,7 +470,7 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
             }
         }
 
-        schemeInsuranceInfo.forEach(scheme->{
+        schemeInsuranceInfo.forEach(scheme -> {
             for (SchemeResultVo.SchemeInfoVo info : scheme.getInfos()) {
                 info.setProductId(scheme.getProductId());
                 info.setCompanyId(scheme.getCompanyId());
@@ -476,7 +478,7 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
         });
 
         schemeInsuranceInfo.forEach(schemeVo -> {
-            if(!schemeVo.getInfos().isEmpty()){
+            if (!schemeVo.getInfos().isEmpty()) {
                 schemeVo.setSchemeType(schemeVo.getInfos().get(0).getSchemeType());
             }
         });
@@ -487,8 +489,8 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
 
         List<SchemeResultVo.SchemeInfoVo> allInfo = new ArrayList<>();
 
-        schemeVo.forEach(scheme->{
-            scheme.getInfos().forEach(item->{
+        schemeVo.forEach(scheme -> {
+            scheme.getInfos().forEach(item -> {
                 allInfo.add(item);
             });
 
@@ -498,7 +500,7 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
         //把基础方案的商业险的value 赋值
         schemeResultVo.getSchemes().forEach(schemeInfoVo -> {
             schemeInfoVo.getKinds().forEach(kind -> {
-                if(!kind.getOptions().isEmpty()) {
+                if (!kind.getOptions().isEmpty()) {
                     kind.setAmount(kind.getOptions().get(0).getValue());
                     kind.setUnitAmount(kind.getOptions().get(0).getValue());
                     kind.setServiceTimes(kind.getOptions().get(0).getValue());
@@ -508,12 +510,12 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
 
         //自选方案
         SchemeResultVo.SchemeVo opSchemeVo = schemeInsuranceInfo.stream().filter(x -> x.getSchemeType().equals("2")).findFirst().orElse(null);
-        if(Objects.nonNull(opSchemeVo)){
+        if (Objects.nonNull(opSchemeVo)) {
             schemeResultVo.setOptionalScheme(opSchemeVo.getInfos().get(0));
         }
 
         //排除交强险的险种
-        schemeResultVo.getSchemes().stream().forEach(scheme->{
+        schemeResultVo.getSchemes().stream().forEach(scheme -> {
             scheme.getKinds().removeIf(kind -> "J1".equals(kind.getKindCode()));
         });
 

tenant/organization/src/main/java/com/jzg/organization/service/impl/SysUserJzgAppServiceImpl.java

@@ -62,6 +62,7 @@ public class SysUserJzgAppServiceImpl extends ServiceImpl<SysUserJzgAppMapper, S
 
     @Autowired
     private BaseController baseController;
+
     @Autowired
     private SysDeptMapper sysDeptMapper;
 
@@ -73,6 +74,7 @@ public class SysUserJzgAppServiceImpl extends ServiceImpl<SysUserJzgAppMapper, S
 
     @Autowired
     private SysDistributionAuditService sysDistributionAuditService;
+
     @Autowired
     private SysUploadFilesMapper sysUploadFilesMapper;
 
@@ -96,7 +98,7 @@ public class SysUserJzgAppServiceImpl extends ServiceImpl<SysUserJzgAppMapper, S
                 .eq(SysUserJzgInfo::getIsDelete, 0)
                 .eq(SysUserJzgInfo::getIsEnable, 0);
         List<SysUserJzgInfo> infos = sysUserJzgInfoService.list(queryWrapper);
-        if(infos.size() > 0 && infos.get(0) != null) {
+        if (infos.size() > 0 && infos.get(0) != null) {
             List<String> typeAttrs = infos.stream().map(SysUserJzgInfo::getTypeAttr).collect(Collectors.toList());
             infoVo.setTypeNames(typeAttrs);
         }
@@ -113,7 +115,7 @@ public class SysUserJzgAppServiceImpl extends ServiceImpl<SysUserJzgAppMapper, S
         LambdaQueryWrapper<SysUserJzgInfoFile> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(SysUserJzgInfoFile::getUserId, infoVo.getUserId());
         List<SysUserJzgInfoFile> fileList = userJzgInfoFileService.list(queryWrapper);
-        if(CollUtil.isNotEmpty(fileList)){
+        if (CollUtil.isNotEmpty(fileList)) {
             infoVo.setFileList(fileList);
         }
         return infoVo;
@@ -148,9 +150,9 @@ public class SysUserJzgAppServiceImpl extends ServiceImpl<SysUserJzgAppMapper, S
         // 获取身份证和营业执照信息
         LambdaQueryWrapper<SysUserJzgInfoFile> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(SysUserJzgInfoFile::getUserId, param.getUserId())
-                .in(SysUserJzgInfoFile::getFileType,"sfz1","sfz2");
+                .in(SysUserJzgInfoFile::getFileType, "sfz1", "sfz2");
         List<SysUserJzgInfoFile> fileList = userJzgInfoFileService.list(queryWrapper);
-        if(CollUtil.isNotEmpty(fileList)){
+        if (CollUtil.isNotEmpty(fileList)) {
             userJzgInfoFileService.removeByIds(fileList);
         }
         List<SysUserJzgInfoFile> infoFiles = new ArrayList<>();
@@ -175,7 +177,7 @@ public class SysUserJzgAppServiceImpl extends ServiceImpl<SysUserJzgAppMapper, S
         // 获取身份证和营业执照信息
         LambdaQueryWrapper<SysUserJzgInfoFile> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(SysUserJzgInfoFile::getUserId, param.getUserId())
-                .eq(SysUserJzgInfoFile::getFileType,"qualification");
+                .eq(SysUserJzgInfoFile::getFileType, "qualification");
 
         SysUploadFiles file = sysUploadFilesMapper.selectById(param.getFileId());
         SysUserJzgInfoFile sysUserJzgFile = new SysUserJzgInfoFile(file.getId(), param.getUserId(), file.getFileName());
@@ -198,10 +200,10 @@ public class SysUserJzgAppServiceImpl extends ServiceImpl<SysUserJzgAppMapper, S
         queryWrapper.eq(SysUser::getMobile, param.getMobile())
                 .eq(SysUser::getIsDelete, 0);
         SysUser user = sysUserMapper.selectOne(queryWrapper);
-        AssertionUtils.isFail(Objects.nonNull(user),"手机号已存在请重新输入");
+        AssertionUtils.isFail(Objects.nonNull(user), "手机号已存在请重新输入");
 
         AssertionUtils.isFail(!sysUserService.validateSmsCodeMobile(param.getMobile(), param.getSmsCode())
-                ,"验证码验证失败");
+                , "验证码验证失败");
         sysUser.setMobile(param.getMobile());
         sysUserService.updateById(sysUser);
     }
@@ -217,11 +219,11 @@ public class SysUserJzgAppServiceImpl extends ServiceImpl<SysUserJzgAppMapper, S
             infoWrapper.eq(SysUserJzgInfo::getUserId, yqrAppUser.getUserId());
             infoWrapper.eq(SysUserJzgInfo::getSystemCode, param.getSystemCode());
             SysUserJzgInfo yqirInfo = sysUserJzgInfoService.getOne(infoWrapper);
-            if(Objects.isNull(yqirInfo)){
+            if (Objects.isNull(yqirInfo)) {
                 throw new SystemException("邀请人数据异常！");
             }
             SysDept dept = sysDeptMapper.selectById(yqirInfo.getDeptId());
-            AssertionUtils.isFail(Objects.isNull(yqrAppUser),"邀请人不存在");
+            AssertionUtils.isFail(Objects.isNull(yqrAppUser), "邀请人不存在");
             invitationVo.setDeptName(dept.getName());
             invitationVo.setMobile(param.getMobile());
             invitationVo.setSystemCode(yqrAppUser.getSystemCode());
@@ -231,10 +233,10 @@ public class SysUserJzgAppServiceImpl extends ServiceImpl<SysUserJzgAppMapper, S
             SysUser user = sysUserMapper.selectOne(queryWrapper);
             String userId = null;
             String sysUserId = null;
-            if(Objects.isNull(user)){
+            if (Objects.isNull(user)) {
                 // 创建用户
                 SysUser sysUser = new SysUser(param.getMobile(), param.getMobile(),
-                        null,null,null,
+                        null, null, null,
                         param.getPassword());
                 sysUserMapper.insert(sysUser);
                 sysUserId = sysUser.getId();
@@ -246,12 +248,12 @@ public class SysUserJzgAppServiceImpl extends ServiceImpl<SysUserJzgAppMapper, S
                 sysUserJzgAppMapper.insert(sysUserJzgApp);
 
                 // 增加推荐人关系
-                this.addRelationPerson(yqrAppUser,sysUserJzgApp);
+                this.addRelationPerson(yqrAppUser, sysUserJzgApp);
                 SysUserJzgInfo userInfo = new SysUserJzgInfo(yqirInfo, sysUser);
                 sysUserJzgInfoService.save(userInfo);
                 userId = userInfo.getId();
                 invitationVo.setIsJoined(0);
-            }else{
+            } else {
                 // 判断用户是否与租户关联
                 LambdaQueryWrapper<SysUserJzgApp> wrapper = new LambdaQueryWrapper<>();
                 wrapper.eq(SysUserJzgApp::getUserId, user.getId())
@@ -259,37 +261,37 @@ public class SysUserJzgAppServiceImpl extends ServiceImpl<SysUserJzgAppMapper, S
                         .eq(SysUserJzgApp::getIsEnable, 0)
                         .eq(SysUserJzgApp::getSystemCode, yqrAppUser.getSystemCode());
                 SysUserJzgApp appUser = sysUserJzgAppMapper.selectOne(wrapper);
-                if(Objects.isNull(appUser)){
+                if (Objects.isNull(appUser)) {
                     SysUserJzgApp sysUserJzgApp = new SysUserJzgApp(user);
                     sysUserJzgApp.setDeptId(yqrAppUser.getDeptId());
                     sysUserJzgApp.setSystemCode(yqrAppUser.getSystemCode());
                     sysUserJzgApp.setReferrerId(yqrAppUser.getId());
                     sysUserJzgAppMapper.insert(sysUserJzgApp);
                     // 增加推荐人关系
-                    this.addRelationPerson(yqrAppUser,sysUserJzgApp);
+                    this.addRelationPerson(yqrAppUser, sysUserJzgApp);
                     SysUserJzgInfo userInfo = new SysUserJzgInfo(yqirInfo, user);
                     sysUserJzgInfoService.save(userInfo);
                     userId = userInfo.getId();
-                }else{
-                    if(!appUser.getReferrerId().equals(yqrAppUser.getId())){
+                } else {
+                    if (!appUser.getReferrerId().equals(yqrAppUser.getId())) {
                         throw new SystemException("该用户已被邀请注册");
                     }
                     invitationVo.setIsJoined(1);
                 }
                 sysUserId = user.getId();
             }
-            teamInvitation(yqirInfo,param,userId,sysUserId);
+            teamInvitation(yqirInfo, param, userId, sysUserId);
             return invitationVo;
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             throw new SystemException("程序异常");
         }
     }
 
 
-    public void teamInvitation(SysUserJzgInfo info,InvitationAddParam param,String userId,String sysUserId){
+    public void teamInvitation(SysUserJzgInfo info, InvitationAddParam param, String userId, String sysUserId) {
         try {
-            if (StringUtils.isEmpty(userId)){
+            if (StringUtils.isEmpty(userId)) {
                 return;
             }
             SysUserJzgInfo sysUserJzgInfo = new SysUserJzgInfo();
@@ -297,11 +299,11 @@ public class SysUserJzgAppServiceImpl extends ServiceImpl<SysUserJzgAppMapper, S
             sysUserJzgInfo.setName(param.getMobile());
             sysUserJzgInfo.setDeptId(info.getDeptId());
             sysUserJzgInfo.setUserId(userId);
-            boolean invitation = distributionClient.teamInvitation(sysUserJzgInfo,param.getToken(),param.getSystemCode());
-            if (invitation){
-                boolean exists = sysUserJzgInfoSalesmanService.exists(new LambdaQueryWrapper<>(SysUserJzgInfoSalesman.class).eq(SysUserJzgInfoSalesman::getSysUserJzgInfoId,userId)
+            boolean invitation = distributionClient.teamInvitation(sysUserJzgInfo);
+            if (invitation) {
+                boolean exists = sysUserJzgInfoSalesmanService.exists(new LambdaQueryWrapper<>(SysUserJzgInfoSalesman.class).eq(SysUserJzgInfoSalesman::getSysUserJzgInfoId, userId)
                         .eq(SysUserJzgInfoSalesman::getTypeAttr, "3"));
-                if (!exists){
+                if (!exists) {
                     //   添加合伙人身份
                     SysUserJzgInfoSalesman sysUserJzgInfoSalesman = new SysUserJzgInfoSalesman(info.getId(), "3");
                     sysUserJzgInfoSalesman.setPartnerStatus(1);
@@ -316,16 +318,15 @@ public class SysUserJzgAppServiceImpl extends ServiceImpl<SysUserJzgAppMapper, S
                 sysOrganizationUserLinkService.save(sysOrganizationUserLink);
 
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
         }
     }
 
 
-
-
     /**
      * 邀请成为分销员
+     *
      * @param param
      * @return
      */
@@ -358,7 +359,7 @@ public class SysUserJzgAppServiceImpl extends ServiceImpl<SysUserJzgAppMapper, S
     /**
      * 获取邀请人详细信息
      */
-    private SysUserJzgInfo getInviterInfo(String userId,String systemCode) {
+    private SysUserJzgInfo getInviterInfo(String userId, String systemCode) {
         LambdaQueryWrapper<SysUserJzgInfo> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(SysUserJzgInfo::getId, userId)
                 .eq(SysUserJzgInfo::getSystemCode, systemCode);
@@ -406,7 +407,7 @@ public class SysUserJzgAppServiceImpl extends ServiceImpl<SysUserJzgAppMapper, S
      * 处理已存在用户的邀请逻辑
      */
     private InvitationVo handleExistingUser(SysUser inviteeSysUser, SysUserJzgInfo inviterInfo,
-                                        SysDistributionSetting setting,InvitationVo invitationVo) {
+                                            SysDistributionSetting setting, InvitationVo invitationVo) {
         // 查询被邀请人在当前系统的信息
         SysUserJzgInfo inviteeInfo = getInviteeInfo(inviteeSysUser.getId(), setting.getSystemCode());
         if (Objects.nonNull(inviteeInfo)) {
@@ -414,7 +415,7 @@ public class SysUserJzgAppServiceImpl extends ServiceImpl<SysUserJzgAppMapper, S
             validateReferrerBinding(inviteeInfo, inviterInfo.getId());
             invitationVo.setIsJoined(1);
             // 根据招募方式处理
-            return processByRecruitmentMethod(inviteeInfo, inviterInfo, setting,invitationVo);
+            return processByRecruitmentMethod(inviteeInfo, inviterInfo, setting, invitationVo);
         } else {
             //  创建租户用户信息
             SysUserJzgInfo userJzgInfo = createUserJzgInfo(inviteeSysUser, inviterInfo, setting);
@@ -460,7 +461,7 @@ public class SysUserJzgAppServiceImpl extends ServiceImpl<SysUserJzgAppMapper, S
      * 处理新用户的邀请注册逻辑
      */
     private InvitationVo handleNewUser(InvitationAddParam param, SysUserJzgInfo inviterInfo,
-                                  SysDistributionSetting setting,InvitationVo invitationVo) {
+                                       SysDistributionSetting setting, InvitationVo invitationVo) {
         // 创建新用户
         SysUser newUser = createNewSysUser(param);
         sysUserMapper.insert(newUser);
@@ -471,7 +472,7 @@ public class SysUserJzgAppServiceImpl extends ServiceImpl<SysUserJzgAppMapper, S
         createAppUser(newUser, inviterInfo);
         // 根据招募方式处理
         invitationVo.setIsJoined(0);
-        return processByRecruitmentMethod(userJzgInfo,inviterInfo, setting,invitationVo);
+        return processByRecruitmentMethod(userJzgInfo, inviterInfo, setting, invitationVo);
     }
 
     /**
@@ -486,7 +487,7 @@ public class SysUserJzgAppServiceImpl extends ServiceImpl<SysUserJzgAppMapper, S
      * 根据招募方式处理不同流程
      */
     private InvitationVo processByRecruitmentMethod(SysUserJzgInfo inviteeInfo, SysUserJzgInfo inviterInfo,
-                                                SysDistributionSetting setting,InvitationVo invitationVo) {
+                                                    SysDistributionSetting setting, InvitationVo invitationVo) {
         //  生成分销审核记录
         createDistributionAudit(inviteeInfo, setting);
 
@@ -555,6 +556,7 @@ public class SysUserJzgAppServiceImpl extends ServiceImpl<SysUserJzgAppMapper, S
 
     /**
      * 增加推荐人关系
+     *
      * @param sourceAppUser
      * @param appUser
      */
@@ -569,13 +571,14 @@ public class SysUserJzgAppServiceImpl extends ServiceImpl<SysUserJzgAppMapper, S
         relationPerson.setSuggestId(appUser.getId());
         relationPerson.setSource(0);
         relationPerson.setType(0);
-        if(Objects.isNull(person)){
+        if (Objects.isNull(person)) {
             relationPerson.setSuggestLevel(1);
         } else {
             relationPerson.setSuggestLevel(person.getSuggestLevel() + 1);
         }
         relationPersonService.save(relationPerson);
     }
+
     @Override
     public SysUserJzgApp getUserInfo() {
         String systemCode = baseController.getUserSystemCode();

tenant/organization/src/main/java/com/jzg/organization/service/impl/SysUserServiceImpl.java

@@ -1106,7 +1106,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         try {
             addPartner(sysUserVo);
             //  保存合伙人用户数据
-            HttpResult httpResult = partnerDistributionClient.addPartnerRule(sysUserVo,baseController.getToken());
+            HttpResult httpResult = partnerDistributionClient.addPartnerRule(sysUserVo);
             if (200 == httpResult.getCode()){
                 return HttpResult.ok("保存成功");
             }
@@ -1124,7 +1124,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         try {
             sysUserVo.setCodeInvitation(true);
             addPartner(sysUserVo);
-            return partnerDistributionClient.addPartnerRule(sysUserVo,baseController.getToken());
+            return partnerDistributionClient.addPartnerRule(sysUserVo);
         }catch (Exception e){
             e.printStackTrace();
             log.error("保存合伙人数据异常：{}" + e.getMessage());
@@ -1179,7 +1179,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
            if (isGeneration){
                return HttpResult.error("业务员已存在");
            }
-           PartnerUserVo partnerUserVo = partnerDistributionClient.searchUserStudios(userByUserId.getId(),token);
+           PartnerUserVo partnerUserVo = partnerDistributionClient.searchUserStudios(userByUserId.getId());
            if (Objects.isNull(partnerUserVo)){
                return HttpResult.error("当前合伙人身份不允许添加业务员");
            }
@@ -1210,7 +1210,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
            partnerUserVo.setReferrerId(partnerUserVo.getUserId());
            partnerUserVo.setId(null);
            partnerUserVo.setStatus(true);
-           HttpResult result = partnerDistributionClient.add(partnerUserVo, token);
+           HttpResult result = partnerDistributionClient.add(partnerUserVo);
            if (200 != result.getCode()){
                throw new SystemException(result.getMsg());
            }

tenant/organization/src/main/resources/application-prod.yml

@@ -22,19 +22,6 @@ spring:
 config:
   sso: 1
 
-feign:
-  client:
-    jzg-insurance:
-      url: http://172.24.144.227:9898/
-    jzg-org:
-      url: http://172.24.144.227:8084/
-    jzg-costsorrule:
-      url: http://172.24.144.227:8085/
-    jzg-platform:
-      url: http://172.24.144.227:8083/
-    jzg-partner:
-      url: http://172.24.144.227:8087/
-
 #银联API参数配置
 unionPay:
   api:

tenant/organization/src/main/resources/application-test.yml

@@ -19,17 +19,6 @@ spring:
       - nacos:minio
       - nacos:rocketmq
 
-feign:
-  client:
-    jzg-insurance:
-      url: http://192.168.0.250:9898/
-    jzg-org:
-      url: http://192.168.0.250:9084/
-    jzg-costsorrule:
-      url: http://192.168.0.250:9085/
-    jzg-platform:
-      url: http://192.168.0.250:9083/
-
 config:
   sso: 1
 

tenant/organization/src/main/resources/application.yml

@@ -24,17 +24,6 @@ upload:
     path: D:/nasData
     url: http://192.168.0.250:8001/
 
-feign:
-  client:
-    jzg-insurance:
-      url: http://localhost:9898/
-    jzg-org:
-      url: http://localhost:8084/
-    jzg-costsorrule:
-      url: http://localhost:8085/
-    jzg-platform:
-      url: http://localhost:8083/
-
 #多租户配置
 tenant:
   enable: true