From 3bf4837190691b0d735512281340c42f061877b9 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Thu, 10 Oct 2024 18:43:09 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/service/impl/UserAssetsServices.java | 9 +++++----
src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java | 3 +--
src/main/java/com/nq/controller/PayApiController.java | 2 +-
src/main/java/com/nq/service/impl/UserPositionServiceImpl.java | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/nq/controller/PayApiController.java b/src/main/java/com/nq/controller/PayApiController.java
index a1a947a..df73f44 100644
--- a/src/main/java/com/nq/controller/PayApiController.java
+++ b/src/main/java/com/nq/controller/PayApiController.java
@@ -88,7 +88,7 @@
//判断是否回调成功
UserRecharge userRecharge = this.userRechargeMapper.findUserRechargeByOrderSn(orderno);
if(userRecharge == null){
- System.out.println("============充值完成===============");
+ System.out.println("============ 充值完成===============");
iUserRechargeService.createOrder(Integer.valueOf(arr[0]), 1, aDouble.intValue(), orderno);
jsonObj.put("reason", "success");
} else {
diff --git a/src/main/java/com/nq/service/impl/UserAssetsServices.java b/src/main/java/com/nq/service/impl/UserAssetsServices.java
index ceb0015..239a16e 100644
--- a/src/main/java/com/nq/service/impl/UserAssetsServices.java
+++ b/src/main/java/com/nq/service/impl/UserAssetsServices.java
@@ -14,6 +14,7 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import javax.validation.constraints.Email;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
@@ -79,7 +80,7 @@
if(userAssets.getAmountToBeCovered().compareTo(BigDecimal.ZERO) > 0){
BigDecimal availableBalance = bigAmt.subtract(userAssets.getAmountToBeCovered());
availableBalance = availableBalance.subtract(userAssets.getHandlingChargeWritten());
- if(availableBalance.compareTo(BigDecimal.ZERO) > 0){
+ if(availableBalance.compareTo(BigDecimal.ZERO) >= 0){
userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(availableBalance));
userAssets.setFreezeMoney(userAssets.getFreezeMoney().add(userAssets.getAmountToBeCovered()));
userAssets.setAmountToBeCovered(BigDecimal.ZERO);
@@ -181,7 +182,7 @@
if(userAssets.getAmountToBeCovered().compareTo(BigDecimal.ZERO) > 0){
BigDecimal availableBalance = amount.subtract(userAssets.getAmountToBeCovered());
availableBalance = availableBalance.subtract(userAssets.getHandlingChargeWritten());
- if(availableBalance.compareTo(BigDecimal.ZERO) > 0){
+ if(availableBalance.compareTo(BigDecimal.ZERO) >= 0){
userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(availableBalance));
userAssets.setAmountToBeCovered(BigDecimal.ZERO);
userAssets.setHandlingChargeWritten(BigDecimal.ZERO);
@@ -202,9 +203,9 @@
if(userAssets.getAmountToBeCovered().compareTo(BigDecimal.ZERO) > 0){
BigDecimal availableBalance = amount.subtract(userAssets.getAmountToBeCovered());
availableBalance = availableBalance.subtract(userAssets.getHandlingChargeWritten());
- if(availableBalance.compareTo(BigDecimal.ZERO) > 0){
+ if(availableBalance.compareTo(BigDecimal.ZERO) >= 0){
userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(availableBalance));
- userAssets.setFreezeMoney(userAssets.getFreezeMoney().add(userAssets.getAmountToBeCovered()));
+ userAssets.setFreezeMoney(userAssets.getFreezeMoney().add(userAssets.getAmountToBeCovered()).add(userAssets.getHandlingCharge()));
userAssets.setAmountToBeCovered(BigDecimal.ZERO);
userAssets.setHandlingChargeWritten(BigDecimal.ZERO);
}else{
diff --git a/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java b/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
index 30b2ff5..887f287 100644
--- a/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
@@ -631,7 +631,7 @@
BigDecimal nowPrice = BigDecimal.ZERO;
if(null != stock){
StockRealTimeBean stockRealTimeBean = RedisKeyUtil.getCacheRealTimeStock(stock);
- nowPrice = new BigDecimal(stockRealTimeBean.getPcp());
+ nowPrice = new BigDecimal(stockRealTimeBean.getLast());
}
// if(state == 1){
// nowPrice = position.getSellOrderPrice();
diff --git a/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java b/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java
index c3ef163..e88285a 100644
--- a/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserWithdrawServiceImpl.java
@@ -357,11 +357,10 @@
BigDecimal subtract = userWithdraw.getWithAmt().subtract(userAssets.getAmountToBeCovered());
if(subtract.compareTo(BigDecimal.ZERO) > 0){
userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(subtract));
- userAssets.setFreezeMoney(userAssets.getFreezeMoney().add(userAssets.getAmountToBeCovered()));
+ userAssets.setFreezeMoney(userAssets.getFreezeMoney().subtract(subtract));
userAssets.setAmountToBeCovered(BigDecimal.ZERO);
}else{
userAssets.setAmountToBeCovered(userAssets.getAmountToBeCovered().subtract(userWithdraw.getWithAmt()));
- userAssets.setFreezeMoney(userAssets.getFreezeMoney().add(userWithdraw.getWithAmt()));
}
}else{
userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(userWithdraw.getWithAmt()));
--
Gitblit v1.9.3