From 5814f4d7eca5b44405e4aeb028712ff021476075 Mon Sep 17 00:00:00 2001 From: zhangsz Date: Wed, 12 Feb 2025 16:09:56 +0800 Subject: [PATCH] fix: return kyc status in user --- .../java/org/wfc/user/api}/domain/UKyc.java | 20 +++-------- .../java/org/wfc/user/api/domain/UUser.java | 14 ++++++++ .../wfc/user/controller/UKycController.java | 11 +++++- .../java/org/wfc/user/mapper/UKycMapper.java | 2 +- .../java/org/wfc/user/mapper/UUserMapper.java | 2 +- .../org/wfc/user/service/IUKycService.java | 2 +- .../user/service/impl/UKycServiceImpl.java | 2 +- .../resources/mapper/user/UUserMapper.xml | 35 ++++++++++++++----- 8 files changed, 59 insertions(+), 29 deletions(-) rename {wfc-modules/wfc-user/src/main/java/org/wfc/user => wfc-api/wfc-api-user/src/main/java/org/wfc/user/api}/domain/UKyc.java (52%) diff --git a/wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/UKyc.java b/wfc-api/wfc-api-user/src/main/java/org/wfc/user/api/domain/UKyc.java similarity index 52% rename from wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/UKyc.java rename to wfc-api/wfc-api-user/src/main/java/org/wfc/user/api/domain/UKyc.java index eaaafd9..65febd7 100644 --- a/wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/UKyc.java +++ b/wfc-api/wfc-api-user/src/main/java/org/wfc/user/api/domain/UKyc.java @@ -1,8 +1,6 @@ -package org.wfc.user.domain; +package org.wfc.user.api.domain; -import com.baomidou.mybatisplus.annotation.TableName; -import org.wfc.common.mybatis.domain.BaseData; -import io.swagger.v3.oas.annotations.media.Schema; +import org.wfc.common.core.web.domain.BaseEntity; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -14,37 +12,27 @@ import lombok.NoArgsConstructor; @AllArgsConstructor @Builder @EqualsAndHashCode(callSuper = true) -@TableName("u_kyc") -@Schema(name = "UKyc", description = "User portal: u_kyc table") -public class UKyc extends BaseData { + +public class UKyc extends BaseEntity { private static final long serialVersionUID = 1L; - @Schema(description = "KYC ID") private Long kycId; - @Schema(description = "User ID") private Long userId; - @Schema(description = "Real Name") private String realName; - @Schema(description = "Birth Date") private String birthDate; - @Schema(description = "Identify Type") private Integer idType; - @Schema(description = "Identify File") private String idFile; - @Schema(description = "Identify Picture") private String identifyPicture; - @Schema(description = "Status") private Integer status; - @Schema(description = "Description") private String description; // @Schema(description = "Create Time") diff --git a/wfc-api/wfc-api-user/src/main/java/org/wfc/user/api/domain/UUser.java b/wfc-api/wfc-api-user/src/main/java/org/wfc/user/api/domain/UUser.java index 5e0f340..acdf263 100644 --- a/wfc-api/wfc-api-user/src/main/java/org/wfc/user/api/domain/UUser.java +++ b/wfc-api/wfc-api-user/src/main/java/org/wfc/user/api/domain/UUser.java @@ -101,6 +101,10 @@ public class UUser extends BaseEntity /** 角色ID */ private Long roleId; + /** User KYC Info */ + @Excel(name = "KYC Status",readConverterExp = "1=VERIFIED,2=UNVERIFIED,3=PENDING,4=REJECTED", type = Type.EXPORT) + private String kycStatus; + public UUser() { @@ -332,6 +336,15 @@ public class UUser extends BaseEntity { this.roleId = roleId; } + + public String getKycStatus() { + return kycStatus; + } + + public void setKycStatus(String kycStatus) { + this.kycStatus = kycStatus; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) @@ -354,6 +367,7 @@ public class UUser extends BaseEntity .append("updateTime", getUpdateTime()) .append("remark", getRemark()) .append("dept", getDept()) + .append("kycStatus", getKycStatus()) .toString(); } } diff --git a/wfc-modules/wfc-user/src/main/java/org/wfc/user/controller/UKycController.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/controller/UKycController.java index bc101f4..fe59c89 100644 --- a/wfc-modules/wfc-user/src/main/java/org/wfc/user/controller/UKycController.java +++ b/wfc-modules/wfc-user/src/main/java/org/wfc/user/controller/UKycController.java @@ -13,12 +13,14 @@ import org.wfc.common.core.web.domain.AjaxResult; import org.wfc.common.core.web.page.TableDataInfo; import org.wfc.common.log.annotation.Log; import org.wfc.common.log.enums.BusinessType; -import org.wfc.user.domain.UKyc; +import org.wfc.user.api.domain.UKyc; import org.wfc.user.domain.constant.KycStatusEnum; import org.wfc.user.domain.vo.UKycUserVo; import org.wfc.user.service.IUKycService; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** *

@@ -42,6 +44,13 @@ public class UKycController extends BaseController { return getDataTable(list); } + // @RequiresPermissions("Utem:kyc:query") + @GetMapping("/list") + public AjaxResult list() { + List kyc = uKycService.selectKycByUserId(); + return AjaxResult.success(kyc); + } + // @RequiresPermissions("Utem:kyc:add") // @Log(title = "User Management", businessType = BusinessType.INSERT) @PostMapping("/verify") diff --git a/wfc-modules/wfc-user/src/main/java/org/wfc/user/mapper/UKycMapper.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/mapper/UKycMapper.java index 0d19510..0ea95af 100644 --- a/wfc-modules/wfc-user/src/main/java/org/wfc/user/mapper/UKycMapper.java +++ b/wfc-modules/wfc-user/src/main/java/org/wfc/user/mapper/UKycMapper.java @@ -2,7 +2,7 @@ package org.wfc.user.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; -import org.wfc.user.domain.UKyc; +import org.wfc.user.api.domain.UKyc; import org.wfc.user.domain.vo.UKycUserVo; import java.util.List; diff --git a/wfc-modules/wfc-user/src/main/java/org/wfc/user/mapper/UUserMapper.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/mapper/UUserMapper.java index 1d3da57..3f0e266 100644 --- a/wfc-modules/wfc-user/src/main/java/org/wfc/user/mapper/UUserMapper.java +++ b/wfc-modules/wfc-user/src/main/java/org/wfc/user/mapper/UUserMapper.java @@ -18,7 +18,7 @@ public interface UUserMapper * @param UUser 用户信息 * @return 用户信息集合信息 */ - public List selectUserList(UUser UUser); + public List selectUserList(UUser user); /** * 根据条件分页查询已配用户角色列表 diff --git a/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/IUKycService.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/IUKycService.java index 3d9f829..8493c6c 100644 --- a/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/IUKycService.java +++ b/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/IUKycService.java @@ -1,7 +1,7 @@ package org.wfc.user.service; import com.baomidou.mybatisplus.extension.service.IService; -import org.wfc.user.domain.UKyc; +import org.wfc.user.api.domain.UKyc; import org.wfc.user.domain.vo.UKycUserVo; import java.util.List; diff --git a/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UKycServiceImpl.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UKycServiceImpl.java index 5510ead..f411728 100644 --- a/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UKycServiceImpl.java +++ b/wfc-modules/wfc-user/src/main/java/org/wfc/user/service/impl/UKycServiceImpl.java @@ -10,7 +10,7 @@ import org.wfc.common.core.domain.LoginUser; import org.wfc.common.core.utils.MessageUtils; import org.wfc.common.security.utils.SecurityUtils; import org.wfc.user.api.domain.UUser; -import org.wfc.user.domain.UKyc; +import org.wfc.user.api.domain.UKyc; import org.wfc.user.domain.vo.UKycUserVo; import org.wfc.user.mapper.UKycMapper; import org.wfc.user.service.IUKycService; diff --git a/wfc-modules/wfc-user/src/main/resources/mapper/user/UUserMapper.xml b/wfc-modules/wfc-user/src/main/resources/mapper/user/UUserMapper.xml index 5a1314f..bdb16aa 100644 --- a/wfc-modules/wfc-user/src/main/resources/mapper/user/UUserMapper.xml +++ b/wfc-modules/wfc-user/src/main/resources/mapper/user/UUserMapper.xml @@ -23,9 +23,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - - + + + + @@ -48,20 +49,38 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + + + + + + + + + + + + + select u.user_id, u.dept_id, u.user_name, u.nick_name, u.full_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.age, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, - d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status, - r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status + d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status, + r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status, + k.status as kyc_status from u_user u left join u_dept d on u.dept_id = d.dept_id left join u_user_role ur on u.user_id = ur.user_id left join u_role r on r.role_id = ur.role_id + left join u_kyc k on u.user_id = k.user_id