From 7ff2bf07924915fc12612c9fd8cae5915dca2560 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Tue, 14 Oct 2025 17:28:40 +0800
Subject: [PATCH] 1

---
 trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiUserController.java |   23 +++++++++++++----------
 1 files changed, 13 insertions(+), 10 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 22d3a3b..7dec13a 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
@@ -140,14 +140,17 @@
         return Result.succeed(data);
     }
 
-    private String validateParam(String username, String verifcode, String password, String type) {
+    private String validateParam(String phone,String username, String verifcode, String password,String usercode, String type) {
 
         if (StringUtils.isEmptyString(username)) {
             return "用户名不能为空";
         }
-//		if (StringUtils.isEmptyString(verifcode)) {
-//			return "验证码不能为空";
-//		}
+        if (StringUtils.isEmptyString(phone)) {
+            return "手机号不能为空";
+        }
+		if (StringUtils.isEmptyString(verifcode)) {
+			return "验证码不能为空";
+		}
         if (StringUtils.isEmptyString(password)) {
             return "登录密码不能为空";
         }
@@ -160,9 +163,9 @@
 //			// 只能输入数字
 //			return "登陆密码不符合设定";
 //		}
-//		if (StringUtils.isEmptyString(this.usercode)) {
-//			return "推荐码不能为空";
-//		}
+		if (StringUtils.isEmptyString(usercode)) {
+			return "推荐码不能为空";
+		}
         if (StringUtils.isEmptyString(type) || !Arrays.asList("1", "2").contains(type)) {
             return "类型不能为空";
         }
@@ -173,9 +176,9 @@
      * 手机/邮箱注册接口
      */
     @RequestMapping("register")
-    public Object register(String username, String password, String safeword, String verifcode, String usercode, String type) {
+    public Object register(String username, String password, String phone,String safeword, String verifcode, String usercode, String type) {
         // 注册类型:1/手机;2/邮箱;
-        String error = this.validateParam(username, verifcode, password, type);
+        String error = this.validateParam(phone,username, verifcode, password, usercode,type);
         if (!StringUtils.isNullOrEmpty(error)) {
             throw new YamiShopBindException(error);
         }
@@ -185,7 +188,7 @@
         if (safeword.length() != 6 || !Strings.isNumber(safeword)) {
             throw new YamiShopBindException("资金密码不符合设定");
         }
-        userService.saveRegister(username, password, usercode, safeword, verifcode, type);
+        userService.saveRegister(username, password,phone, usercode, safeword, verifcode, type);
         User secUser = userService.findByUserName(username);
         Log log = new Log();
         log.setCategory(Constants.LOG_CATEGORY_SECURITY);

--
Gitblit v1.9.3