From 88db0094dae7ed1b4be1ee11194b1aef6e5d69c9 Mon Sep 17 00:00:00 2001
From: dd <gitluke@outlook.com>
Date: Tue, 10 Feb 2026 10:25:15 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/service/impl/UserServiceImpl.java | 65 ++++++++++++++++----------------
1 files changed, 33 insertions(+), 32 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/UserServiceImpl.java b/src/main/java/com/nq/service/impl/UserServiceImpl.java
index 845d3f8..81243c9 100644
--- a/src/main/java/com/nq/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserServiceImpl.java
@@ -189,7 +189,6 @@
user.setRegAddress(uadd);
user.setIsLogin(Integer.valueOf(0));
-
int insertCount = this.userMapper.insert(user);
if (insertCount > 0) {
@@ -210,7 +209,7 @@
if (user.getIsLogin().intValue() == 1) {
return ServerResponse.createByErrorMsg("登录失败。账户锁定",request);
}
- userAssetsServices.assetsByTypeAndUserId(EStockType.IN.getCode(),user.getId());
+ userAssetsServices.assetsByTypeAndUserId(EStockType.JP.getCode(),user.getId());
this.iSiteLoginLogService.saveLog(user, request);
return ServerResponse.createBySuccess(user);
}
@@ -320,7 +319,7 @@
}
public String leverSplit(String lever){
- String levers = "1/2/5/10";
+ String levers = "1/2/4/6/10";
String[] parts = levers.split("/");
int index = Arrays.asList(parts).indexOf(lever);
if (index != -1) {
@@ -479,7 +478,7 @@
public ServerResponse getMoney(Integer userId) {
List<UserAssets> userAssetsList = userAssetsServices.assetsByUserId(userId);
List<RUserAssets> rUserAssetsList = new ArrayList<>();
- int s= 4;
+ int s= 2;
/**
* 浮动盈亏
* */
@@ -508,24 +507,26 @@
RUserAssets rUserAssets = new RUserAssets();
UserAssets userAssets = userAssetsList.get(i);
// 浮动盈亏
- BigDecimal profitAndLose = userAssets.getProfitAndLoss();
+ String profitAndLose = getProfitAndLose(userId).setScale(s,RoundingMode.UP).toString();
BigDecimal amt = userAssets.getAvailableBalance();
- BigDecimal totalAssets = userAssets.getAvailableBalance().add(userAssets.getFreezeMoney());
+ 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);
BigDecimal freeMoney = userAssets.getFreezeMoney();
BigDecimal hMoney = userAssets.getHandlingCharge();
BigDecimal hProfitAndLose = userAssets.getCumulativeProfitAndLoss();
rUserAssets.setId(userAssets.getId());
- rUserAssets.setTotalMoney((totalAssets.toString()));
+ rUserAssets.setTotalMoney((totalAssets.setScale(s,RoundingMode.UP).toString()));
rUserAssets.setAccectType(userAssets.getAccectType());
- rUserAssets.setAvailableBalance(amt.toString());
- rUserAssets.setFreezeMoney(freeMoney.toString());
- rUserAssets.setCumulativeProfitAndLoss(hProfitAndLose.toString());
- rUserAssets.setHandlingCharge(hMoney.toString());
- rUserAssets.setProfitAndLoss(profitAndLose.toString());
+ rUserAssets.setAvailableBalance(amt.setScale(s,RoundingMode.UP).toString());
+ rUserAssets.setFreezeMoney(freeMoney.setScale(s,RoundingMode.UP).toString());
+ rUserAssets.setCumulativeProfitAndLoss(hProfitAndLose.setScale(s,RoundingMode.UP).toString());
+ rUserAssets.setHandlingCharge(hMoney.setScale(s, RoundingMode.UP).toString());
+ rUserAssets.setProfitAndLoss(profitAndLose);
rUserAssets.setIsZf(userAssets.getIsZf());
- rUserAssets.setAmountToBeCovered((userAssets.getAmountToBeCovered().add(userAssets.getHandlingChargeWritten()).toString()));
+ rUserAssets.setAmountToBeCovered((userAssets.getAmountToBeCovered().add(userAssets.getHandlingChargeWritten())).setScale(s, RoundingMode.UP).toString());
+ rUserAssets.setHandlingChargeWritten(userAssets.getHandlingChargeWritten().setScale(s, RoundingMode.UP));
BigDecimal rate = rateServices.currencyRate(
- EStockType.getEStockTypeByCode(userAssets.getAccectType()),EStockType.US);
+ EStockType.getEStockTypeByCode(userAssets.getAccectType()),EStockType.JP);
BigDecimal availableBalanceUSD = amt;
if(amt.compareTo(BigDecimal.ZERO)>0){
@@ -539,7 +540,7 @@
BigDecimal totleMoneyUSD = totalAssets;
if(totalAssets.compareTo(BigDecimal.ZERO)>0){
- totleMoneyUSD = totleMoneyUSD.multiply(rate).subtract(new BigDecimal(rUserAssets.getHandlingCharge()));
+ totleMoneyUSD = totleMoneyUSD.multiply(rate);
}
BigDecimal cumulativeProfitAndLossUSD = hProfitAndLose;
@@ -551,24 +552,24 @@
if(hMoney.compareTo(BigDecimal.ZERO)>0){
handlingChargeUSD =hMoney.multiply(rate);
}
- BigDecimal profitAndLossUSD = profitAndLose;
- if(profitAndLose.compareTo(BigDecimal.ZERO)>0){
- profitAndLossUSD =profitAndLose.multiply(rate);
+ BigDecimal profitAndLossUSD = new BigDecimal(profitAndLose);
+ if(new BigDecimal(profitAndLose).compareTo(BigDecimal.ZERO)>0){
+ profitAndLossUSD =new BigDecimal(profitAndLose).multiply(rate);
}
- rUserAssets.setAvailableBalanceUSD(availableBalanceUSD.setScale(s,BigDecimal.ROUND_UP).toString());
- rUserAssets.setFreezeMoneyUSD(freezeMoneyUSD.setScale(s,BigDecimal.ROUND_UP).toString());
- rUserAssets.setTotalMoneyUSD(totleMoneyUSD.setScale(s,BigDecimal.ROUND_UP).toString());
+ rUserAssets.setAvailableBalanceUSD(availableBalanceUSD.setScale(s,RoundingMode.UP).toString());
+ rUserAssets.setFreezeMoneyUSD(freezeMoneyUSD.setScale(s,RoundingMode.UP).toString());
+ rUserAssets.setTotalMoneyUSD(totleMoneyUSD.setScale(s,RoundingMode.UP).toString());
rUserAssets.setSymbol(EStockType.getEStockTypeByCode(userAssets.getAccectType()).getSymbol1());
rUserAssets.setSymbolCode(EStockType.getEStockTypeByCode(userAssets.getAccectType()).getSymbol());
- rUserAssets.setCumulativeProfitAndLossUSD(cumulativeProfitAndLossUSD.setScale(s,BigDecimal.ROUND_UP).toString());
- rUserAssets.setHandlingChargeUSD(handlingChargeUSD.setScale(s,BigDecimal.ROUND_UP).toString());
- rUserAssets.setProfitAndLossUSD(profitAndLossUSD.setScale(s,BigDecimal.ROUND_UP).toString());
- rUserAssets.setProfitAndLoss(getProfitAndLose(userId).toString());
- BigDecimal decimal = new BigDecimal(rUserAssets.getTotalMoney()).add(new BigDecimal(rUserAssets.getProfitAndLoss()));
- rUserAssets.setTotalMoney(decimal.toString());
+ rUserAssets.setCumulativeProfitAndLossUSD(cumulativeProfitAndLossUSD.setScale(s,RoundingMode.UP).toString());
+ rUserAssets.setHandlingChargeUSD(handlingChargeUSD.setScale(s,RoundingMode.UP).toString());
+ rUserAssets.setProfitAndLossUSD(profitAndLossUSD.setScale(s,RoundingMode.UP).toString());
+ rUserAssets.setProfitAndLoss(profitAndLose);
+// BigDecimal decimal = new BigDecimal(rUserAssets.getTotalMoney()).add(new BigDecimal(rUserAssets.getProfitAndLoss()));
+// rUserAssets.setTotalMoney(decimal.toString());
AllProfitAndLose = AllProfitAndLose.add(profitAndLossUSD);
allTotalAssets = allTotalAssets.add(totleMoneyUSD);
allAmt = allAmt.add(availableBalanceUSD);
@@ -611,7 +612,7 @@
userPositions = userPositionMapper.
findMyPositionByCodeAndSpell(userId,
"","",
- 0, "IN");
+ 0, "JP");
List<UserPositionVO> userPositionVOS = Lists.newArrayList();
@@ -768,7 +769,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 -> "JP".equals(stock.getAccectType()))
.findFirst()
.orElse(null);
@@ -826,8 +827,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.JP.getCode(),dbUser.getId() );
+ userAssetsServices.availablebalanceChange(EStockType.JP.getCode(),dbUser.getId(),EUserAssets.TOP_UP,new BigDecimal(amt),"","");
if (insertCount > 0) {
return ServerResponse.createBySuccessMsg("Success");
}
@@ -852,7 +853,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 -> "JP".equals(stock.getAccectType()))
.findFirst()
.orElse(null);
--
Gitblit v1.9.3