From 5a8a43d5edb7af016b76246d9e9f661f4363342e Mon Sep 17 00:00:00 2001
From: jack <zengjieli93@163.com>
Date: Thu, 18 Apr 2024 11:13:24 +0800
Subject: [PATCH] 修改自选BUG 汇率
---
src/main/java/com/nq/service/impl/UserAssetsServices.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/UserAssetsServices.java b/src/main/java/com/nq/service/impl/UserAssetsServices.java
index 33c7ce1..5e1a4e9 100644
--- a/src/main/java/com/nq/service/impl/UserAssetsServices.java
+++ b/src/main/java/com/nq/service/impl/UserAssetsServices.java
@@ -4,6 +4,7 @@
import com.nq.common.ServerResponse;
import com.nq.dao.MoneyLogMapper;
import com.nq.dao.UserAssetsMapper;
+import com.nq.enums.EStockType;
import com.nq.enums.EUserAssets;
import com.nq.pojo.MoneyLog;
import com.nq.pojo.UserAssets;
@@ -85,32 +86,33 @@
@Override
public Boolean availablebalanceChange(String accetType, Integer userId, EUserAssets eUserAssets, BigDecimal amount, String desc, String descType) {
- if(accetType.equals("SZHB")){
- accetType = "US";
- }
UserAssets userAssets = assetsByTypeAndUserId(accetType,userId);
String type = eUserAssets.getDesc();
- String before = userAssets.getAvailableBalance().setScale(2).toString();
+ String before = userAssets.getAvailableBalance().toString();
String accectType = userAssets.getAccectType();
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));
- userAssets.setCumulativeProfitAndLoss(userAssets.getCumulativeProfitAndLoss().add(amount));
+ userAssets.setCumulativeProfitAndLoss(userAssets.getCumulativeProfitAndLoss().add(amount.abs()));
}else if(Objects.equals(eUserAssets.getCode(), EUserAssets.CLOSE_POSITION_RETURN_SECURITY_DEPOSIT.getCode())){
userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(amount));
userAssets.setFreezeMoney(userAssets.getFreezeMoney().subtract(amount));
}else if(Objects.equals(eUserAssets.getCode(), EUserAssets.CALCULATE_PROFIT_AND_LOSS.getCode())){
- userAssets.setCumulativeProfitAndLoss(userAssets.getProfitAndLoss().add(amount));
+ userAssets.setCumulativeProfitAndLoss(userAssets.getProfitAndLoss().add(amount.abs()));
}else if(Objects.equals(eUserAssets.getCode(), EUserAssets.TRANSFER.getCode())){
userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(amount));
+ eUserAssets.setDesc(desc);
}else if(Objects.equals(eUserAssets.getCode(), EUserAssets.TOP_UP.getCode())){
userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(amount));
}else if(Objects.equals(eUserAssets.getCode(), EUserAssets.WITHDRAW.getCode())){
userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(amount));
- }
+ }else if(Objects.equals(eUserAssets.getCode(), EUserAssets.HANDLING_CHARGE.getCode())){
+ userAssets.setHandlingCharge(userAssets.getHandlingCharge().add(amount.abs()));
+ userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(amount.negate()));
+ }
String after = userAssets.getAvailableBalance().toString();
MoneyLog moneyLog = new MoneyLog();
moneyLog.setDescs(eUserAssets.getDesc());
@@ -118,8 +120,9 @@
moneyLog.setAfter(after);
moneyLog.setAmount(amount.toString());
moneyLog.setAccectType(accectType);
- moneyLog.setType(type);
+ moneyLog.setType(eUserAssets.getCode());
moneyLog.setUserId(userId+"");
+ moneyLog.setSymbol(EStockType.getEStockTypeByCode(accetType).getSymbol());
moneyLogMapper.insert(moneyLog);
return userAssetsMapper.updateById(userAssets)>1;
}
--
Gitblit v1.9.3