From c51c656bb90a3b6b644a688d3b7bffc8cdf48379 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Wed, 13 Aug 2025 15:43:05 +0800
Subject: [PATCH] app充值列表,提现修改
---
src/main/java/com/nq/service/impl/UserAssetsServices.java | 59 ++++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 46 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 88dbd31..c9b49e0 100644
--- a/src/main/java/com/nq/service/impl/UserAssetsServices.java
+++ b/src/main/java/com/nq/service/impl/UserAssetsServices.java
@@ -17,6 +17,7 @@
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.math.RoundingMode;
+import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.Objects;
@@ -52,9 +53,9 @@
@Override
public UserAssets assetsByTypeAndUserId(String accetType, Integer userId) {
- if(!accetType.equals(EStockType.US.getCode())){
+ /*if(!accetType.equals(EStockType.US.getCode())){
accetType = EStockType.US.getCode();
- }
+ }*/
QueryWrapper<UserAssets> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("accect_type",accetType);
queryWrapper.eq("user_id",userId);
@@ -70,7 +71,37 @@
}
@Override
- public ServerResponse updateUserAssets(Integer id, String amt,String type) {
+ 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
+ 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()));
// 0 入款 1是扣钱 2 是充值 3 是提币
@@ -121,7 +152,7 @@
}
}else{
if(type.equals("2")){
- return userRechargeService.createOrder(userAssets.getUserId(),1,bigAmt.intValue(),"1");
+ return userRechargeService.createOrder(userAssets.getUserId(),1,bigAmt.intValue(),"1", accectType);
}else{
return ServerResponse.createBySuccess();
}
@@ -170,12 +201,12 @@
@Override
public Boolean availablebalanceChange(String accetType, Integer userId, EUserAssets eUserAssets, BigDecimal amount, String desc, String descType) throws Exception {
//查询账户
- UserAssets userAssets = assetsByTypeAndUserId(EStockType.getDefault().getCode(), userId);
+ /*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();
@@ -307,11 +338,12 @@
public Boolean aiAvailableBalanceChange(String accetType, Integer userId, EUserAssets eUserAssets, BigDecimal amount) throws Exception {
//查询账户
- UserAssets userAssets = assetsByTypeAndUserId(EStockType.getDefault().getCode(), userId);
+ /*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())) {
//冻结金额
@@ -362,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.getDefault().getSymbol()).orElse(null);
+ stockType.getSymbol(), toStockType.getSymbol()).orElse(null);
if (exchangeRate != null) {
//转换为默认货币 保留5位小数
return amount.multiply(exchangeRate.getRata()).setScale(5, RoundingMode.HALF_UP);
} else {
- log.error("exchangeAmountByRate is null:{}>>{}", stockType.getSymbol(), EStockType.getDefault().getSymbol());
+ log.error("exchangeAmountByRate is null:{}>>{}", stockType.getSymbol(), toStockType.getSymbol());
throw new Exception("货币转换汇率未设置");
}
--
Gitblit v1.9.3