添加项目和用户列表关系 - 增加逻辑

3abb3cf5 · zhangxingmin · 40366dfa · 3abb3cf5 · 3abb3cf5 · 3abb3cf5
Commit 3abb3cf5 authored Oct 23, 2025 by zhangxingmin
9 changed files
--- a/yd-user-api/src/main/java/com/yd/user/api/service/impl/ApiClientUserServiceImpl.java
+++ b/yd-user-api/src/main/java/com/yd/user/api/service/impl/ApiClientUserServiceImpl.java
@@ -2,11 +2,16 @@ package com.yd.user.api.service.impl;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yd.auth.core.dto.AuthUserDto;
+import com.yd.auth.core.utils.SecurityUtil;
 import com.yd.common.enums.CommonEnum;
+import com.yd.common.enums.ProjectEnum;
 import com.yd.common.enums.ResultCode;
 import com.yd.common.exception.BusinessException;
 import com.yd.common.result.Result;
 import com.yd.common.utils.RandomStringGenerator;
+import com.yd.csf.feign.client.agentreferralrelation.ApiAgentReferralRelationFeignClient;
+import com.yd.csf.feign.request.agentreferralrelation.ApiAgentReferralRelationSaveRequest;
 import com.yd.user.api.service.ApiClientUserService;
 import com.yd.user.feign.request.clientuser.ApiClientUserPageRequest;
 import com.yd.user.feign.response.clientuser.ApiClientUserDetailResponse;
@@ -37,6 +42,9 @@ public class ApiClientUserServiceImpl implements ApiClientUserService {
    @Autowired
    private IClientUserService iClientUserService;
+    @Autowired
+    private ApiAgentReferralRelationFeignClient apiAgentReferralRelationFeignClient;
    /**
     * 分页查询-客户端用户信息
     * @param request
@@ -102,7 +110,11 @@ public class ApiClientUserServiceImpl implements ApiClientUserService {
            }
            if (!CollectionUtils.isEmpty(saveList)) {
+                //批量保存客户端用户数据
                iClientUserService.saveOrUpdateBatch(saveList);
+                //批量保存推荐关系
+                saveAgentReferralRelation(tenantBizId,projectBizId,saveList);
            }
        }
        return Result.success();
@@ -141,6 +153,32 @@ public class ApiClientUserServiceImpl implements ApiClientUserService {
    }
    /**
+     * 保存推荐关系（目前只有CSF-客户端项目有这个添加，后期有其他项目再加）
+     * @return
+     */
+    public Result saveAgentReferralRelation(String tenantBizId,
+                                            String projectBizId,
+                                            List<ClientUser> clientUserList) {
+        //获取Security上下文当前用户的登录信息
+        AuthUserDto authUserDto = SecurityUtil.getCurrentLoginUser();
+        if (ProjectEnum.CSF_MINI_PROGRAM.getProjectBizId().equals(projectBizId)
+                && !CollectionUtils.isEmpty(clientUserList)) {
+            //CSF小程序项目 - 添加推荐关系
+            ApiAgentReferralRelationSaveRequest request = new ApiAgentReferralRelationSaveRequest();
+            List<String> agentIdList = clientUserList.stream().map(ClientUser::getClientUserBizId).collect(Collectors.toList());
+            request.setAgentIdList(agentIdList);
+            request.setProjectBizId(projectBizId);
+            //推荐人ID - 当前登录人用户ID
+            request.setReferrerId(authUserDto.getUserBizId());
+            request.setSource(CommonEnum.SOURCE_TYPE_PC.getCode());
+            request.setTenantBizId(tenantBizId);
+            request.setReferrerAccount(authUserDto.getUsername());
+            apiAgentReferralRelationFeignClient.save(request);
+        }
+        return Result.success();
+    }
+    /**
     * 校验客户端用户是否存在
     * @param clientUserBizId
     * @return

--- a/yd-user-api/yd-user-api.iml
+++ b/yd-user-api/yd-user-api.iml
@@ -26,6 +26,19 @@
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-openapi3-spring-boot-starter:4.3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-core:4.3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-openapi3-ui:4.3.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springdoc:springdoc-openapi-ui:1.7.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springdoc:springdoc-openapi-webmvc-core:1.7.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springdoc:springdoc-openapi-common:1.7.0" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-core:2.2.9" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.activation:jakarta.activation-api:1.2.2" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-annotations:2.2.9" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-models:2.2.9" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:2.0.2" level="project" />
+    <orderEntry type="library" name="Maven: org.webjars:swagger-ui:4.18.2" level="project" />
    <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-discovery:2021.0.1.0" level="project" />
    <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-alibaba-commons:2021.0.1.0" level="project" />
    <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-client:1.4.2" level="project" />
@@ -117,20 +130,10 @@
    <orderEntry type="library" name="Maven: p6spy:p6spy:3.9.1" level="project" />
    <orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.31" level="project" />
    <orderEntry type="module" module-name="yd-user-feign" />
-    <orderEntry type="library" name="Maven: com.yd:yd-feign:1.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-openfeign:3.1.1" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-openfeign-core:3.1.1" level="project" />
-    <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form-spring:3.8.0" level="project" />
-    <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form:3.8.0" level="project" />
-    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.3" level="project" />
-    <orderEntry type="library" name="Maven: io.github.openfeign:feign-core:11.8" level="project" />
-    <orderEntry type="library" name="Maven: io.github.openfeign:feign-slf4j:11.8" level="project" />
-    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.16" level="project" />
    <orderEntry type="library" name="Maven: com.yd:yd-common:1.0-SNAPSHOT" level="project" />
    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.83" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-validation:2.6.6" level="project" />
    <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.2.3.Final" level="project" />
-    <orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:2.0.2" level="project" />
    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.4.3.Final" level="project" />
    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.14.0" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.6.6" level="project" />
@@ -140,24 +143,14 @@
    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.3.18" level="project" />
    <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:6.1.8.RELEASE" level="project" />
    <orderEntry type="library" name="Maven: com.ibm.icu:icu4j:73.2" level="project" />
+    <orderEntry type="library" name="Maven: com.yd:yd-csf-feign:1.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.yd:yd-oss-feign:1.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.yd:yd-question-feign:1.0-SNAPSHOT" level="project" />
    <orderEntry type="library" name="Maven: com.yd:yd-auth-core:1.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-openapi3-spring-boot-starter:4.3.0" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-core:4.3.0" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-openapi3-ui:4.3.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springdoc:springdoc-openapi-ui:1.7.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springdoc:springdoc-openapi-webmvc-core:1.7.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springdoc:springdoc-openapi-common:1.7.0" level="project" />
-    <orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-core:2.2.9" level="project" />
-    <orderEntry type="library" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" level="project" />
-    <orderEntry type="library" name="Maven: jakarta.activation:jakarta.activation-api:1.2.2" level="project" />
-    <orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-annotations:2.2.9" level="project" />
-    <orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-models:2.2.9" level="project" />
-    <orderEntry type="library" name="Maven: org.webjars:swagger-ui:4.18.2" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-security:2.6.6" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-config:5.6.2" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-web:5.6.2" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-oauth2-resource-server:5.6.2" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-core:5.6.2" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-oauth2-core:5.6.2" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-oauth2-jose:5.6.2" level="project" />
    <orderEntry type="library" name="Maven: com.nimbusds:nimbus-jose-jwt:9.14" level="project" />
@@ -176,6 +169,8 @@
    <orderEntry type="library" name="Maven: com.yd:yd-framework:1.0-SNAPSHOT" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.6.6" level="project" />
    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.7" level="project" />
+    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.16" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-core:5.6.2" level="project" />
    <orderEntry type="library" name="Maven: org.redisson:redisson:3.20.0" level="project" />
    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.69.Final" level="project" />
    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.69.Final" level="project" />
@@ -196,5 +191,13 @@
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.2" level="project" />
    <orderEntry type="library" name="Maven: org.jodd:jodd-bean:5.1.6" level="project" />
    <orderEntry type="library" name="Maven: org.jodd:jodd-core:5.1.6" level="project" />
+    <orderEntry type="library" name="Maven: com.yd:yd-feign:1.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-openfeign:3.1.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-openfeign-core:3.1.1" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form-spring:3.8.0" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form:3.8.0" level="project" />
+    <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.3" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-core:11.8" level="project" />
+    <orderEntry type="library" name="Maven: io.github.openfeign:feign-slf4j:11.8" level="project" />
  </component>
 </module>
\ No newline at end of file
--- a/yd-user-feign/pom.xml
+++ b/yd-user-feign/pom.xml
@@ -35,5 +35,10 @@
            <groupId>com.fasterxml.jackson.core</groupId>
            <artifactId>jackson-annotations</artifactId>
        </dependency>
+        <dependency>
+            <groupId>com.yd</groupId>
+            <artifactId>yd-csf-feign</artifactId>
+            <version>${project.version}</version>
+        </dependency>
    </dependencies>
 </project>
--- a/yd-user-feign/src/main/java/com/yd/user/feign/client/clientuser/ApiClientUserFeignClient.java
+++ b/yd-user-feign/src/main/java/com/yd/user/feign/client/clientuser/ApiClientUserFeignClient.java
@@ -16,7 +16,7 @@ import javax.validation.constraints.NotBlank;
 /**
 * 客户端用户信息Feign客户端
 */
-@FeignClient(name = "yd-user-api", fallbackFactory = ApiClientUserFeignFallbackFactory.class)
+@FeignClient(name = "yd-user-api",path = "/user/api/clientUser",fallbackFactory = ApiClientUserFeignFallbackFactory.class)
 public interface ApiClientUserFeignClient {
    /**

--- a/yd-user-feign/src/main/java/com/yd/user/feign/request/clientuser/ApiClientUserPageRequest.java
+++ b/yd-user-feign/src/main/java/com/yd/user/feign/request/clientuser/ApiClientUserPageRequest.java
@@ -29,4 +29,9 @@ public class ApiClientUserPageRequest extends PageDto {
     */
    @Schema(description = "用户唯一标识(sys_user系统用户表)")
    private String userBizId;
+    /**
+     * 审批状态
+     */
+    private String approvalStatus;
 }
--- a/yd-user-feign/src/main/java/com/yd/user/feign/response/clientuser/ApiClientUserPageResponse.java
+++ b/yd-user-feign/src/main/java/com/yd/user/feign/response/clientuser/ApiClientUserPageResponse.java
@@ -57,6 +57,11 @@ public class ApiClientUserPageResponse {
    private String approvalStatus;
    /**
+     * 注册来源（PC、小程序等）默认小程序 - MINI_PROGRAM
+     */
+    private String registerSource;
+    /**
     * 所属租户唯一业务ID（冗余）
     */
    private String tenantBizId;

--- a/yd-user-feign/yd-user-feign.iml
+++ b/yd-user-feign/yd-user-feign.iml
@@ -17,6 +17,23 @@
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-openapi3-spring-boot-starter:4.3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-core:4.3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-openapi3-ui:4.3.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springdoc:springdoc-openapi-ui:1.7.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springdoc:springdoc-openapi-webmvc-core:1.7.0" level="project" />
+    <orderEntry type="library" name="Maven: org.springdoc:springdoc-openapi-common:1.7.0" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-core:2.2.9" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" level="project" />
+    <orderEntry type="library" name="Maven: jakarta.activation:jakarta.activation-api:1.2.2" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.2" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.2" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-annotations:2.2.9" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-models:2.2.9" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.3.18" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.3.18" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.3.18" level="project" />
+    <orderEntry type="library" name="Maven: org.webjars:swagger-ui:4.18.2" level="project" />
    <orderEntry type="library" name="Maven: com.yd:yd-feign:1.0-SNAPSHOT" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-openfeign:3.1.1" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter:3.1.1" level="project" />
@@ -43,29 +60,10 @@
    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.36" level="project" />
    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.16" level="project" />
    <orderEntry type="library" name="Maven: com.yd:yd-common:1.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-openapi3-spring-boot-starter:4.3.0" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-core:4.3.0" level="project" />
-    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-openapi3-ui:4.3.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springdoc:springdoc-openapi-ui:1.7.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springdoc:springdoc-openapi-webmvc-core:1.7.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springdoc:springdoc-openapi-common:1.7.0" level="project" />
-    <orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-core:2.2.9" level="project" />
-    <orderEntry type="library" name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:2.3.3" level="project" />
-    <orderEntry type="library" name="Maven: jakarta.activation:jakarta.activation-api:1.2.2" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.13.2" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.13.2" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.2" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.2" level="project" />
-    <orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-annotations:2.2.9" level="project" />
-    <orderEntry type="library" name="Maven: io.swagger.core.v3:swagger-models:2.2.9" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.3.18" level="project" />
-    <orderEntry type="library" name="Maven: org.webjars:swagger-ui:4.18.2" level="project" />
    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.83" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-validation:2.6.6" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.6.6" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.6.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.3.18" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.6.6" level="project" />
    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.11" level="project" />
    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.11" level="project" />
@@ -106,5 +104,10 @@
    <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-annotations-api:9.0.60" level="project" />
    <orderEntry type="library" name="Maven: com.ibm.icu:icu4j:73.2" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.13.2" level="project" />
+    <orderEntry type="library" name="Maven: com.yd:yd-csf-feign:1.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.yd:yd-oss-feign:1.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.yd:yd-question-feign:1.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.13.2" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.13.2" level="project" />
  </component>
 </module>
\ No newline at end of file
--- a/yd-user-service/src/main/resources/mappers/ClientUserMapper.xml
+++ b/yd-user-service/src/main/resources/mappers/ClientUserMapper.xml
@@ -19,6 +19,9 @@
            <if test="request.userBizId != null and request.userBizId != ''">
                and cu.user_biz_id = #{request.userBizId}
            </if>
+            <if test="request.approvalStatus != null and request.approvalStatus != ''">
+                and cu.approval_status = #{request.approvalStatus}
+            </if>
            and cu.is_deleted = 0
        </where>
        order by cu.create_time desc

--- a/yd-user-service/yd-user-service.iml
+++ b/yd-user-service/yd-user-service.iml