From 54a5b503d811f7ca3f356728c3ab1e04451a9a86 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Sat, 20 Dec 2025 16:49:09 +0800
Subject: [PATCH] 1

---
 trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiUserController.java |   46 +++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 45 insertions(+), 1 deletions(-)

diff --git a/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiUserController.java b/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiUserController.java
index 44c0e0f..4b260a5 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiUserController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiUserController.java
@@ -211,6 +211,49 @@
     }
 
     /**
+     * 重置登录账号
+     */
+    @RequestMapping("resetUserName")
+    public Object resetUserName(String username, String password, String safeword, String verifcode, String type) {
+        String userId = SecurityUtils.getUser().getUserId();
+        if (StringUtils.isEmptyString(userId)) {
+            throw new YamiShopBindException("请先登录");
+        }
+        // 重置类型:1/手机;2/邮箱;
+        String error = this.validateParam(username, verifcode, password, type);
+        if (!StringUtils.isNullOrEmpty(error)) {
+            throw new YamiShopBindException(error);
+        }
+        if (StringUtils.isEmptyString(safeword)) {
+            throw new YamiShopBindException("资金密码不能为空");
+        }
+        userService.resetUserName(userId ,username, password, safeword, verifcode, type);
+
+        User secUser = userService.findByUserName(username);
+        Log log = new Log();
+        log.setCategory(Constants.LOG_CATEGORY_SECURITY);
+        log.setLog("用户重置登录账号,ip[" + IPHelper.getIpAddr() + "]");
+        log.setUserId(secUser.getUserId());
+        log.setUsername(username);
+        logService.save(log);
+        UserInfoInTokenBO userInfoInToken = new UserInfoInTokenBO();
+        userInfoInToken.setUserId(secUser.getUserId());
+        userInfoInToken.setSysType(SysTypeEnum.ORDINARY.value());
+        userInfoInToken.setEnabled(secUser.getStatus() == 1);
+        tokenStore.deleteAllToken(String.valueOf(SysTypeEnum.ORDINARY.value()), String.valueOf(secUser.getUserId()));
+        TokenInfoVO tokenInfoVO = tokenStore.storeAndGetVo(userInfoInToken);
+        this.userService.online(secUser.getUserId());
+        this.ipMenuService.saveIpMenuWhite(IPHelper.getIpAddr());
+        Map<String, Object> data = new HashMap<String, Object>();
+        data.put("token", tokenInfoVO.getAccessToken());
+        data.put("username", secUser.getUserName());
+        data.put("usercode", secUser.getUserName());
+        secUser.setUserLastip(IPHelper.getIpAddr());
+        userService.updateById(secUser);
+        return Result.succeed(data);
+    }
+
+    /**
      * 设置资金密码(注册时)
      */
     @PostMapping("/setSafewordReg")
@@ -497,8 +540,9 @@
         map.put("advancedverif", party.isHighlevelAuthority());
         map.put("lastlogintime", party.getUserLasttime());
         map.put("lastloginip", party.getUserLastip());
+        map.put("creditScore", party.getCreditScore());
         // 实名认证通过返回真实姓名
-        if (party.isRealNameAuthority()) {
+        if (party.isRealNameAuthority() && kyc != null) {
             map.put("name", kyc.getName());
         }
         if (null != kyc) {

--
Gitblit v1.9.3