From 28701d9c708089cd64e3dc813ad1d9079de6528a Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Sun, 11 Jan 2026 19:43:51 +0800
Subject: [PATCH] 日股,美股

---
 src/main/java/com/nq/service/impl/UserServiceImpl.java |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/nq/service/impl/UserServiceImpl.java b/src/main/java/com/nq/service/impl/UserServiceImpl.java
index a962322..699ce23 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());
@@ -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);

--
Gitblit v1.9.3