From 2c7b7986f347961adec433e378a1f82434c7150e Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Sat, 11 Oct 2025 03:13:07 +0800
Subject: [PATCH] 1

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/product/UserKycController.java |   41 +++++++++++++++++++++++++++++++++++++++--
 1 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/product/UserKycController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/product/UserKycController.java
index 9f10557..4c35f6b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/product/UserKycController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/product/UserKycController.java
@@ -17,6 +17,7 @@
 import com.ruoyi.system.domain.dto.UserPolicyDto;
 import com.ruoyi.system.mapper.UserKycMapper;
 import com.ruoyi.system.service.UserAccountService;
+import org.apache.catalina.User;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
@@ -25,6 +26,7 @@
 import javax.validation.Valid;
 import java.util.Date;
 import java.util.List;
+import java.util.Optional;
 
 @RestController
 @RequestMapping("/kyc")
@@ -60,6 +62,8 @@
                 userKyc.setHeadPortraitImg(dto.getHeadPortraitImg());
                 userKyc.setNationalEmblemImg(dto.getNationalEmblemImg());
                 userKyc.setHandImg(dto.getHandImg());
+                userKyc.setName(dto.getName());
+                userKyc.setIdCard(dto.getIdCard());
                 userKycService.save(userKyc);
             }else{
                 if(userKyc.getState() == 0){
@@ -69,6 +73,8 @@
                 userKyc.setHeadPortraitImg(dto.getHeadPortraitImg());
                 userKyc.setNationalEmblemImg(dto.getNationalEmblemImg());
                 userKyc.setHandImg(dto.getHandImg());
+                userKyc.setName(dto.getName());
+                userKyc.setIdCard(dto.getIdCard());
                 userKycService.updateById(userKyc);
             }
             userAccount.setKycStatus(0);
@@ -122,7 +128,7 @@
      */
     @GetMapping("/list")
     public TableDataInfo list(@RequestParam(value = "account",required = false) String account,
-                              @RequestParam(value = "state",required = false) Integer state
+                              @RequestParam(value = "state",defaultValue = "0") Integer state
 
     ) {
         startPage();
@@ -130,12 +136,43 @@
         if(StringUtils.isNotEmpty(account)){
             wrapper.eq(UserKyc::getAccount,account);
         }
-        if(state != null){
+        if(state != null && state != 3){
             wrapper.eq(UserKyc::getState,state);
+        }else if(state == 3){
+            wrapper.ne(UserKyc::getState,0);
         }
         // 按创建时间倒序排列
         wrapper.orderByDesc(UserKyc::getCreatedAt);
         List<UserKyc> list = userKycService.list(wrapper);
         return getDataTable(list);
     }
+
+
+    /**
+     * 根据账户查询实名认证信息
+     */
+    @GetMapping("/getByAccount")
+    public Result getByAccount(@RequestParam(value = "account") String account) {
+        LambdaQueryWrapper<UserKyc> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(UserKyc::getAccount,account);
+        // 按创建时间倒序排列
+        wrapper.orderByDesc(UserKyc::getCreatedAt);
+
+        // 查询用户KYC信息
+        UserKyc userKyc = userKycService.getOne(new LambdaQueryWrapper<UserKyc>()
+                .eq(UserKyc::getAccount, account));
+        // 如果KYC信息存在,补充昵称信息
+        UserAccount userAccount = userAccountService.getOne(new LambdaQueryWrapper<UserAccount>()
+                .eq(UserAccount::getAccount, account));
+        // 如果KYC信息不存在,创建空实体
+        if (ObjectUtil.isEmpty(userKyc)) {
+            userKyc = new UserKyc();
+        }
+        if (StringUtils.isNotEmpty(userAccount.getNickname())) {
+            userKyc.setNickName(userAccount.getNickname());
+            userKyc.setPhone(userAccount.getAccount());
+        }
+
+        return Result.success(userKyc);
+    }
 }

--
Gitblit v1.9.3