From e64cc04da1568aff094c687fa18682b8d435f0b1 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Tue, 08 Oct 2024 20:07:36 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/service/impl/UserAssetsServices.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/UserAssetsServices.java b/src/main/java/com/nq/service/impl/UserAssetsServices.java
index cde2574..ceb0015 100644
--- a/src/main/java/com/nq/service/impl/UserAssetsServices.java
+++ b/src/main/java/com/nq/service/impl/UserAssetsServices.java
@@ -78,10 +78,12 @@
if(type.equals("0")){
if(userAssets.getAmountToBeCovered().compareTo(BigDecimal.ZERO) > 0){
BigDecimal availableBalance = bigAmt.subtract(userAssets.getAmountToBeCovered());
+ availableBalance = availableBalance.subtract(userAssets.getHandlingChargeWritten());
if(availableBalance.compareTo(BigDecimal.ZERO) > 0){
userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(availableBalance));
userAssets.setFreezeMoney(userAssets.getFreezeMoney().add(userAssets.getAmountToBeCovered()));
userAssets.setAmountToBeCovered(BigDecimal.ZERO);
+ userAssets.setHandlingChargeWritten(BigDecimal.ZERO);
if(null != userPosition){
userPosition.setAmountToBeCovered(userAssets.getAmountToBeCovered());
}
@@ -178,9 +180,11 @@
}else if(Objects.equals(eUserAssets.getCode(), EUserAssets.CLOSE_POSITION_RETURN_SECURITY_DEPOSIT.getCode())){
if(userAssets.getAmountToBeCovered().compareTo(BigDecimal.ZERO) > 0){
BigDecimal availableBalance = amount.subtract(userAssets.getAmountToBeCovered());
+ availableBalance = availableBalance.subtract(userAssets.getHandlingChargeWritten());
if(availableBalance.compareTo(BigDecimal.ZERO) > 0){
userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(availableBalance));
userAssets.setAmountToBeCovered(BigDecimal.ZERO);
+ userAssets.setHandlingChargeWritten(BigDecimal.ZERO);
}else{
BigDecimal amountToBeCovered = userAssets.getAmountToBeCovered().subtract(amount);
userAssets.setAmountToBeCovered(amountToBeCovered);
@@ -197,10 +201,12 @@
}else if(Objects.equals(eUserAssets.getCode(), EUserAssets.TOP_UP.getCode())){
if(userAssets.getAmountToBeCovered().compareTo(BigDecimal.ZERO) > 0){
BigDecimal availableBalance = amount.subtract(userAssets.getAmountToBeCovered());
+ availableBalance = availableBalance.subtract(userAssets.getHandlingChargeWritten());
if(availableBalance.compareTo(BigDecimal.ZERO) > 0){
userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(availableBalance));
userAssets.setFreezeMoney(userAssets.getFreezeMoney().add(userAssets.getAmountToBeCovered()));
userAssets.setAmountToBeCovered(BigDecimal.ZERO);
+ userAssets.setHandlingChargeWritten(BigDecimal.ZERO);
}else{
BigDecimal amountToBeCovered = userAssets.getAmountToBeCovered().subtract(amount);
userAssets.setFreezeMoney(userAssets.getFreezeMoney().add(amount));
@@ -213,8 +219,13 @@
userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(amount));
userAssets.setFreezeMoney(userAssets.getFreezeMoney().add(amount.abs()));
}else if(Objects.equals(eUserAssets.getCode(), EUserAssets.HANDLING_CHARGE.getCode())){
+ if(userAssets.getAvailableBalance().compareTo(amount.abs()) >= 0){
+ userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(amount.negate()));
+ }else {
+ userAssets.setHandlingChargeWritten(userAssets.getHandlingChargeWritten().add(amount.abs()));
+ }
userAssets.setHandlingCharge(userAssets.getHandlingCharge().add(amount.abs()));
- userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(amount.negate()));
+
extracted(amount.negate(),userAssets);
}else if(Objects.equals(eUserAssets.getCode(), EUserAssets.CONSTRAINT_CLOSE_POSITION.getCode())){
userAssets.setFreezeMoney(userAssets.getFreezeMoney().subtract(amount));
@@ -224,9 +235,6 @@
userAssets.setCumulativeProfitAndLoss(userAssets.getCumulativeProfitAndLoss().add(amount));
}
extracted(userAssets);
- }else if(Objects.equals(eUserAssets.getCode(), EUserAssets.NEW_HANDLING_CHARGE.getCode())){
- userAssets.setHandlingCharge(userAssets.getHandlingCharge().add(amount.abs()));
- extracted(amount.negate(),userAssets);
}
if(null != userPosition){
--
Gitblit v1.9.3