From bf521009976f8a859614b47c14de6f360b736703 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Wed, 30 Jul 2025 15:50:13 +0800
Subject: [PATCH] 充值修改
---
src/main/java/com/nq/service/impl/UserAssetsServices.java | 52 ++++++++++++++++++++++++++++++----------------------
1 files changed, 30 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/UserAssetsServices.java b/src/main/java/com/nq/service/impl/UserAssetsServices.java
index 174721b..207fe27 100644
--- a/src/main/java/com/nq/service/impl/UserAssetsServices.java
+++ b/src/main/java/com/nq/service/impl/UserAssetsServices.java
@@ -2,7 +2,6 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.nq.Repository.ExchangeRateRepository;
import com.nq.common.ServerResponse;
import com.nq.dao.*;
@@ -16,7 +15,6 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
-import javax.validation.constraints.Email;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.Date;
@@ -38,9 +36,6 @@
@Autowired
UserRechargeServiceImpl userRechargeService;
-
- @Autowired
- UserWithdrawServiceImpl withdrawService;
@Resource
UserRechargeMapper userRechargeMapper;
@@ -188,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());
@@ -209,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());
@@ -225,9 +221,16 @@
userAssets.setAmountToBeCovered(BigDecimal.ZERO);
userAssets.setHandlingChargeWritten(BigDecimal.ZERO);
}else{
- userAssets.setFreezeMoney(userAssets.getFreezeMoney().add(amount));
- userAssets.setHandlingChargeWritten(BigDecimal.ZERO);
- userAssets.setAmountToBeCovered(availableBalance.negate());
+ BigDecimal subtract = amount.subtract(userAssets.getHandlingChargeWritten());
+ if(subtract.compareTo(BigDecimal.ZERO) >= 0) {
+ BigDecimal decimal = amount.subtract(userAssets.getAmountToBeCovered());
+ decimal = decimal.subtract(userAssets.getHandlingChargeWritten());
+ userAssets.setFreezeMoney(userAssets.getFreezeMoney().add(amount.subtract(userAssets.getHandlingChargeWritten())));
+ userAssets.setHandlingChargeWritten(BigDecimal.ZERO);
+ userAssets.setAmountToBeCovered(decimal.negate());
+ }else{
+ userAssets.setHandlingChargeWritten(userAssets.getHandlingChargeWritten().subtract(amount));
+ }
}
}else{
userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(amount));
@@ -238,13 +241,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));
@@ -252,7 +256,7 @@
userAssets.setCumulativeProfitAndLoss(userAssets.getCumulativeProfitAndLoss().add(amount));
}
extracted(userAssets);
- }
+ }
if(null != userPosition){
userPosition.setAmountToBeCovered(userAssets.getAmountToBeCovered().add(userAssets.getHandlingChargeWritten()));
@@ -263,7 +267,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+"");
@@ -316,15 +320,16 @@
//冻结金额
userAssets.setFreezeMoney(userAssets.getFreezeMoney().add(amount));
//扣除可用金额
- userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(amount.negate()));
+ userAssets.setAvailableBalance(userAssets.getAvailableBalance().subtract(amount));
+ amount = amount.negate();
} else if (eUserAssets.getCode().equals(EUserAssets.BUY_AI_REJECT.getCode())) {
//解除冻结金额
- userAssets.setFreezeMoney(userAssets.getFreezeMoney().add(amount.negate()));
+ userAssets.setFreezeMoney(userAssets.getFreezeMoney().subtract(amount));
//归还可用金额
userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(amount));
} else if (eUserAssets.getCode().equals(EUserAssets.AI_SETTLEMENT.getCode())) {
//解除购买冻结金额
- userAssets.setFreezeMoney(userAssets.getFreezeMoney().add(amount.negate()));
+ userAssets.setFreezeMoney(userAssets.getFreezeMoney().subtract(amount));
//归还购买金额
userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(amount));
} else if (eUserAssets.getCode().equals(EUserAssets.AI_SETTLEMENT_INT.getCode())) {
@@ -335,13 +340,16 @@
userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(amount));
} else if(eUserAssets.getCode().equals(EUserAssets.RT_DK.getCode())) {
//归还贷款
- userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(amount.negate()));
+ userAssets.setAvailableBalance(userAssets.getAvailableBalance().subtract(amount));
+ amount = amount.negate();
} else if(eUserAssets.getCode().equals(EUserAssets.RT_DK_INT.getCode())) {
//贷款利息
- userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(amount.negate()));
+ userAssets.setAvailableBalance(userAssets.getAvailableBalance().subtract(amount));
+ amount = amount.negate();
}
String after = userAssets.getAvailableBalance().toString();
+ //资金明细
MoneyLog moneyLog = new MoneyLog();
moneyLog.setDescs(eUserAssets.getDesc());
moneyLog.setBeFore(before);
--
Gitblit v1.9.3