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

yd-user-api/src/main/java/com/yd/user/api/controller/ApiClientUserController.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yd.common.result.Result;
 import com.yd.user.api.service.ApiClientUserService;
 import com.yd.user.feign.client.clientuser.ApiClientUserFeignClient;
+import com.yd.user.feign.request.clientuser.ApiClientUserDetailBodyRequest;
 import com.yd.user.feign.request.clientuser.ApiClientUserPageRequest;
 import com.yd.user.feign.response.clientuser.ApiClientUserDetailResponse;
 import com.yd.user.feign.response.clientuser.ApiClientUserPageResponse;
@@ -48,4 +49,13 @@ public class ApiClientUserController implements ApiClientUserFeignClient {
         return apiClientUserService.detail(clientUserBizId);
     }
 
+    /**
+     * 获取客户端用户详情 body入参
+     * @return
+     */
+    @Override
+    public Result<ApiClientUserDetailResponse> detail(ApiClientUserDetailBodyRequest request) {
+        return apiClientUserService.detail(request);
+    }
+
 }

yd-user-api/src/main/java/com/yd/user/api/service/ApiClientUserService.java

@@ -2,6 +2,7 @@ package com.yd.user.api.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yd.common.result.Result;
+import com.yd.user.feign.request.clientuser.ApiClientUserDetailBodyRequest;
 import com.yd.user.feign.request.clientuser.ApiClientUserPageRequest;
 import com.yd.user.feign.response.clientuser.ApiClientUserDetailResponse;
 import com.yd.user.feign.response.clientuser.ApiClientUserPageResponse;
@@ -14,6 +15,8 @@ public interface ApiClientUserService {
 
     Result<ApiClientUserDetailResponse> detail(String clientUserBizId);
 
+    Result<ApiClientUserDetailResponse> detail(ApiClientUserDetailBodyRequest request);
+
     Result saveClientUserList(List<String> userBizIdList,
                               String tenantBizId,
                               String projectBizId);

yd-user-api/src/main/java/com/yd/user/api/service/impl/ApiClientUserServiceImpl.java

@@ -13,6 +13,7 @@ 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.ApiClientUserDetailBodyRequest;
 import com.yd.user.feign.request.clientuser.ApiClientUserPageRequest;
 import com.yd.user.feign.response.clientuser.ApiClientUserDetailResponse;
 import com.yd.user.feign.response.clientuser.ApiClientUserPageResponse;
@@ -72,6 +73,26 @@ public class ApiClientUserServiceImpl implements ApiClientUserService {
     }
 
     /**
+     * 获取客户端用户详情 body入参
+     * @return
+     */
+    @Override
+    public Result<ApiClientUserDetailResponse> detail(ApiClientUserDetailBodyRequest request) {
+        ApiClientUserDetailResponse response = null;
+        List<ClientUser> clientUserList = iClientUserService.queryList(ClientUserDto.builder()
+                .tenantBizId(request.getTenantBizId())
+                .projectBizId(request.getProjectBizId())
+                .clientUserBizId(request.getClientUserBizId())
+                .build());
+        if (!CollectionUtils.isEmpty(clientUserList)) {
+            response = new ApiClientUserDetailResponse();
+            ClientUser clientUser = clientUserList.get(0);
+            BeanUtils.copyProperties(clientUser,response);
+        }
+        return Result.success(response);
+    }
+
+    /**
      * 同步sys_user系统用户，批量更新客户端用户表数据
      * @param userBizIdList
      * @param tenantBizId

yd-user-feign/src/main/java/com/yd/user/feign/client/clientuser/ApiClientUserFeignClient.java

@@ -2,8 +2,11 @@ package com.yd.user.feign.client.clientuser;
 
 import com.yd.common.result.Result;
 import com.yd.user.feign.fallback.clientuser.ApiClientUserFeignFallbackFactory;
+import com.yd.user.feign.request.clientuser.ApiClientUserDetailBodyRequest;
 import com.yd.user.feign.request.clientuser.ApiClientUserPageRequest;
+import com.yd.user.feign.request.sysuser.ApiSysUserDetailBodyRequest;
 import com.yd.user.feign.response.clientuser.ApiClientUserDetailResponse;
+import com.yd.user.feign.response.sysuser.ApiSysUserDetailResponse;
 import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.validation.annotation.Validated;
@@ -36,4 +39,11 @@ public interface ApiClientUserFeignClient {
     @GetMapping("/detail")
     @Operation(summary = "详情-客户端用户信息")
     Result<ApiClientUserDetailResponse> detail(@NotBlank(message = "客户端用户表唯一业务ID不能为空") @RequestParam(value = "clientUserBizId") String clientUserBizId);
+
+    /**
+     * 获取客户端用户详情 body入参
+     * @return
+     */
+    @PostMapping("/body/detail")
+    Result<ApiClientUserDetailResponse> detail(@Validated @RequestBody ApiClientUserDetailBodyRequest request);
 }

yd-user-feign/src/main/java/com/yd/user/feign/fallback/clientuser/ApiClientUserFeignFallbackFactory.java

@@ -2,6 +2,7 @@ package com.yd.user.feign.fallback.clientuser;
 
 import com.yd.common.result.Result;
 import com.yd.user.feign.client.clientuser.ApiClientUserFeignClient;
+import com.yd.user.feign.request.clientuser.ApiClientUserDetailBodyRequest;
 import com.yd.user.feign.request.clientuser.ApiClientUserPageRequest;
 import com.yd.user.feign.response.clientuser.ApiClientUserDetailResponse;
 import lombok.extern.slf4j.Slf4j;
@@ -28,6 +29,11 @@ public class ApiClientUserFeignFallbackFactory implements FallbackFactory<ApiCli
             public Result<ApiClientUserDetailResponse> detail(String clientUserBizId) {
                 return null;
             }
+
+            @Override
+            public Result<ApiClientUserDetailResponse> detail(ApiClientUserDetailBodyRequest request) {
+                return null;
+            }
         };
     }
 }

yd-user-feign/src/main/java/com/yd/user/feign/request/clientuser/ApiClientUserDetailBodyRequest.java

+package com.yd.user.feign.request.clientuser;
+
+import lombok.Data;
+
+@Data
+public class ApiClientUserDetailBodyRequest {
+
+    /**
+     * 客户端用户表唯一业务ID
+     */
+    private String clientUserBizId;
+
+    /**
+     * 所属租户唯一业务ID（冗余）
+     */
+    private String tenantBizId;
+
+    /**
+     * 所属项目唯一业务ID（冗余）
+     */
+    private String projectBizId;
+}

yd-user-feign/src/main/java/com/yd/user/feign/request/clientuser/ApiClientUserPageRequest.java

@@ -31,6 +31,11 @@ public class ApiClientUserPageRequest extends PageDto {
     private String userBizId;
 
     /**
+     * 手机号（精确查询）
+     */
+    private String phone;
+
+    /**
      * 审批状态
      */
     private String approvalStatus;

yd-user-service/src/main/java/com/yd/user/service/dto/ClientUserDto.java

@@ -4,7 +4,6 @@ import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-
 import java.util.List;
 
 @Data
@@ -14,6 +13,11 @@ import java.util.List;
 public class ClientUserDto {
 
     /**
+     * 客户端用户表唯一业务ID
+     */
+    private String clientUserBizId;
+
+    /**
      * 所属租户唯一业务ID（冗余）
      */
     private String tenantBizId;

yd-user-service/src/main/java/com/yd/user/service/model/ClientUser.java

@@ -37,6 +37,12 @@ public class ClientUser implements Serializable {
     private String clientUserBizId;
 
     /**
+     * 头像
+     */
+    @TableField("avatar")
+    private String avatar;
+
+    /**
      * 姓名
      */
     @TableField("name")
@@ -67,6 +73,30 @@ public class ClientUser implements Serializable {
     private String idCardNumber;
 
     /**
+     * 证件文件url（多个分号分开）
+     */
+    @TableField("id_card_file_url")
+    private String idCardFileUrl;
+
+    /**
+     * 银行卡号
+     */
+    @TableField("bank_number")
+    private String bankNumber;
+
+    /**
+     * 开户行
+     */
+    @TableField("open_bank")
+    private String openBank;
+
+    /**
+     * 银行卡文件url（多个分号分开）
+     */
+    @TableField("bank_file_url")
+    private String bankFileUrl;
+
+    /**
      * 登录密码
      */
     @TableField("password")

yd-user-service/src/main/java/com/yd/user/service/service/impl/ClientUserServiceImpl.java

@@ -45,6 +45,7 @@ public class ClientUserServiceImpl extends ServiceImpl<ClientUserMapper, ClientU
         List<ClientUser> list = baseMapper.selectList(new LambdaQueryWrapper<ClientUser>()
                 .eq(StringUtils.isNotBlank(dto.getTenantBizId()),ClientUser::getTenantBizId,dto.getTenantBizId())
                 .eq(StringUtils.isNotBlank(dto.getProjectBizId()),ClientUser::getProjectBizId,dto.getProjectBizId())
+                .eq(StringUtils.isNotBlank(dto.getClientUserBizId()),ClientUser::getClientUserBizId,dto.getClientUserBizId())
                 .in(!CollectionUtils.isEmpty(dto.getUserBizIdList()),ClientUser::getUserBizId,dto.getUserBizIdList())
         );
         return list;

yd-user-service/src/main/resources/mappers/ClientUserMapper.xml

@@ -22,6 +22,9 @@
             <if test="request.approvalStatus != null and request.approvalStatus != ''">
                 and cu.approval_status = #{request.approvalStatus}
             </if>
+            <if test="request.phone != null and request.phone != ''">
+                and cu.phone = #{request.phone}
+            </if>
             and cu.is_deleted = 0
         </where>
         order by cu.create_time desc