From 05c70aec6fb13c9df2c90f84d9411cafe63570a8 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Thu, 07 Aug 2025 10:53:50 +0800
Subject: [PATCH] 8.6修改
---
src/main/java/com/nq/service/impl/UserAssetsServices.java | 64 +++++++++++++++++--------------
1 files changed, 35 insertions(+), 29 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..4560957 100644
--- a/src/main/java/com/nq/service/impl/UserAssetsServices.java
+++ b/src/main/java/com/nq/service/impl/UserAssetsServices.java
@@ -52,11 +52,8 @@
@Override
public UserAssets assetsByTypeAndUserId(String accetType, Integer userId) {
- /*if(accetType.equals("SZHB")){
- accetType = "US";
- }*/
- if(accetType.equals(EStockType.US.getCode()) || accetType.equals("IN")){
- accetType = EStockType.MX.getCode();
+ if(!accetType.equals(EStockType.US.getCode())){
+ accetType = EStockType.US.getCode();
}
QueryWrapper<UserAssets> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("accect_type",accetType);
@@ -172,24 +169,25 @@
@Override
public Boolean availablebalanceChange(String accetType, Integer userId, EUserAssets eUserAssets, BigDecimal amount, String desc, String descType) throws Exception {
- //UserAssets userAssets = assetsByTypeAndUserId(accetType,userId);
- //查询墨西哥账户
- UserAssets userAssets = assetsByTypeAndUserId(EStockType.MX.getCode(), userId);
- //如果不是墨西哥币需要转换金额
- if (!accetType.equals(EStockType.MX.getCode())) {
+ //查询账户
+ UserAssets userAssets = assetsByTypeAndUserId(EStockType.getDefault().getCode(), userId);
+ //是否需要转换金额
+ if (!accetType.equals(EStockType.getDefault().getCode())) {
amount = exchangeAmountByRate(accetType, amount);
}
+
UserPosition userPosition = userPositionMapper.selectOne(new LambdaQueryWrapper<UserPosition>().gt(UserPosition::getAmountToBeCovered, BigDecimal.ZERO).eq(UserPosition::getUserId,userAssets.getUserId()));
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 +202,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());
@@ -220,9 +218,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));
@@ -233,13 +238,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 +253,7 @@
userAssets.setCumulativeProfitAndLoss(userAssets.getCumulativeProfitAndLoss().add(amount));
}
extracted(userAssets);
- }
+ }
if(null != userPosition){
userPosition.setAmountToBeCovered(userAssets.getAmountToBeCovered().add(userAssets.getHandlingChargeWritten()));
@@ -258,7 +264,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+"");
@@ -300,10 +306,10 @@
public Boolean aiAvailableBalanceChange(String accetType, Integer userId, EUserAssets eUserAssets, BigDecimal amount) throws Exception {
- //查询墨西哥账户
- UserAssets userAssets = assetsByTypeAndUserId(EStockType.MX.getCode(), userId);
- //如果不是墨西哥币需要转换金额
- if (!accetType.equals(EStockType.MX.getCode())) {
+ //查询账户
+ UserAssets userAssets = assetsByTypeAndUserId(EStockType.getDefault().getCode(), userId);
+ //是否需要转换金额
+ if (!accetType.equals(EStockType.getDefault().getCode())) {
amount = exchangeAmountByRate(accetType, amount);
}
String before = userAssets.getAvailableBalance().toString();
@@ -359,12 +365,12 @@
public BigDecimal exchangeAmountByRate(String accetType, BigDecimal amount) throws Exception {
EStockType stockType = EStockType.getEStockTypeByCode(accetType);
ExchangeRate exchangeRate = exchangeRateRepository.findExchangeRateByCurrencyAndConversionCurrency(
- stockType.getSymbol(), EStockType.MX.getSymbol()).orElse(null);
+ stockType.getSymbol(), EStockType.getDefault().getSymbol()).orElse(null);
if (exchangeRate != null) {
- //转换为墨西哥币 保留5位小数
+ //转换为默认货币 保留5位小数
return amount.multiply(exchangeRate.getRata()).setScale(5, RoundingMode.HALF_UP);
} else {
- log.error("exchangeAmountByRate is null:{}>>{}", stockType.getSymbol(), EStockType.MX.getSymbol());
+ log.error("exchangeAmountByRate is null:{}>>{}", stockType.getSymbol(), EStockType.getDefault().getSymbol());
throw new Exception("货币转换汇率未设置");
}
--
Gitblit v1.9.3