From bfcbef7a6bf2eb73bbf7ae84dac49a8f49db1e1c Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Tue, 08 Jul 2025 14:49:45 +0800
Subject: [PATCH] 修改股票类型
---
src/main/java/com/nq/service/impl/UserAssetsServices.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/UserAssetsServices.java b/src/main/java/com/nq/service/impl/UserAssetsServices.java
index 239a16e..3a5b5e1 100644
--- a/src/main/java/com/nq/service/impl/UserAssetsServices.java
+++ b/src/main/java/com/nq/service/impl/UserAssetsServices.java
@@ -10,6 +10,7 @@
import com.nq.pojo.*;
import com.nq.service.IUserAssetsServices;
import com.nq.utils.KeyUtils;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -23,6 +24,7 @@
/**
* 用户资产
*/
+@Slf4j
@Service
public class UserAssetsServices implements IUserAssetsServices {
@@ -49,8 +51,11 @@
@Override
public UserAssets assetsByTypeAndUserId(String accetType, Integer userId) {
- if(accetType.equals("SZHB")){
+ /*if(accetType.equals("SZHB")){
accetType = "US";
+ }*/
+ if(accetType.equals(EStockType.US.getCode()) || accetType.equals("IN")){
+ accetType = EStockType.MX.getCode();
}
QueryWrapper<UserAssets> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("accect_type",accetType);
@@ -167,7 +172,7 @@
@Override
public Boolean availablebalanceChange(String accetType, Integer userId, EUserAssets eUserAssets, BigDecimal amount, String desc, String descType) {
- UserAssets userAssets = assetsByTypeAndUserId(accetType,userId);
+ 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();
@@ -205,13 +210,13 @@
availableBalance = availableBalance.subtract(userAssets.getHandlingChargeWritten());
if(availableBalance.compareTo(BigDecimal.ZERO) >= 0){
userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(availableBalance));
- userAssets.setFreezeMoney(userAssets.getFreezeMoney().add(userAssets.getAmountToBeCovered()).add(userAssets.getHandlingCharge()));
+ userAssets.setFreezeMoney(userAssets.getFreezeMoney().add(userAssets.getAmountToBeCovered()));
userAssets.setAmountToBeCovered(BigDecimal.ZERO);
userAssets.setHandlingChargeWritten(BigDecimal.ZERO);
}else{
- BigDecimal amountToBeCovered = userAssets.getAmountToBeCovered().subtract(amount);
userAssets.setFreezeMoney(userAssets.getFreezeMoney().add(amount));
- userAssets.setAmountToBeCovered(amountToBeCovered);
+ userAssets.setHandlingChargeWritten(BigDecimal.ZERO);
+ userAssets.setAmountToBeCovered(availableBalance.negate());
}
}else{
userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(amount));
@@ -239,7 +244,7 @@
}
if(null != userPosition){
- userPosition.setAmountToBeCovered(userAssets.getAmountToBeCovered());
+ userPosition.setAmountToBeCovered(userAssets.getAmountToBeCovered().add(userAssets.getHandlingChargeWritten()));
userPositionMapper.updateById(userPosition);
}
String after = userAssets.getAvailableBalance().toString();
--
Gitblit v1.9.3