From fd112c08c7bdc1b549c92d1e851f948c3410c502 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Mon, 11 Aug 2025 18:30:18 +0800
Subject: [PATCH] 8.6二开 新增资金账户,对应资金购买对应股票
---
src/main/java/com/nq/service/impl/UserAssetsServices.java | 128 +++++++++++++++++++++++++++---------------
1 files changed, 83 insertions(+), 45 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..8a4123b 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,9 +15,9 @@
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.Arrays;
import java.util.Date;
import java.util.List;
import java.util.Objects;
@@ -39,9 +38,6 @@
@Autowired
UserRechargeServiceImpl userRechargeService;
- @Autowired
- UserWithdrawServiceImpl withdrawService;
-
@Resource
UserRechargeMapper userRechargeMapper;
@@ -57,12 +53,9 @@
@Override
public UserAssets assetsByTypeAndUserId(String accetType, Integer userId) {
- /*if(accetType.equals("SZHB")){
- accetType = "US";
+ /*if(!accetType.equals(EStockType.US.getCode())){
+ accetType = EStockType.US.getCode();
}*/
- if(accetType.equals(EStockType.US.getCode()) || accetType.equals("IN")){
- accetType = EStockType.MX.getCode();
- }
QueryWrapper<UserAssets> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("accect_type",accetType);
queryWrapper.eq("user_id",userId);
@@ -75,6 +68,36 @@
}
userAssets = userAssetsMapper.selectOne(queryWrapper);
return userAssets;
+ }
+
+ @Override
+ public void addUserAssetsListByUserId(Integer userId) {
+ QueryWrapper<UserAssets> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("user_id",userId);
+ List<UserAssets> userAssetsList = userAssetsMapper.selectList(queryWrapper);
+ List<EStockType> stockTypes = Arrays.asList(
+ EStockType.US,
+ EStockType.HK,
+ EStockType.IN,
+ EStockType.TW
+ );
+ for (EStockType stockType : stockTypes) {
+ //是否存在记录
+ boolean isExist = false;
+ if (!userAssetsList.isEmpty()) {
+ boolean hasType = userAssetsList.stream()
+ .anyMatch(assets -> stockType.getCode().equals(assets.getAccectType()));
+ if (hasType) {
+ isExist = true;
+ }
+ }
+ if (!isExist) { //不存在账户新增
+ UserAssets userAssets = new UserAssets();
+ userAssets.setUserId(userId);
+ userAssets.setAccectType(stockType.getCode());
+ userAssetsMapper.insert(userAssets);
+ }
+ }
}
@Override
@@ -177,24 +200,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);
- }
+ }*/
+ UserAssets userAssets = assetsByTypeAndUserId(accetType, userId);
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())){
+ accetType = userAssets.getAccectType();
+ 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 +233,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 +249,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 +269,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 +284,7 @@
userAssets.setCumulativeProfitAndLoss(userAssets.getCumulativeProfitAndLoss().add(amount));
}
extracted(userAssets);
- }
+ }
if(null != userPosition){
userPosition.setAmountToBeCovered(userAssets.getAmountToBeCovered().add(userAssets.getHandlingChargeWritten()));
@@ -263,8 +295,8 @@
moneyLog.setDescs(eUserAssets.getDesc());
moneyLog.setBeFore(before);
moneyLog.setAfter(after);
- moneyLog.setAmount(amount.toString());
- moneyLog.setAccectType(accectType);
+ moneyLog.setAmount(amountLog.toString());
+ moneyLog.setAccectType(accetType);
moneyLog.setType(eUserAssets.getCode());
moneyLog.setUserId(userId+"");
moneyLog.setSymbol(EStockType.getEStockTypeByCode(accetType).getSymbol());
@@ -305,26 +337,28 @@
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);
- }
+ }*/
+ UserAssets userAssets = assetsByTypeAndUserId(accetType, userId);
String before = userAssets.getAvailableBalance().toString();
if (eUserAssets.getCode().equals(EUserAssets.BUY_AI.getCode())) {
//冻结金额
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 +369,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);
@@ -357,15 +394,16 @@
}
@Override
- public BigDecimal exchangeAmountByRate(String accetType, BigDecimal amount) throws Exception {
- EStockType stockType = EStockType.getEStockTypeByCode(accetType);
+ public BigDecimal exchangeAmountByRate(String fromType, String toType, BigDecimal amount) throws Exception {
+ EStockType stockType = EStockType.getEStockTypeByCode(fromType);
+ EStockType toStockType = EStockType.getEStockTypeByCode(toType);
ExchangeRate exchangeRate = exchangeRateRepository.findExchangeRateByCurrencyAndConversionCurrency(
- stockType.getSymbol(), EStockType.MX.getSymbol()).orElse(null);
+ stockType.getSymbol(), toStockType.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(), toStockType.getSymbol());
throw new Exception("货币转换汇率未设置");
}
--
Gitblit v1.9.3