From b08c3ca89f463f5a6775d77107d91cadce8bdf05 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Mon, 15 Sep 2025 18:09:40 +0800
Subject: [PATCH] 1

---
 src/main/java/com/nq/service/impl/UserServiceImpl.java |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/nq/service/impl/UserServiceImpl.java b/src/main/java/com/nq/service/impl/UserServiceImpl.java
index e998a05..9026607 100644
--- a/src/main/java/com/nq/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserServiceImpl.java
@@ -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 realType, 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)) {
 
@@ -647,7 +647,10 @@
                 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);
@@ -814,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("模拟用户");

--
Gitblit v1.9.3