From db2df18d934abbb3514ea8e7162f037a69988eae Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Wed, 19 Nov 2025 14:53:49 +0800
Subject: [PATCH] 优化

---
 trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiUserController.java |   40 ++++++++++++++++++++++++++++++++++++----
 1 files changed, 36 insertions(+), 4 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 ecbccdc..bfd4d27 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
@@ -496,13 +496,17 @@
         map.put("advancedverif", party.isHighlevelAuthority());
         map.put("lastlogintime", party.getUserLasttime());
         map.put("lastloginip", party.getUserLastip());
-        // 实名认证通过返回真实姓名
-        if (party.isRealNameAuthority()) {
-            map.put("name", kyc.getName());
-        }
+        map.put("loanLimit", party.getLoanLimit());
+        map.put("loanRate", Double.valueOf(sysparaService.find("loan_rate").getSvalue()));
+
+
         if (null != kyc) {
             map.put("nationality", kyc.getNationality());
             map.put("kyc_status", kyc.getStatus());
+            // 实名认证通过返回真实姓名
+            if (party.isRealNameAuthority()) {
+                map.put("name", kyc.getName());
+            }
         }
         if (null != kycHighLevel) {
             map.put("kyc_high_level_status", kycHighLevel.getStatus());
@@ -762,6 +766,34 @@
         return Result.succeed(null);
     }
 
+    @PostMapping("updateOldAndNewSafePsw")
+    @ApiOperation("修改资金密码 用旧资金密码")
+    public Result updateOldAndNewSafePsw(String old_password, String password, String re_password) {
+
+        if (StringUtils.isEmptyString(old_password)) {
+            throw new YamiShopBindException("旧资金密码不能为空");
+        }
+        if (StringUtils.isEmptyString(password)) {
+            throw new YamiShopBindException("新资金密码不能为空");
+        }
+        if (StringUtils.isEmptyString(re_password)) {
+            throw new YamiShopBindException("新资金密码确认不能为空");
+        }
+        if (old_password.length() < 6 || old_password.length() > 12 || password.length() < 6 || password.length() > 12) {
+            throw new YamiShopBindException("密码必须6-12位");
+        }
+        User secUser = userService.getById(SecurityUtils.getUser().getUserId());
+        if (!passwordEncoder.matches(old_password, secUser.getSafePassword())) {
+            throw new YamiShopBindException("旧密码不正确!");
+        }
+        if (!password.equals(re_password)) {
+            throw new YamiShopBindException("新密码不一致");
+        }
+        secUser.setSafePassword(passwordEncoder.encode(re_password));
+        userService.updateById(secUser);
+        return Result.succeed(null);
+    }
+
     /**
      * 修改资金密码 用验证码
      */

--
Gitblit v1.9.3