From afb9b1cefb1c2d2f57fe8f0f3c19efa354669c66 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Wed, 14 Jan 2026 14:42:08 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/service/impl/UserServiceImpl.java | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/UserServiceImpl.java b/src/main/java/com/nq/service/impl/UserServiceImpl.java
index 487e6ff..4972401 100644
--- a/src/main/java/com/nq/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserServiceImpl.java
@@ -166,7 +166,7 @@
user.setAccountType(Integer.valueOf(0));
- user.setIsLock(Integer.valueOf(1));
+ user.setIsLock(Integer.valueOf(0));
user.setIsActive(Integer.valueOf(0));
user.setRegTime(new Date());
@@ -176,7 +176,7 @@
user.setRegAddress(uadd);
user.setIsLogin(Integer.valueOf(0));
-
+ user.setRealType(0);
int insertCount = this.userMapper.insert(user);
if (insertCount > 0) {
@@ -395,7 +395,7 @@
}
- public ServerResponse auth(String realName, String idCard, String vaildNumber, String img1key, String img2key, String img3key, HttpServletRequest request) {
+ public ServerResponse auth(String realName, String idCard, Integer realType, String vaildNumber, String img1key, String img2key, String img3key, HttpServletRequest request) {
if (StringUtils.isBlank(realName) ||
StringUtils.isBlank(idCard)) {
@@ -413,6 +413,7 @@
user.setRealName(realName);
user.setIdCard(idCard);
user.setVaildNumber(vaildNumber);
+ user.setRealType(realType);
user.setIsActive(Integer.valueOf(1));
@@ -646,11 +647,14 @@
return ServerResponse.createByErrorMsg("余额不足", request);
}
- userAssetsServices.availablebalanceChange(fromType, user.getId(), EUserAssets.HANDLING_CHARGE, orderFree, "", "");
+ if (orderFree.compareTo(BigDecimal.ZERO) > 0) {
+ userAssetsServices.availablebalanceChange(fromType, user.getId(), EUserAssets.HANDLING_CHARGE, orderFree, "", "");
+ }
+
userAssetsServices.availablebalanceChange(fromType, user.getId(), EUserAssets.TRANSFER, amtBig.negate(),fromType+"/"+toType,"");
//转换金额
amtBig = userAssetsServices.exchangeAmountByRate(fromType, toType, amtBig);
- userAssetsServices.availablebalanceChange(toType,user.getId(),EUserAssets.TRANSFER,amtBig.setScale(5,RoundingMode.HALF_DOWN),fromType+"/"+toType,"");
+ userAssetsServices.availablebalanceChange(toType,user.getId(), EUserAssets.TRANSFER, amtBig.setScale(5,RoundingMode.HALF_DOWN),fromType+"/"+toType,"");
return ServerResponse.createBySuccess("操作成功", request);
} catch (Exception e) {
@@ -813,7 +817,8 @@
user.setIsLogin(Integer.valueOf(0));
user.setIsActive(Integer.valueOf(0));
user.setRegTime(new Date());
-
+ user.setRealType(0);
+ user.setUserPwd(SymmetricCryptoUtil.encryptPassword(pwd));
if (accountType.intValue() == 1) {
user.setNickName("模拟用户");
@@ -1136,6 +1141,7 @@
userInfoVO.setNickName(user.getNickName());
userInfoVO.setRealName(user.getRealName());
userInfoVO.setIdCard(user.getIdCard());
+ userInfoVO.setRealType(user.getRealType());
userInfoVO.setAccountType(user.getAccountType());
userInfoVO.setRecomPhone(user.getRecomPhone());
userInfoVO.setIsLock(user.getIsLock());
@@ -1197,5 +1203,12 @@
return ServerResponse.createBySuccess(mapper.selectList(queryWrapper));
}
+ @Override
+ public int countPendingAuth() {
+ QueryWrapper<User> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("is_active", 1);
+ return this.userMapper.selectCount(queryWrapper).intValue();
+ }
+
}
--
Gitblit v1.9.3