From c8b031a405ebd2b450f5098bb37e5e63390f364c Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Fri, 18 Jul 2025 09:57:31 +0800
Subject: [PATCH] 新增贷款，优化
---
src/main/java/com/nq/service/impl/StockAiServiceImpl.java | 73 ++++++++++--------------------------
1 files changed, 20 insertions(+), 53 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/StockAiServiceImpl.java b/src/main/java/com/nq/service/impl/StockAiServiceImpl.java
index b8d869b..f184062 100644
--- a/src/main/java/com/nq/service/impl/StockAiServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/StockAiServiceImpl.java
@@ -25,7 +25,6 @@
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
-import java.util.Objects;
import java.util.concurrent.ConcurrentHashMap;
@Service("iStockAiService")
@@ -74,33 +73,33 @@
* @return
*/
@Override
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
public ServerResponse buyStockAi(Long id, BigDecimal buyNum, HttpServletRequest request) {
try {
User user = iUserService.getCurrentUser(request);
if (user == null ){
- return ServerResponse.createByErrorCodeMsg(ResponseCode.NEED_LOGIN.getCode(),"请先登录");
+ return ServerResponse.createByErrorCodeMsg(ResponseCode.NEED_LOGIN.getCode(),"请先登录", request);
}
Object lock = locks.computeIfAbsent(Long.valueOf(user.getId()), k -> new Object());
synchronized (lock){
SiteProduct siteProduct = iSiteProductService.getProductSetting();
if (siteProduct.getRealNameDisplay() && user.getIsActive() != 2) {
- return ServerResponse.createByErrorMsg("订单失败，请先实名认证");
+ return ServerResponse.createByErrorMsg("订单失败，请先实名认证", request);
}
if (siteProduct.getRealNameDisplay() && user.getIsLock().intValue() == 1) {
- return ServerResponse.createByErrorMsg("订单失败，帐户已被锁定");
+ return ServerResponse.createByErrorMsg("订单失败，帐户已被锁定", request);
}
StockAI stockAI = stockAiMapper.selectById(id);
if (stockAI == null) {
- return ServerResponse.createByErrorMsg("订单失败，AI股票不存在");
+ return ServerResponse.createByErrorMsg("订单失败，AI股票不存在", request);
}
if (!stockAI.getStatus().equals(EStockAIStatus.online.getValue())) {
- return ServerResponse.createByErrorMsg("订单失败，AI股票已下架");
+ return ServerResponse.createByErrorMsg("订单失败，AI股票已下架", request);
}
if(buyNum.compareTo(stockAI.getMinPrice()) < 0){
- return ServerResponse.createByErrorMsg("最低购买数量" + stockAI.getMinPrice());
+ return ServerResponse.createByErrorMsg("最低购买数量" + stockAI.getMinPrice(), request);
}
//获取用户账户
UserAssets userAssets = iUserAssetsServices.assetsByTypeAndUserId(EStockType.MX.getCode(), user.getId());
@@ -118,17 +117,13 @@
buyNum = iUserAssetsServices.exchangeAmountByRate(buyNum, exchangeRate.getRata());
}*/
if(buyNum.compareTo(userAssets.getAvailableBalance()) > 0){
- return ServerResponse.createByErrorMsg("可用余额不足" + userAssets.getAvailableBalance());
+ return ServerResponse.createByErrorMsg("可用余额不足" + userAssets.getAvailableBalance(), request);
}
if(userAssets.getAmountToBeCovered().compareTo(BigDecimal.ZERO) > 0){
- return ServerResponse.createByErrorMsg("请先缴清待补资金");
+ return ServerResponse.createByErrorMsg("请先缴清待补资金", request);
}
-
- Boolean flag = iUserAssetsServices.aiAvailableBalanceChange(stockAI.getStockType(), user.getId(), EUserAssets.BUY_AI, buyNum, null);
- if (!flag) {
- return ServerResponse.createByErrorMsg("扣款失败，无法转换货币");
- }
+ iUserAssetsServices.aiAvailableBalanceChange(stockAI.getStockType(), user.getId(), EUserAssets.BUY_AI, buyNum);
StockAIOrder stockAIOrder = new StockAIOrder();
stockAIOrder.setUserId(user.getId());
stockAIOrder.setStockAiId(id);
@@ -138,7 +133,7 @@
stockAIOrder.setRealEarning(BigDecimal.valueOf(0));
stockAIOrder.setStatus(EStockAIOrderStatus.wait.getStatus()); //等待审核
stockAiOrderMapper.insert(stockAIOrder);
- return ServerResponse.createBySuccessMsg("下单成功");
+ return ServerResponse.createBySuccessMsg("下单成功", request);
}
} catch (Exception e) {
log.error("StockAiService buyStockAiList {}", e.getMessage());
@@ -159,7 +154,7 @@
try {
User user = iUserService.getCurrentUser(request);
if (user == null ){
- return ServerResponse.createByErrorCodeMsg(ResponseCode.NEED_LOGIN.getCode(),"请先登录");
+ return ServerResponse.createByErrorCodeMsg(ResponseCode.NEED_LOGIN.getCode(),"请先登录", request);
}
PageHelper.startPage(pageNum, pageSize);
List<StockAiOrderTypeVO> stockAIOrders = stockAiOrderMapper.getStockAiOrderList(user.getId(), status);
@@ -228,6 +223,7 @@
}
return ServerResponse.createBySuccess("操作成功");
} catch (Exception e) {
+ e.printStackTrace();
log.error(e.getMessage(), e);
}
return ServerResponse.createByError();
@@ -275,7 +271,7 @@
@Override
public ServerResponse openPosition(StockAIOrderPosition model) {
try {
- Object lock = locks.computeIfAbsent(model.getStockAiOrderId(), k -> new Object());
+ Object lock = locks.computeIfAbsent(Long.valueOf(model.getStockAiOrderId()), k -> new Object());
synchronized (lock) {
StockAIOrder stockAIOrder = stockAiOrderMapper.selectById(model.getStockAiOrderId());
if (stockAIOrder == null) {
@@ -310,6 +306,7 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public ServerResponse orderOperation(Long id, String status) {
try {
Object lock = locks.computeIfAbsent(id, k -> new Object());
@@ -331,21 +328,7 @@
StockAI stockAI = stockAiMapper.selectById(stockAIOrder.getStockAiId());
//买入金额
BigDecimal buyNum = stockAIOrder.getBuyAmount();
- /*//如果不是墨西哥币需要转换金额
- if (!stockAI.getStockType().equals(EStockType.MX.getCode())) {
- EStockType stockType = EStockType.getEStockTypeByCode(stockAI.getStockType());
- ExchangeRate exchangeRate = exchangeRateRepository.findExchangeRateByCurrencyAndConversionCurrency(stockType.getSymbol(), EStockType.MX.getSymbol())
- .orElse(null);
- if (exchangeRate == null) {
- return ServerResponse.createByErrorMsg("请先设置当前货币汇率");
- }
- //转换为墨西哥币
- buyNum = iUserAssetsServices.exchangeAmountByRate(buyNum, exchangeRate.getRata());
- }*/
- Boolean flag = iUserAssetsServices.aiAvailableBalanceChange(stockAI.getStockType(), stockAIOrder.getUserId(), EUserAssets.BUY_AI_REJECT, buyNum, null);
- if (!flag) {
- return ServerResponse.createByErrorMsg("扣款失败，无法转换货币");
- }
+ iUserAssetsServices.aiAvailableBalanceChange(stockAI.getStockType(), stockAIOrder.getUserId(), EUserAssets.BUY_AI_REJECT, buyNum);
} else if (status.equals(EStockAIOrderStatus.finished.getStatus())) {
if (!stockAIOrder.getStatus().equals(EStockAIOrderStatus.passed.getStatus())) {
return ServerResponse.createByErrorMsg("只能结算申请通过订单");
@@ -366,26 +349,10 @@
amount = amount.add(earningsSUM);
}*/
StockAI stockAI = stockAiMapper.selectById(stockAIOrder.getStockAiId());
- //收益+本金
- BigDecimal amount = stockAIOrder.getBuyAmount().add(stockAIOrder.getRealEarning());
- //需要解冻金额
- BigDecimal buyAmount = stockAIOrder.getBuyAmount();
- /*//如果不是墨西哥币需要转换金额
- if (!stockAI.getStockType().equals(EStockType.MX.getCode())) {
- EStockType stockType = EStockType.getEStockTypeByCode(stockAI.getStockType());
- ExchangeRate exchangeRate = exchangeRateRepository.findExchangeRateByCurrencyAndConversionCurrency(stockType.getSymbol(), EStockType.MX.getSymbol())
- .orElse(null);
- if (exchangeRate == null) {
- return ServerResponse.createByErrorMsg("请先设置当前货币汇率");
- }
- //转换为墨西哥币
- amount = iUserAssetsServices.exchangeAmountByRate(amount, exchangeRate.getRata());
- buyAmount = iUserAssetsServices.exchangeAmountByRate(buyAmount, exchangeRate.getRata());
- }*/
- Boolean flag = iUserAssetsServices.aiAvailableBalanceChange(stockAI.getStockType(), stockAIOrder.getUserId(), EUserAssets.AI_SETTLEMENT, amount, buyAmount);
- if (!flag) {
- return ServerResponse.createByErrorMsg("扣款失败，无法转换货币");
- }
+ //归还本金
+ iUserAssetsServices.aiAvailableBalanceChange(stockAI.getStockType(), stockAIOrder.getUserId(), EUserAssets.AI_SETTLEMENT, stockAIOrder.getBuyAmount());
+ //收益
+ iUserAssetsServices.aiAvailableBalanceChange(stockAI.getStockType(), stockAIOrder.getUserId(), EUserAssets.AI_SETTLEMENT_INT, stockAIOrder.getRealEarning());
}
stockAIOrder.setStatus(status);
stockAIOrder.setAuditDate(new Date());
--
Gitblit v1.9.3