From 31e6203a5bb778ad9d1c599171606c89c8edd3a3 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Thu, 21 May 2026 15:59:47 +0800
Subject: [PATCH] 1
---
trading-order-service/src/main/java/com/yami/trading/service/impl/UserServiceImpl.java | 39 ++++++++++++++++++++++++++++++---------
1 files changed, 30 insertions(+), 9 deletions(-)
diff --git a/trading-order-service/src/main/java/com/yami/trading/service/impl/UserServiceImpl.java b/trading-order-service/src/main/java/com/yami/trading/service/impl/UserServiceImpl.java
index 0729726..f2e74ba 100644
--- a/trading-order-service/src/main/java/com/yami/trading/service/impl/UserServiceImpl.java
+++ b/trading-order-service/src/main/java/com/yami/trading/service/impl/UserServiceImpl.java
@@ -648,20 +648,22 @@
String key = username;
String authcode = identifyingCodeTimeWindowService.getAuthCode(key);
if ((authcode == null) || (!authcode.equals(verifcode))) {
- throw new YamiShopBindException("验证码不正确");
+ throw new YamiShopBindException("The verification code is incorrect.");
}
if ("true".equals(this.sysparaService.find("register_need_usercode").getSvalue())) {
if (StringUtils.isNotEmpty(usercode)) {
if (null == party_reco) {
- throw new YamiShopBindException("推荐码不正确");
+ throw new YamiShopBindException("The referral code is incorrect.");
}
if (Constants.SECURITY_ROLE_TEST.equals(party_reco.getRoleName())) {
- throw new YamiShopBindException("推荐人无权限推荐");
+ throw new YamiShopBindException("The recommender has no authority to make the recommendation.");
}
if (!party_reco.isEnabled()) {
- throw new YamiShopBindException("推荐人无权限推荐");
+ throw new YamiShopBindException("The recommender has no authority to make the recommendation.");
}
+ } else {
+ throw new YamiShopBindException("Please enter the referral code.");
}
}
// if ("true".equals(this.sysparaService.find("register_need_usercode_turn").getSvalue())) {
@@ -670,7 +672,7 @@
// }
// }
if (findByUserName(username) != null) {
- throw new YamiShopBindException("用户名重复");
+ throw new YamiShopBindException("Username duplication");
}
int ever_user_level_num = this.sysparaService.find("ever_user_level_num").getInteger();
int ever_user_level_num_custom = this.sysparaService.find("ever_user_level_num_custom").getInteger();
@@ -696,14 +698,18 @@
if (StringUtils.isEmptyString(username) || username.length() > 20) {
throw new YamiShopBindException("请输入正确的手机号码");
}
- this.savePhone(username, party.getUserId().toString());
+ User partyPhone = findPartyByVerifiedPhone(username);
+ if (null != partyPhone) {
+ throw new YamiShopBindException("电话号码已绑定其他用户");
+ }
+ this.savePhone(username, party.getUserId());
} else {
// 邮箱注册
if (!Strings.isEmail(username)) {
- throw new YamiShopBindException("请输入正确的邮箱地址");
+ throw new YamiShopBindException("Please enter the correct email address.");
}
if (findPartyByEmail(username) != null) {
- throw new YamiShopBindException("邮箱已重复");
+ throw new YamiShopBindException("The email address has been duplicated.");
}
this.saveEmail(username, party.getUserId().toString());
}
@@ -722,6 +728,7 @@
userRecom.setUserId(party_reco.getUserId());
userRecom.setRecomUserId(party.getUserId());
this.userRecomService.save(userRecom);
+ party = getById(party.getUserId());
party.setUserRecom(party_reco.getUserId());
updateById(party);
}
@@ -1047,6 +1054,7 @@
party.setSafePassword(passwordEncoder.encode("000000"));
party.setLoginPassword(passwordEncoder.encode(password));
party.setRoleName(Constants.SECURITY_ROLE_GUEST);
+ party.setCreditScore(80);
save(party);
if (!StringUtils.isNullOrEmpty(parents_usercode)) {
User party_parents = findUserByUserCode(parents_usercode);
@@ -1474,6 +1482,19 @@
}
@Override
+ public User findByUserNameOrEmailOrPhone(String userName) {
+ User user = getOne(new LambdaQueryWrapper<User>()
+ .eq(User::getUserName, userName)
+ .or(x ->
+ x.eq(User::getUserMobile, userName).eq(User::isUserMobileBind, true))
+ .or(x ->
+ x.eq(User::getUserMail, userName).eq(User::isMailBind, true))
+
+ );
+ return user;
+ }
+
+ @Override
public User findByUserMobile(String mobile) {
return getOne(new LambdaQueryWrapper<User>().eq(User::getUserMobile, mobile));
}
@@ -1563,7 +1584,7 @@
throw new YamiShopBindException("用户名重复");
}
party.setUserName(username);
- save(party);
+ updateById(party);
if (type.equals("1")) {
// 手机注册
// if (StringUtils.isEmptyString(reg.getUsername()) || !Strings.isNumber(reg.getUsername()) || reg.getUsername().length() > 15) {
--
Gitblit v1.9.3