From fff9ac550c469aafa60ce8f1adff5edd6941f8e1 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Wed, 14 Jan 2026 15:29:01 +0800
Subject: [PATCH] 获取盘前交易列表
---
src/main/java/com/nq/service/impl/UserAssetsServices.java | 34 +++++++++++++++++++++-------------
1 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/UserAssetsServices.java b/src/main/java/com/nq/service/impl/UserAssetsServices.java
index eb2f2f3..975cc10 100644
--- a/src/main/java/com/nq/service/impl/UserAssetsServices.java
+++ b/src/main/java/com/nq/service/impl/UserAssetsServices.java
@@ -77,9 +77,7 @@
List<UserAssets> userAssetsList = userAssetsMapper.selectList(queryWrapper);
List<EStockType> stockTypes = Arrays.asList(
EStockType.US,
- EStockType.HK,
- EStockType.IN,
- EStockType.TW
+ EStockType.JP
);
for (EStockType stockType : stockTypes) {
//是否存在记录
@@ -103,7 +101,7 @@
@Override
public ServerResponse updateUserAssets(Integer id, String amt,String type, String accectType) {
UserAssets userAssets = userAssetsMapper.selectById(id);
- UserPosition userPosition = userPositionMapper.selectOne(new LambdaQueryWrapper<UserPosition>().gt(UserPosition::getAmountToBeCovered, BigDecimal.ZERO).eq(UserPosition::getUserId,userAssets.getUserId()));
+ //UserPosition userPosition = userPositionMapper.selectOne(new LambdaQueryWrapper<UserPosition>().gt(UserPosition::getAmountToBeCovered, BigDecimal.ZERO).eq(UserPosition::getUserId,userAssets.getUserId()));
// 0 入款 1是扣钱 2 是充值 3 是提币
BigDecimal bigAmt = new BigDecimal(amt);
if(type.equals("0") || type.equals("1")){
@@ -134,10 +132,10 @@
}else{
userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(bigAmt));
}
- if(null != userPosition){
+ /*if(null != userPosition){
userPosition.setAmountToBeCovered(userAssets.getAmountToBeCovered().add(userAssets.getHandlingChargeWritten()));
userPositionMapper.updateById(userPosition);
- }
+ }*/
}else{
if(userAssets.getAvailableBalance().compareTo(BigDecimal.ZERO) <= 0){
return ServerResponse.createByErrorMsg("客户账户余额为0");
@@ -146,9 +144,9 @@
}
userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(bigAmt));
}
- if(null != userPosition){
+ /*if(null != userPosition){
userPositionMapper.updateById(userPosition);
- }
+ }*/
if( userAssetsMapper.updateById(userAssets)>0){
// saveUserRecharge(userAssets.getUserId(),bigAmt);
return ServerResponse.createBySuccess();
@@ -212,7 +210,7 @@
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()));
+ //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();
accetType = userAssets.getAccectType();
@@ -322,12 +320,22 @@
userAssets.setCumulativeProfitAndLoss(userAssets.getCumulativeProfitAndLoss().add(amount));
}
extracted(userAssets);
+ }else if(Objects.equals(eUserAssets.getCode(), EUserAssets.PENDING_ORDER_FREEZE.getCode())){
+ // 挂单冻结资金：从可用余额转到冻结金额
+ // amount 是负数，表示扣除
+ userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(amount));
+ userAssets.setFreezeMoney(userAssets.getFreezeMoney().add(amount.negate()));
+ }else if(Objects.equals(eUserAssets.getCode(), EUserAssets.PENDING_ORDER_UNFREEZE.getCode())){
+ // 取消挂单解冻资金：从冻结金额转回可用余额
+ // amount 是正数，表示增加
+ userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(amount));
+ userAssets.setFreezeMoney(userAssets.getFreezeMoney().subtract(amount));
}
- if(null != userPosition){
+ /*if(null != userPosition){
userPosition.setAmountToBeCovered(userAssets.getAmountToBeCovered().add(userAssets.getHandlingChargeWritten()));
userPositionMapper.updateById(userPosition);
- }
+ }*/
String after = userAssets.getAvailableBalance().toString();
MoneyLog moneyLog = new MoneyLog();
moneyLog.setDescs(eUserAssets.getDesc());
@@ -433,8 +441,8 @@
@Override
public BigDecimal exchangeAmountByRate(String fromType, String toType, BigDecimal amount) throws Exception {
- EStockType stockType = EStockType.getEStockTypeByCode(fromType);
- EStockType toStockType = EStockType.getEStockTypeByCode(toType);
+ EStockType stockType = EStockType.getEStockTypeBySymbol(fromType);
+ EStockType toStockType = EStockType.getEStockTypeBySymbol(toType);
ExchangeRate exchangeRate = exchangeRateRepository.findExchangeRateByCurrencyAndConversionCurrency(
stockType.getSymbol(), toStockType.getSymbol()).orElse(null);
if (exchangeRate != null) {
--
Gitblit v1.9.3