From 2790dcad04b352ef962a7f2d7d229169dc840825 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Sun, 11 Jan 2026 21:05:25 +0800
Subject: [PATCH] 修改浮动盈亏问题
---
src/main/java/com/nq/service/impl/UserServiceImpl.java | 47 +++++++++++++++++++++++------------------------
1 files changed, 23 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/UserServiceImpl.java b/src/main/java/com/nq/service/impl/UserServiceImpl.java
index 9e2f001..16191f9 100644
--- a/src/main/java/com/nq/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserServiceImpl.java
@@ -11,6 +11,7 @@
import com.nq.pojo.*;
import com.nq.service.*;
import com.nq.utils.DateTimeUtil;
+import com.nq.utils.KeyUtils;
import com.nq.utils.PropertiesUtil;
import com.nq.utils.SymmetricCryptoUtil;
import com.nq.utils.ip.IpUtils;
@@ -109,9 +110,9 @@
@Autowired
IUserRechargeService userRechargeService;
- public ServerResponse reg(String yzmCode, String agentCode, String phone, String userPwd, HttpServletRequest request) {
- if (StringUtils.isBlank(agentCode) || StringUtils.isBlank(phone) ||
- StringUtils.isBlank(userPwd) || StringUtils.isBlank(yzmCode))
+ public ServerResponse reg(String phone, String userPwd, HttpServletRequest request) {
+ if (StringUtils.isBlank(phone) ||
+ StringUtils.isBlank(userPwd))
{
return ServerResponse.createByErrorMsg("注册失败, 参数不能为空");
}
@@ -120,21 +121,6 @@
String keys = "AliyunSmsCode:" + phone;
String redis_yzm = RedisShardedPoolUtils.get(keys);
- log.info("redis_yzm = {},yzmCode = {}", redis_yzm, yzmCode);
-// if (!yzmCode.equals(redis_yzm) && !"6666".equals(yzmCode)) {
-// return ServerResponse.createByErrorMsg("注册失败, 验证码错误");
-// }
-
-
- AgentUser agentUser = this.iAgentUserService.findByCode(agentCode);
- if (agentUser == null) {
- return ServerResponse.createByErrorMsg("注册失败, 代理不存在");
- }
- if (agentUser.getIsLock().intValue() == 1) {
- return ServerResponse.createByErrorMsg("注册失败, 代理已被锁定");
- }
-
-
User dbuser = this.userMapper.findByPhone(phone);
if (dbuser != null) {
return ServerResponse.createByErrorMsg("注册失败, 手机号已注册");
@@ -142,14 +128,12 @@
User user = new User();
- user.setAgentId(agentUser.getId());
- user.setAgentName(agentUser.getAgentName());
user.setPhone(phone);
user.setUserPwd(SymmetricCryptoUtil.encryptPassword(userPwd));
user.setAccountType(Integer.valueOf(0));
- user.setIsLock(Integer.valueOf(1));
+ user.setIsLock(Integer.valueOf(0));
user.setIsActive(Integer.valueOf(0));
user.setRegTime(new Date());
@@ -178,12 +162,25 @@
int insertCount = this.userMapper.insert(user);
if (insertCount > 0) {
+ //用户注册成功重新代理机构码重新生成
log.info("用户注册成功 手机 {} , ip = {} 地址 = {}", new Object[] { phone, uip, uadd });
return ServerResponse.createBySuccessMsg("注册成功.请登录");
}
return ServerResponse.createBySuccessMsg("注册出错, 请重试");
}
+ public String generateUniqueAgentCode() {
+ // 生成新的 agent code
+ String newAgentCode = KeyUtils.getAgentUniqueKey();
+
+ // 如果找到重复的 agent code，则递归重新生成
+ if (iAgentUserService.findByCode(newAgentCode) != null) {
+ return generateUniqueAgentCode(); // 递归调用
+ }
+
+ // 返回唯一的 agent code
+ return newAgentCode;
+ }
public ServerResponse login(String phone, String userPwd, HttpServletRequest request) {
@@ -1825,7 +1822,7 @@
userInfoVO.setEnableIndexAmt(user.getEnableIndexAmt());
userInfoVO.setEnaleWithdrawAmt(user.getEnaleWithdrawAmt());
userInfoVO.setHkAmt(user.getHkAmt());
-
+ userInfoVO.setPhotoUrl(user.getPhotoUrl());
BigDecimal historyProfitLoss = new BigDecimal(0);
BigDecimal buyAmtAutual = new BigDecimal(0);
List<UserPosition> userPositionscc = this.userPositionMapper.findMyPositionByCodeAndSpell(user.getId(), "", "", 0);
@@ -1835,6 +1832,9 @@
buyAmtAutual = buyAmtAutual.add(position.getBuyOrderPrice()
.multiply(new BigDecimal(position.getOrderNum()))
.divide(new BigDecimal(position.getOrderLever()), 2, RoundingMode.HALF_UP));
+ UserPositionVO userPositionVO = assembleUserPositionVO(position);
+ historyProfitLoss = historyProfitLoss.add(userPositionVO.getProfitAndLose());
+
}
}
userInfoVO.setBuyAmtAutual(buyAmtAutual);
@@ -1842,11 +1842,10 @@
userInfoVO.setUserAmt(userAllAmt);
List<UserPosition> userPositions = this.userPositionMapper.findMyPositionByCodeAndSpell(user.getId(), "", "", 1);
-
if (userPositions.size() > 0) {
for (UserPosition position : userPositions) {
UserPositionVO userPositionVO = assembleUserPositionVO(position);
- historyProfitLoss = historyProfitLoss.add(userPositionVO.getAllProfitAndLose());
+ historyProfitLoss = historyProfitLoss.add(userPositionVO.getProfitAndLose());
}
}
userInfoVO.setHistoryProfitLoss(historyProfitLoss);
--
Gitblit v1.9.3