Prechádzať zdrojové kódy

修复租户平台业务管理模块 业务员管理 团队管理 渠道管理 电销组管理相关接口报错问题,流程已梳理完毕

liub 5 mesiacov pred
rodič
commit
1339aa0871

+ 1 - 1
commons/src/main/java/com/jzg/commons/config/RedissonConfig.java

@@ -25,7 +25,7 @@ public class RedissonConfig {
         // 配置集群模式
         Config config = new Config();
         List<String> redisAddress = new ArrayList<>();
-//        redisAddress.add("redis://192.168.0.250:6379");
+//        redisAddress.add("redis://192.168.5.13:6379");
         SingleServerConfig clusterConfig = config.useSingleServer()
                 .setAddress(address)
                 .setPassword(password)

+ 2 - 3
tenant/insurance/quotation-yangguang/src/main/java/com/jzg/quotation/yangguang/api/componet/YangGuangApiRequestComponent.java

@@ -9,7 +9,6 @@ import com.jzg.quotation.commons.utils.InsuranceLog;
 import com.jzg.quotation.yangguang.api.entity.request.*;
 import com.jzg.quotation.yangguang.api.entity.response.*;
 import com.jzg.quotation.yangguang.api.properties.YangGuangApiProperties;
-import com.sunyard.insurance.encode.client.EncodeAccessParam;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.httpclient.HttpClient;
 import org.apache.commons.httpclient.HttpException;
@@ -121,8 +120,8 @@ public class YangGuangApiRequestComponent {
         String url = yangGuangApiProperties.getUploadUrl();
         String secret = yangGuangApiProperties.getSecret();
         String referer = yangGuangApiProperties.getReferer();
-        String encode = EncodeAccessParam.getEncodeParam(String.valueOf(json), 1000L,secret);
-        responesStr = httpPost(url,"req", encode, referer);
+//        String encode = EncodeAccessParam.getEncodeParam(String.valueOf(json), 1000L,secret);
+        responesStr = httpPost(url,"req", "", referer);
         return responesStr;
     }
 

+ 1 - 1
tenant/insurance/quotation-zijin/src/main/java/com/jzg/quotation/zijin/api/component/ZiJinApiRequestComponent.java

@@ -362,7 +362,7 @@ public class ZiJinApiRequestComponent {
             Config config = new Config();
             // 这里假设 Redis 在本地6379端口,没有密码
             config.useSingleServer()
-                    .setAddress("redis://192.168.0.250:6379")
+                    .setAddress("redis://192.168.5.250:6379")
                     .setPassword("123456");
 
             RedissonClient redisson = Redisson.create(config);

+ 5 - 0
tenant/organization/src/main/java/com/jzg/organization/mapper/SysOrganizationUserLinkServiceMapper.java

@@ -5,4 +5,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jzg.commons.entity.po.SysOrganizationUserLink;
 
 public interface SysOrganizationUserLinkServiceMapper extends BaseMapper<SysOrganizationUserLink> {
+
+
+    SysOrganizationUserLink getOrganizationUser(String userId);
+
+    void deleteOrganizationUser(String userId, String orgId);
 }

+ 3 - 0
tenant/organization/src/main/java/com/jzg/organization/service/SysOrganizationUserLinkService.java

@@ -17,4 +17,7 @@ public interface SysOrganizationUserLinkService extends IService<SysOrganization
 
     SysOrganizationUserLink selectByOrgIdAndUserId(SysOrganizationUserLinkAdd organizationUserLinkAdd);
 
+    SysOrganizationUserLink getOrganizationUser(String userId);
+
+    void deleteOrganizationUser(String userId, String orgId);
 }

+ 10 - 0
tenant/organization/src/main/java/com/jzg/organization/service/impl/SysOrganizationUserLinkServiceImpl.java

@@ -42,5 +42,15 @@ public class SysOrganizationUserLinkServiceImpl extends ServiceImpl<SysOrganizat
                 eq(SysOrganizationUserLink::getUserId, organizationUserLinkAdd.getUserId()));
     }
 
+    @Override
+    public SysOrganizationUserLink getOrganizationUser(String userId) {
+        return sysOrganizationUserLinkServiceMapper.getOrganizationUser(userId);
+    }
+
+    @Override
+    public void deleteOrganizationUser(String userId, String orgId) {
+        sysOrganizationUserLinkServiceMapper.deleteOrganizationUser(userId,orgId);
+    }
+
 
 }

+ 2 - 6
tenant/organization/src/main/java/com/jzg/organization/service/impl/SysUserServiceImpl.java

@@ -819,9 +819,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
         //修改团队信息
         if (sysUserVo.getOrganizationId() != null && !sysUserVo.getOrganizationId().isEmpty()) {
-            sysOrganizationUserLinkService.remove(new LambdaQueryWrapper<SysOrganizationUserLink>()
-                    .eq(SysOrganizationUserLink::getUserId, sysUserVo.getUserId())
-                    .eq(SysOrganizationUserLink::getOrganizationId, sysUserVo.getOrganizationId()));
+            sysOrganizationUserLinkService.deleteOrganizationUser(sysUserVo.getUserId(), sysUserVo.getOrganizationId());
             SysOrganizationUserLink sysOrganizationUserLink = new SysOrganizationUserLink();
             sysOrganizationUserLink.setId(IdGenerate.nextId());
             sysOrganizationUserLink.setUserId(sysUserVo.getUserId());
@@ -880,9 +878,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             SysUserJzgInfo jzgInfo = sysUserJzgInfoService.getById(sysUserJzgInfo.getReferrerId());
             sysUserJzgInfo.setReferrerName(Objects.isNull(jzgInfo) ? "" : jzgInfo.getName());
         }
-        SysOrganizationUserLink sysOrganizationUserLink = sysOrganizationUserLinkService.getOne
-                (new LambdaQueryWrapper<SysOrganizationUserLink>().eq(SysOrganizationUserLink::getUserId, sysUserJzgInfo.getUserId()));
-
+        SysOrganizationUserLink sysOrganizationUserLink = sysOrganizationUserLinkService.getOrganizationUser( sysUserJzgInfo.getUserId());
 
         if (!Objects.isNull(sysOrganizationUserLink)) {
             String organizationId = sysOrganizationUserLink.getOrganizationId();

+ 33 - 0
tenant/organization/src/main/resources/mapper/SysOrganizationUserLinkServiceMapper.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jzg.organization.mapper.SysOrganizationUserLinkServiceMapper">
+
+    <!-- 结果映射 -->
+    <resultMap id="BaseResultMap" type="com.jzg.commons.entity.po.SysOrganizationUserLink">
+        <id column="id" property="id" jdbcType="VARCHAR"/>
+        <result column="user_id" property="userId" jdbcType="VARCHAR"/>
+        <result column="organization_id" property="organizationId" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <!-- 基础列 -->
+    <sql id="Base_Column_List">
+        id
+        , user_id, organization_id
+    </sql>
+
+    <delete id="deleteOrganizationUser">
+        DELETE
+        FROM sys_organization_user_link
+        WHERE user_id = #{userId}
+          AND organization_id = #{orgId}
+    </delete>
+
+    <!-- 根据用户ID获取组织关联信息 -->
+    <select id="getOrganizationUser" resultMap="BaseResultMap">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM sys_organization_user_link
+        WHERE user_id = #{userId}
+    </select>
+
+</mapper>