From 031ea962cfd1790726e96620cad65209315f27c7 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Tue, 22 Jul 2025 15:53:34 +0800
Subject: [PATCH] 新增购买退回明细
---
src/main/java/com/nq/service/impl/UserAssetsServices.java | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/UserAssetsServices.java b/src/main/java/com/nq/service/impl/UserAssetsServices.java
index 28f0c79..490fe13 100644
--- a/src/main/java/com/nq/service/impl/UserAssetsServices.java
+++ b/src/main/java/com/nq/service/impl/UserAssetsServices.java
@@ -183,13 +183,14 @@
String type = eUserAssets.getDesc();
String before = userAssets.getAvailableBalance().toString();
String accectType = userAssets.getAccectType();
- if(Objects.equals(eUserAssets.getCode(), EUserAssets.BUY.getCode())){
+ BigDecimal amountLog = amount;
+ if(Objects.equals(eUserAssets.getCode(), EUserAssets.BUY.getCode())){
userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(amount));
userAssets.setFreezeMoney(userAssets.getFreezeMoney().add(amount.negate()));
}else if(Objects.equals(eUserAssets.getCode(), EUserAssets.CLOSE_POSITION.getCode())){
userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(amount));
extracted(amount, userAssets);
- }else if(Objects.equals(eUserAssets.getCode(), EUserAssets.CLOSE_POSITION_RETURN_SECURITY_DEPOSIT.getCode())){
+ }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());
@@ -204,12 +205,12 @@
}else{
userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(amount));
}
- userAssets.setFreezeMoney(userAssets.getFreezeMoney().subtract(amount));
+ userAssets.setFreezeMoney(userAssets.getFreezeMoney().subtract(amount));
}else if(Objects.equals(eUserAssets.getCode(), EUserAssets.CALCULATE_PROFIT_AND_LOSS.getCode())){
- extracted(amount, userAssets);
- }else if(Objects.equals(eUserAssets.getCode(), EUserAssets.TRANSFER.getCode())){
+ extracted(amount, userAssets);
+ }else if(Objects.equals(eUserAssets.getCode(), EUserAssets.TRANSFER.getCode())){
userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(amount));
- eUserAssets.setDesc(desc);
+ eUserAssets.setDesc(desc);
}else if(Objects.equals(eUserAssets.getCode(), EUserAssets.TOP_UP.getCode())){
if(userAssets.getAmountToBeCovered().compareTo(BigDecimal.ZERO) > 0){
BigDecimal availableBalance = amount.subtract(userAssets.getAmountToBeCovered());
@@ -233,13 +234,14 @@
}else if(Objects.equals(eUserAssets.getCode(), EUserAssets.HANDLING_CHARGE.getCode())){
if(userAssets.getAvailableBalance().compareTo(amount.abs()) >= 0){
userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(amount.negate()));
+ amountLog = amount.negate();
}else {
userAssets.setHandlingChargeWritten(userAssets.getHandlingChargeWritten().add(amount.abs()));
}
userAssets.setHandlingCharge(userAssets.getHandlingCharge().add(amount.abs()));
extracted(amount.negate(),userAssets);
- }else if(Objects.equals(eUserAssets.getCode(), EUserAssets.CONSTRAINT_CLOSE_POSITION.getCode())){
+ }else if(Objects.equals(eUserAssets.getCode(), EUserAssets.CONSTRAINT_CLOSE_POSITION.getCode())){
userAssets.setFreezeMoney(userAssets.getFreezeMoney().subtract(amount));
if(userAssets.getIsZf() == 0){
userAssets.setCumulativeProfitAndLoss(userAssets.getCumulativeProfitAndLoss().subtract(amount));
@@ -247,7 +249,7 @@
userAssets.setCumulativeProfitAndLoss(userAssets.getCumulativeProfitAndLoss().add(amount));
}
extracted(userAssets);
- }
+ }
if(null != userPosition){
userPosition.setAmountToBeCovered(userAssets.getAmountToBeCovered().add(userAssets.getHandlingChargeWritten()));
@@ -258,7 +260,7 @@
moneyLog.setDescs(eUserAssets.getDesc());
moneyLog.setBeFore(before);
moneyLog.setAfter(after);
- moneyLog.setAmount(amount.toString());
+ moneyLog.setAmount(amountLog.toString());
moneyLog.setAccectType(accectType);
moneyLog.setType(eUserAssets.getCode());
moneyLog.setUserId(userId+"");
--
Gitblit v1.9.3