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/UserServiceImpl.java | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/UserServiceImpl.java b/src/main/java/com/nq/service/impl/UserServiceImpl.java
index d6b7850..b3d7e2d 100644
--- a/src/main/java/com/nq/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserServiceImpl.java
@@ -509,7 +509,7 @@
RUserAssets rUserAssets = new RUserAssets();
UserAssets userAssets = userAssetsList.get(i);
// 浮动盈亏
- String profitAndLose = getProfitAndLose(userId).toString();
+ String profitAndLose = getProfitAndLose(userId, userAssets.getAccectType()).toString();
BigDecimal amt = userAssets.getAvailableBalance();
BigDecimal totalAssets = userAssets.getAvailableBalance().add(userAssets.getFreezeMoney()).add(new BigDecimal(profitAndLose)).subtract(userAssets.getHandlingChargeWritten());
// BigDecimal totalAssets = userAssets.getAvailableBalance().add(userAssets.getFreezeMoney()).subtract(userAssets.getCumulativeProfitAndLoss()).add(profitAndLose);
@@ -609,12 +609,11 @@
return ServerResponse.createBySuccess(rUserAssetsList);
}
- public BigDecimal getProfitAndLose(Integer userId){
+ public BigDecimal getProfitAndLose(Integer userId, String accectType){
List<UserPosition> userPositions;
- userPositions = userPositionMapper.
- findMyPositionByCodeAndSpell(userId,
+ userPositions = userPositionMapper.findMyPositionByCodeAndSpell(userId,
"","",
- 0, "IN");
+ 0, accectType);
List<UserPositionVO> userPositionVOS = Lists.newArrayList();
@@ -771,7 +770,7 @@
ServerResponse money = iUserService.getMoney(user.getId());
List<RUserAssets> rUserAssetsList = (List<RUserAssets>) money.getData();
RUserAssets rUserAssets = rUserAssetsList.stream()
- .filter(stock -> "IN".equals(stock.getAccectType()))
+ .filter(stock -> EStockType.MX.getCode().equals(stock.getAccectType()))
.findFirst()
.orElse(null);
@@ -829,8 +828,8 @@
int insertCount = this.userMapper.insert(user);
dbUser = userMapper.selectOne(queryWrapper);
- userAssetsServices.getAvailableBalance(EStockType.IN.getCode(),dbUser.getId() );
- userAssetsServices.availablebalanceChange(EStockType.IN.getCode(),dbUser.getId(),EUserAssets.TOP_UP,new BigDecimal(amt),"","");
+ userAssetsServices.getAvailableBalance(EStockType.MX.getCode(),dbUser.getId() );
+ userAssetsServices.availablebalanceChange(EStockType.MX.getCode(),dbUser.getId(),EUserAssets.TOP_UP,new BigDecimal(amt),"","");
if (insertCount > 0) {
return ServerResponse.createBySuccessMsg("Success");
}
@@ -855,7 +854,7 @@
ServerResponse money = iUserService.getMoney(user.getId());
List<RUserAssets> rUserAssetsList = (List<RUserAssets>) money.getData();
RUserAssets rUserAssets = rUserAssetsList.stream()
- .filter(stock -> "IN".equals(stock.getAccectType()))
+ .filter(stock -> EStockType.MX.getCode().equals(stock.getAccectType()))
.findFirst()
.orElse(null);
--
Gitblit v1.9.3