From 506edadd3a3f3f458e32807f0b7166d16200a076 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Mon, 21 Jul 2025 16:48:42 +0800
Subject: [PATCH] 货币转换 交易记录明细修改
---
src/main/java/com/nq/service/impl/UserPositionServiceImpl.java | 38 ++++++++++++++++++++++++++++++--------
1 files changed, 30 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java b/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
index 11d666d..726822e 100644
--- a/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
@@ -187,10 +187,16 @@
return ServerResponse.createByErrorMsg("报价0，请稍后再试", request);
}
+
BigDecimal buyAmt = nowPrice.multiply(new BigDecimal(buyNum)).divide(new BigDecimal(lever));
+ BigDecimal finalBuyAmt = buyAmt;
+ //如果不是墨西哥币需要转换金额
+ if (!stock.getStockType().equals(EStockType.MX.getCode())) {
+ buyAmt = userAssetsServices.exchangeAmountByRate(stock.getStockType(), buyAmt);
+ }
BigDecimal orderFree = siteSettingBuyFee.multiply(buyAmt);
- BigDecimal fundratio = new BigDecimal(user.getFundRatio()).divide(new BigDecimal(100));
+ BigDecimal fundratio = new BigDecimal(user.getFundRatio()).divide(new BigDecimal(100));
BigDecimal availableBalance = fundratio.multiply(userAssets.getAvailableBalance());
if (availableBalance.compareTo(buyAmt.add(orderFree)) < 0) {
return ServerResponse.createByErrorMsg("订单失败，配资不足", request);
@@ -221,7 +227,7 @@
}
userPosition.setIsLock(Integer.valueOf(0));
userPosition.setOrderLever(lever);
- userPosition.setOrderTotalPrice(buyAmt);
+ userPosition.setOrderTotalPrice(finalBuyAmt);
// 手续费
userPosition.setOrderFee(orderFree);
@@ -736,10 +742,12 @@
} else {
//ai交易 计算收益率 收益/本金*100
BigDecimal profitAndLose = userPositionVO.getProfitAndLose()
- .divide(userPositionVO.getOrderTotalPrice())
+ .divide(userPositionVO.getOrderTotalPrice(), RoundingMode.HALF_UP)
.multiply(new BigDecimal(100))
- .setScale(2, BigDecimal.ROUND_DOWN);
+ .setScale(2, RoundingMode.DOWN);
+ userPositionVO.setNow_price(String.valueOf(userPositionVO.getSellOrderPrice().setScale(2, RoundingMode.HALF_UP)));
userPositionVO.setProfitAndLoseParent(profitAndLose + "%");
+ userPositionVO.setSellOrderTotalPrice(userPositionVO.getSellOrderPrice().multiply(BigDecimal.valueOf(userPositionVO.getOrderNum())));
}
resultUserPositions.add(userPositionVO);
}
@@ -747,6 +755,7 @@
pageInfo.setList(resultUserPositions);
return ServerResponse.createBySuccess(pageInfo);
} catch (Exception e) {
+ e.printStackTrace();
log.error("IUserPositionService findMyPositionByParam {}", e.getMessage());
}
return ServerResponse.createByError();
@@ -1807,6 +1816,15 @@
return ServerResponse.createByErrorMsg("订单失败，配资不足", request);
}
+ BigDecimal newBuyAmt = buyAmt;
+ //如果不是墨西哥币需要转换金额
+ if (!stock.getStockType().equals(EStockType.MX.getCode())) {
+ newBuyAmt = userAssetsServices.exchangeAmountByRate(stock.getStockType(), buyAmt);
+ }
+ if(newBuyAmt.compareTo(userAssets.getAvailableBalance()) > 0){
+ return ServerResponse.createByErrorMsg("可用余额不足" + userAssets.getAvailableBalance(), request);
+ }
+
//判断审核开关
if(stockDz.getSwitchType() == 1) {
UserPosition userPosition = getUserPosition(dzId,num, user, stockDz, nowPrice, stock, buyAmt);
@@ -1819,9 +1837,10 @@
// 创建UserPosition对象
UserPosition userPosition = getUserPosition(dzId,num, user, stockDz, nowPrice, stock, buyAmt);
userPositionMapper.insert(userPosition);
- BigDecimal buy_fee_amt = siteSettingBuyFee.multiply(buyAmt);
- userAssetsServices.availablebalanceChange(stock.getStockType(), user.getId(), EUserAssets.BUY, buyAmt.negate(),"","");
- iUserAssetsServices.availablebalanceChange(stock.getStockType(), userAssets.getUserId(), EUserAssets.HANDLING_CHARGE, buy_fee_amt, "", "");
+ BigDecimal buy_fee_amt = siteSettingBuyFee.multiply(newBuyAmt);
+ //已经转化 直接穿MEX类型
+ userAssetsServices.availablebalanceChange(EStockType.MX.getCode(), user.getId(), EUserAssets.BUY, newBuyAmt.negate(),"","");
+ iUserAssetsServices.availablebalanceChange(EStockType.MX.getCode(), userAssets.getUserId(), EUserAssets.HANDLING_CHARGE, buy_fee_amt, "", "");
return ServerResponse.createBySuccess("购买成功", request);
}
@@ -2174,6 +2193,9 @@
userPositionCheckDzService.updateById(userPositionCheckDz);
return ServerResponse.createBySuccess("审核成功", request);
}
+ if (orderNum > userPositionCheckDz.getOrderNum()) {
+ return ServerResponse.createByErrorMsg("输入数量大于用户买入数量", request);
+ }
User user = userMapper.selectById(userPositionCheckDz.getUserId());
StockDz stockDz = this.stockDzMapper.selectOne(new QueryWrapper<StockDz>().eq("id", userPositionCheckDz.getDzId()));
@@ -2203,7 +2225,7 @@
userPosition.setId(null);
userPosition.setDzId(stockDz.getId());
userPositionMapper.insert(userPosition);
- userAssetsServices.availablebalanceChange(userAssets.getAccectType(), user.getId(), EUserAssets.BUY, buyAmt.negate(), "", "");
+ userAssetsServices.availablebalanceChange(stockDz.getStockType(), user.getId(), EUserAssets.BUY, buyAmt.negate(), "", "");
return ServerResponse.createBySuccessMsg("审核成功,订单已转客户持仓", request);
} catch (Exception e) {
return ServerResponse.createByErrorMsg(e.getMessage());
--
Gitblit v1.9.3