From 55e7c224690d33ea1e083561a4b147239dbf5ec2 Mon Sep 17 00:00:00 2001 From: zhangsz Date: Fri, 10 Jan 2025 11:03:34 +0800 Subject: [PATCH] feat: support kyc on user and system module --- sql/wfc_user_db/wfc_user_db.sql | 7 +- .../wfc/system/controller/UKycController.java | 79 +++++++++++++++++++ .../main/java/org/wfc/system/domain/UKyc.java | 48 +++++++++++ .../org/wfc/system/domain/bo/UKycUserBo.java | 16 ++++ .../system/domain/constant/IdTypeEnum.java | 24 ++++++ .../system/domain/constant/KycStatusEnum.java | 21 +++++ .../domain/constant/UserKycStatusEnum.java | 19 +++++ .../org/wfc/system/domain/vo/UKycUserVo.java | 20 +++++ .../org/wfc/system/mapper/UKycMapper.java | 24 ++++++ .../org/wfc/system/service/IUKycService.java | 23 ++++++ .../system/service/impl/UKycServiceImpl.java | 39 +++++++++ .../resources/mapper/system/UKycMapper.xml | 57 +++++++++++++ .../main/java/org/wfc/user/domain/UKyc.java | 5 -- .../wfc/user/domain/constant/IdTypeEnum.java | 12 +-- ...uestStatusEnum.java => KycStatusEnum.java} | 9 ++- .../domain/constant/UserKycStatusEnum.java | 4 +- .../org/wfc/user/domain/vo/UKycUserVo.java | 8 +- .../user/service/impl/UKycServiceImpl.java | 7 -- .../main/resources/mapper/user/UKycMapper.xml | 23 ++++-- 19 files changed, 405 insertions(+), 40 deletions(-) create mode 100644 wfc-modules/wfc-system/src/main/java/org/wfc/system/controller/UKycController.java create mode 100644 wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/UKyc.java create mode 100644 wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/bo/UKycUserBo.java create mode 100644 wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/constant/IdTypeEnum.java create mode 100644 wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/constant/KycStatusEnum.java create mode 100644 wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/constant/UserKycStatusEnum.java create mode 100644 wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/vo/UKycUserVo.java create mode 100644 wfc-modules/wfc-system/src/main/java/org/wfc/system/mapper/UKycMapper.java create mode 100644 wfc-modules/wfc-system/src/main/java/org/wfc/system/service/IUKycService.java create mode 100644 wfc-modules/wfc-system/src/main/java/org/wfc/system/service/impl/UKycServiceImpl.java create mode 100644 wfc-modules/wfc-system/src/main/resources/mapper/system/UKycMapper.xml rename wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/constant/{KycRequestStatusEnum.java => KycStatusEnum.java} (64%) diff --git a/sql/wfc_user_db/wfc_user_db.sql b/sql/wfc_user_db/wfc_user_db.sql index 7b7dc26..f6bd361 100644 --- a/sql/wfc_user_db/wfc_user_db.sql +++ b/sql/wfc_user_db/wfc_user_db.sql @@ -724,7 +724,6 @@ CREATE TABLE `u_user` ( `age` int(11) NULL DEFAULT NULL COMMENT '年龄', `address` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '地址', `status` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '帐号状态（0正常 1停用）', - `kyc_status` enum('VERIFIED','UNVERIFIED') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT 'UNVERIFIED', `del_flag` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '删除标志（0代表存在 2代表删除）', `login_ip` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '最后登录IP', `login_date` datetime NULL DEFAULT NULL COMMENT '最后登录时间', @@ -739,9 +738,9 @@ CREATE TABLE `u_user` ( -- ---------------------------- -- Records of u_user -- ---------------------------- -INSERT INTO `u_user` VALUES (1, 100, 'super', '超级用户', '超级用户', '00', 'super@mail.com', '123456', '1', '', '$2a$10$XF99QEWn2MjEE3pbFVvHuOyMi/YVIrQbdenEleJN5dYxAfgXFaaqG', 1, '', '0', 'UNVERIFIED', '0', '192.168.88.14', '2024-12-06 10:36:35', 'system', '2024-05-08 21:50:54', '', '2024-12-06 10:36:35', 'super'); -INSERT INTO `u_user` VALUES (2, 100, 'demo', 'demo user', 'demo user', '00', 'demo@mail.com', '123456', '1', '', '$2a$10$XF99QEWn2MjEE3pbFVvHuOyMi/YVIrQbdenEleJN5dYxAfgXFaaqG', 1, '', '0', 'UNVERIFIED', '0', '192.168.88.14', '2024-12-06 10:36:35', 'system', '2024-12-06 10:30:54', '', '2024-12-06 10:36:35', 'demo'); -INSERT INTO `u_user` VALUES (3, NULL, '123456', 'general user', 'general user', '00', '12345678@mail.com', '1234567', '1', '', '$2a$10$XF99QEWn2MjEE3pbFVvHuOyMi/YVIrQbdenEleJN5dYxAfgXFaaqG', 1, '', '0', 'UNVERIFIED', '0', '192.168.2.94', '2024-12-16 17:36:08', 'system', '2024-05-08 21:50:54', '123456', '2024-12-16 17:36:08', ''); +INSERT INTO `u_user` VALUES (1, 100, 'super', '超级用户', '超级用户', '00', 'super@mail.com', '123456', '1', '', '$2a$10$XF99QEWn2MjEE3pbFVvHuOyMi/YVIrQbdenEleJN5dYxAfgXFaaqG', 1, '', '0', '0', '192.168.88.14', '2024-12-06 10:36:35', 'system', '2024-05-08 21:50:54', '', '2024-12-06 10:36:35', 'super'); +INSERT INTO `u_user` VALUES (2, 100, 'demo', 'demo user', 'demo user', '00', 'demo@mail.com', '123456', '1', '', '$2a$10$XF99QEWn2MjEE3pbFVvHuOyMi/YVIrQbdenEleJN5dYxAfgXFaaqG', 1, '', '0', '0', '192.168.88.14', '2024-12-06 10:36:35', 'system', '2024-12-06 10:30:54', '', '2024-12-06 10:36:35', 'demo'); +INSERT INTO `u_user` VALUES (3, NULL, '123456', 'general user', 'general user', '00', '12345678@mail.com', '1234567', '1', '', '$2a$10$XF99QEWn2MjEE3pbFVvHuOyMi/YVIrQbdenEleJN5dYxAfgXFaaqG', 1, '', '0', '0', '192.168.2.94', '2024-12-16 17:36:08', 'system', '2024-05-08 21:50:54', '123456', '2024-12-16 17:36:08', ''); -- ---------------------------- -- Table structure for u_user_post diff --git a/wfc-modules/wfc-system/src/main/java/org/wfc/system/controller/UKycController.java b/wfc-modules/wfc-system/src/main/java/org/wfc/system/controller/UKycController.java new file mode 100644 index 0000000..ca88606 --- /dev/null +++ b/wfc-modules/wfc-system/src/main/java/org/wfc/system/controller/UKycController.java @@ -0,0 +1,79 @@ +package org.wfc.system.controller; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import org.wfc.common.core.web.controller.BaseController; +import org.wfc.common.core.web.domain.AjaxResult; +import org.wfc.common.core.web.page.TableDataInfo; +import org.wfc.system.domain.UKyc; +import org.wfc.system.domain.bo.UKycUserBo; +import org.wfc.system.domain.constant.KycStatusEnum; +import org.wfc.system.domain.vo.UKycUserVo; +import org.wfc.system.service.IUKycService; + +import java.util.List; + +/** + *

+ * User Portal-User KYC table contorller + *

+ * + * @author sys + * @since 2025-01-08 + */ +@RestController +@RequestMapping("/kyc") +public class UKycController extends BaseController { + private static final Logger log = LoggerFactory.getLogger(UKycController.class); + + @Autowired + private IUKycService uKycService; + + @GetMapping("/page") + public TableDataInfo selectKycByUserId(UKycUserBo item) { + log.debug("item: {}", item); + startPage(); + List list = uKycService.selectKycByUserId(item); + return getDataTable(list); + } + + @GetMapping("/list") + public AjaxResult list(UKycUserBo item) { + startPage(); + List list = uKycService.selectKycByUserId(item); + return success(list); + } + + @GetMapping(value = "/{id}") + public AjaxResult getById(@PathVariable("id") Long id) { + return success(uKycService.getById(id)); + } + + @PutMapping("/approve") + public AjaxResult approve(@RequestBody UKyc uKyc) { + // set user kyc status to verified + uKyc.setStatus(KycStatusEnum.VERIFIED.getCode()); + log.debug("uKyc: {}", uKyc); + return toAjax(uKycService.updateKycByUserId(uKyc)); + } + + @PutMapping("/reject") + public AjaxResult reject(@RequestBody UKyc uKyc) { + // set kyc request status to rejected and put the description in the database + uKyc.setStatus(KycStatusEnum.REJECTED.getCode()); + return toAjax(uKycService.updateKycByUserId(uKyc)); + } + + // @DeleteMapping("/{ids}") + // public AjaxResult remove(@PathVariable Long[] ids) { + // return toAjax(uKycService.removeByIds(CollUtil.newArrayList(ids))); + // } + +} diff --git a/wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/UKyc.java b/wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/UKyc.java new file mode 100644 index 0000000..494b781 --- /dev/null +++ b/wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/UKyc.java @@ -0,0 +1,48 @@ +package org.wfc.system.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import org.wfc.common.mybatis.domain.BaseData; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Builder +@EqualsAndHashCode(callSuper = true) +@TableName("u_kyc") +@Schema(name = "UKyc", description = "User portal: u_kyc table") +public class UKyc extends BaseData { + + private static final long serialVersionUID = 1L; + + @Schema(description = "KYC ID") + private Long kycId; + + @Schema(description = "User ID") + private Long userId; + + @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; + +} diff --git a/wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/bo/UKycUserBo.java b/wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/bo/UKycUserBo.java new file mode 100644 index 0000000..7103f79 --- /dev/null +++ b/wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/bo/UKycUserBo.java @@ -0,0 +1,16 @@ +package org.wfc.system.domain.bo; + +import lombok.Data; + +/** + * @description: Kyc User Bo + * @since: 2025-01-09 + */ +@Data +public class UKycUserBo { + private Long userId; + private String userName; + private Integer status; + private String createTimeStart; + private String createTimeEnd; +} diff --git a/wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/constant/IdTypeEnum.java b/wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/constant/IdTypeEnum.java new file mode 100644 index 0000000..faa3837 --- /dev/null +++ b/wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/constant/IdTypeEnum.java @@ -0,0 +1,24 @@ +package org.wfc.system.domain.constant; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * @description: 证件类型枚举 + * @since: 2025-01-08 + */ +@Getter +@AllArgsConstructor +public enum IdTypeEnum { + + DRIVERS_LICENSE(1, "driver's license"), + PASSPORT(2, "passport"), + RESIDENCE_PERMIT(3, "residence permit"), + STUDENT_ID(4, "student ID"), + MEDICARE_CARD(5, "medicare card"), + BIRTH_CERTIFICATE(6, "birth certificate"); + + private final Integer code; + private final String desc; + +} diff --git a/wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/constant/KycStatusEnum.java b/wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/constant/KycStatusEnum.java new file mode 100644 index 0000000..ad644c2 --- /dev/null +++ b/wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/constant/KycStatusEnum.java @@ -0,0 +1,21 @@ +package org.wfc.system.domain.constant; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * @description: KYC request status enum + * @since: 2025-01-08 + */ +@Getter +@AllArgsConstructor +public enum KycStatusEnum { + + VERIFIED(1, "verified"), + UNVERIFIED(2, "unverified"), + PENDING(3, "pending"), + REJECTED(4, "rejected"); + + private final Integer code; + private final String desc; +} diff --git a/wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/constant/UserKycStatusEnum.java b/wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/constant/UserKycStatusEnum.java new file mode 100644 index 0000000..549e314 --- /dev/null +++ b/wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/constant/UserKycStatusEnum.java @@ -0,0 +1,19 @@ +package org.wfc.system.domain.constant; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * @description: User KYC status enum + * @since: 2025-01-08 + */ +@Getter +@AllArgsConstructor +public enum UserKycStatusEnum { + + VERIFIED(1, "verified"), + UNVERIFIED(2, "unverified"); + + private final Integer code; + private final String desc; +} diff --git a/wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/vo/UKycUserVo.java b/wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/vo/UKycUserVo.java new file mode 100644 index 0000000..f6d740e --- /dev/null +++ b/wfc-modules/wfc-system/src/main/java/org/wfc/system/domain/vo/UKycUserVo.java @@ -0,0 +1,20 @@ +package org.wfc.system.domain.vo; + +import lombok.Data; + +import org.wfc.system.domain.constant.IdTypeEnum; +import org.wfc.system.domain.constant.KycStatusEnum; + +@Data +public class UKycUserVo { + private Long kycId; + private Long userId; + private String userName; + private String birthDate; + private IdTypeEnum idType; + private String idFile; + private String identifyPicture; + private KycStatusEnum status; + private String description; + private String createTime; +} diff --git a/wfc-modules/wfc-system/src/main/java/org/wfc/system/mapper/UKycMapper.java b/wfc-modules/wfc-system/src/main/java/org/wfc/system/mapper/UKycMapper.java new file mode 100644 index 0000000..df621ad --- /dev/null +++ b/wfc-modules/wfc-system/src/main/java/org/wfc/system/mapper/UKycMapper.java @@ -0,0 +1,24 @@ +package org.wfc.system.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +import java.util.List; +import com.baomidou.dynamic.datasource.annotation.DS; +import org.apache.ibatis.annotations.Param; +import org.wfc.system.domain.UKyc; +import org.wfc.system.domain.vo.UKycUserVo; +import org.wfc.system.domain.bo.UKycUserBo; + +/** + *

+ * 用户平台-KYC表 Mapper 接口 + *

+ * + * @author sys + * @since 2025-01-08 + */ +@DS("user") +public interface UKycMapper extends BaseMapper { + List selectKycByUserId(@Param("item") UKycUserBo item); + public int updateKycByUserId(UKyc uKyc); +} diff --git a/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/IUKycService.java b/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/IUKycService.java new file mode 100644 index 0000000..110510f --- /dev/null +++ b/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/IUKycService.java @@ -0,0 +1,23 @@ +package org.wfc.system.service; + +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +import org.wfc.system.domain.UKyc; +import org.wfc.system.domain.bo.UKycUserBo; +import org.wfc.system.domain.vo.UKycUserVo; + + +/** + *

+ * 用户平台-KYC表 服务类 + *

+ * + * @author sys + * @since 2025-01-08 + */ +public interface IUKycService extends IService { + List selectKycByUserId(UKycUserBo item); + public int updateKycByUserId(UKyc uKyc); +} diff --git a/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/impl/UKycServiceImpl.java b/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/impl/UKycServiceImpl.java new file mode 100644 index 0000000..b4a1745 --- /dev/null +++ b/wfc-modules/wfc-system/src/main/java/org/wfc/system/service/impl/UKycServiceImpl.java @@ -0,0 +1,39 @@ +package org.wfc.system.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import org.wfc.system.domain.UKyc; +import org.wfc.system.domain.vo.UKycUserVo; +import org.wfc.system.domain.bo.UKycUserBo; +import org.wfc.system.mapper.UKycMapper; +import org.wfc.system.service.IUKycService; + + +/** + *

+ * 用户平台-KYC表 服务实现类 + *

+ * + * @author sys + * @since 2025-01-09 + */ +@Service +public class UKycServiceImpl extends ServiceImpl implements IUKycService { + @Autowired + private UKycMapper uKycMapper; + + @Override + public List selectKycByUserId(UKycUserBo item) { + return this.uKycMapper.selectKycByUserId(item); + } + + @Override + public int updateKycByUserId(UKyc uKyc) { + return this.uKycMapper.updateKycByUserId(uKyc); + } +} diff --git a/wfc-modules/wfc-system/src/main/resources/mapper/system/UKycMapper.xml b/wfc-modules/wfc-system/src/main/resources/mapper/system/UKycMapper.xml new file mode 100644 index 0000000..9733400 --- /dev/null +++ b/wfc-modules/wfc-system/src/main/resources/mapper/system/UKycMapper.xml @@ -0,0 +1,57 @@ + + + + + + + + UPDATE u_kyc + + status = #{status}, + description = #{description}, + update_by = #{updateBy}, + update_time = sysdate() + + WHERE user_id = #{userId} + + + diff --git a/wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/UKyc.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/UKyc.java index a62be51..8111ad0 100644 --- a/wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/UKyc.java +++ b/wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/UKyc.java @@ -1,12 +1,7 @@ package org.wfc.user.domain; -import java.time.LocalDateTime; - import com.baomidou.mybatisplus.annotation.TableName; import org.wfc.common.mybatis.domain.BaseData; -import org.wfc.user.domain.constant.IdTypeEnum; -import org.wfc.user.domain.constant.KycRequestStatusEnum; - import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/constant/IdTypeEnum.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/constant/IdTypeEnum.java index 64b6382..7d43820 100644 --- a/wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/constant/IdTypeEnum.java +++ b/wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/constant/IdTypeEnum.java @@ -11,12 +11,12 @@ import lombok.Getter; @AllArgsConstructor public enum IdTypeEnum { - DRIVERS_LICENSE(0, "driver's license"), - PASSPORT(1, "passport"), - RESIDENCE_PERMIT(2, "residence permit"), - STUDENT_ID(3, "student ID"), - MEDICARE_CARD(4, "medicare card"), - BIRTH_CERTIFICATE(5, "birth certificate"); + DRIVERS_LICENSE(1, "driver's license"), + PASSPORT(2, "passport"), + RESIDENCE_PERMIT(3, "residence permit"), + STUDENT_ID(4, "student ID"), + MEDICARE_CARD(5, "medicare card"), + BIRTH_CERTIFICATE(6, "birth certificate"); private final Integer code; private final String desc; diff --git a/wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/constant/KycRequestStatusEnum.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/constant/KycStatusEnum.java similarity index 64% rename from wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/constant/KycRequestStatusEnum.java rename to wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/constant/KycStatusEnum.java index 7e4ea64..ad83a78 100644 --- a/wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/constant/KycRequestStatusEnum.java +++ b/wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/constant/KycStatusEnum.java @@ -9,11 +9,12 @@ import lombok.Getter; */ @Getter @AllArgsConstructor -public enum KycRequestStatusEnum { +public enum KycStatusEnum { - APPROVED(0, "approved"), - REJECTED(1, "rejected"), - PENDING(2, "pending"); + VERIFIED(1, "verified"), + UNVERIFIED(2, "unverified"), + PENDING(3, "pending"), + REJECTED(4, "rejected"); private final Integer code; private final String desc; diff --git a/wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/constant/UserKycStatusEnum.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/constant/UserKycStatusEnum.java index c0d735a..3481423 100644 --- a/wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/constant/UserKycStatusEnum.java +++ b/wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/constant/UserKycStatusEnum.java @@ -11,8 +11,8 @@ import lombok.Getter; @AllArgsConstructor public enum UserKycStatusEnum { - VERIFIED(0, "verified"), - UNVERIFIED(1, "unverified"); + VERIFIED(1, "verified"), + UNVERIFIED(2, "unverified"); private final Integer code; private final String desc; diff --git a/wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/vo/UKycUserVo.java b/wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/vo/UKycUserVo.java index c37b21b..f199500 100644 --- a/wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/vo/UKycUserVo.java +++ b/wfc-modules/wfc-user/src/main/java/org/wfc/user/domain/vo/UKycUserVo.java @@ -28,11 +28,11 @@ public class UKycUserVo { @Schema(description = "Identify Picture") private String identifyPicture; - @Schema(description = "KYC Request Status") - private KycRequestStatusEnum kycRequestStatus; + @Schema(description = "KYC Status") + private KycStatusEnum status; - @Schema(description = "User KYC Status") - private UserKycStatusEnum userKycStatus; + @Schema(description = "Description") + private String description; @Schema(description = "Create Time") private String createTime; 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 d99573a..4db696c 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 @@ -9,11 +9,8 @@ import org.springframework.stereotype.Service; import org.wfc.common.core.domain.LoginUser; import org.wfc.common.security.utils.SecurityUtils; import org.wfc.user.domain.UKyc; -import org.wfc.user.domain.constant.IdTypeEnum; -import org.wfc.user.domain.constant.KycRequestStatusEnum; import org.wfc.user.domain.vo.UKycUserVo; import org.wfc.user.mapper.UKycMapper; -import org.wfc.user.mapper.UUserMapper; import org.wfc.user.service.IUKycService; import java.util.List; @@ -52,10 +49,6 @@ public class UKycServiceImpl extends ServiceImpl implements IU @Override public int insertUserKyc(UKyc uKyc) { - // // Convert string to enum - // uKyc.setIdType(uKyc.getIdType()); - // uKyc.setStatus(uKyc.getStatus()); - log.debug("uKyc: {}", uKyc); if (this.uKycMapper.isExistUserKyc(uKyc.getUserId()) == 0) { return this.uKycMapper.insertUserKyc(uKyc); diff --git a/wfc-modules/wfc-user/src/main/resources/mapper/user/UKycMapper.xml b/wfc-modules/wfc-user/src/main/resources/mapper/user/UKycMapper.xml index 8ee41b2..4070723 100644 --- a/wfc-modules/wfc-user/src/main/resources/mapper/user/UKycMapper.xml +++ b/wfc-modules/wfc-user/src/main/resources/mapper/user/UKycMapper.xml @@ -19,7 +19,7 @@ - insert into u_kyc( + INSERT INTO u_kyc( user_id, birth_date, id_type, @@ -29,7 +29,7 @@ description, create_by, create_time - )values( + )VALUES( #{userId}, STR_TO_DATE(#{birthDate}, '%Y-%m-%d %H:%i:%s'), #{idType}, @@ -43,7 +43,7 @@ - update u_kyc + UPDATE u_kyc birth_date = STR_TO_DATE(#{birthDate}, '%Y-%m-%d %H:%i:%s'), id_type = #{idType}, @@ -54,11 +54,19 @@ update_by = #{updateBy}, update_time = sysdate() - where user_id = #{userId} + WHERE user_id = #{userId} -