From f25b39e0d5fcae415a8824fc03d42fe681e96bf8 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Mon, 21 Jul 2025 17:17:48 +0800
Subject: [PATCH] 移除多余引用
---
src/main/java/com/nq/service/impl/EchoServices.java | 32 +++++++++++++++++++++++++-------
1 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/EchoServices.java b/src/main/java/com/nq/service/impl/EchoServices.java
index 8ef961d..73d09fb 100644
--- a/src/main/java/com/nq/service/impl/EchoServices.java
+++ b/src/main/java/com/nq/service/impl/EchoServices.java
@@ -5,8 +5,8 @@
import com.nq.dao.EChoMapper;
import com.nq.dao.OrderEchoMapper;
import com.nq.dao.UserAssetsMapper;
+import com.nq.dao.UserPositionMapper;
import com.nq.enums.EStockType;
-import com.nq.enums.EUserAssets;
import com.nq.pojo.*;
import com.nq.pojo.reponse.OrderEChoReponse;
import com.nq.service.IEchoServices;
@@ -20,6 +20,8 @@
import java.math.RoundingMode;
import java.util.ArrayList;
import java.util.List;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
@Slf4j
@Service
@@ -35,10 +37,10 @@
IUserService iUserService;
@Autowired
- private UserAssetsServices serAssetsServices;
+ private UserAssetsMapper userAssetsMapper;
@Autowired
- private UserAssetsMapper userAssetsMapper;
+ private UserPositionMapper userPositionMapper;
@Override
public List<EChoBean> queryList() {
@@ -46,7 +48,7 @@
}
@Override
- public boolean buyECho(String eId, BigDecimal money, HttpServletRequest request) {
+ public boolean buyECho(String eId, BigDecimal money, String accectType, HttpServletRequest request) {
User user = this.iUserService.getCurrentRefreshUser(request);
@@ -73,7 +75,7 @@
UserAssets userAssets = userAssetsMapper.selectOne(new LambdaQueryWrapper<UserAssets>()
.eq(UserAssets::getUserId, orderEchoBean.getUserId())
- .eq(UserAssets::getAccectType, "IN")
+ .eq(UserAssets::getAccectType, accectType)
);
userAssets.setAvailableBalance(userAssets.getAvailableBalance().subtract(money));
userAssets.setFreezeMoney(userAssets.getFreezeMoney().add(money));
@@ -98,6 +100,18 @@
@Override
public void sendMoney() {
+ // 创建固定大小的线程池，根据需求调整线程数量
+ ExecutorService executor = Executors.newFixedThreadPool(2);
+ try {
+ executor.submit(() -> sendMoney(EStockType.US.getCode()));
+ executor.submit(() -> sendMoney(EStockType.MX.getCode()));
+ } finally {
+ // 关闭线程池
+ executor.shutdown();
+ }
+ }
+
+ private void sendMoney(String stockType) {
try {
QueryWrapper<OrderEchoBean> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("state", 1);
@@ -116,7 +130,7 @@
BigDecimal aml = incomeAmount.add(money);
UserAssets userAssets = userAssetsMapper.selectOne(new LambdaQueryWrapper<UserAssets>()
.eq(UserAssets::getUserId, orderEchoBean.getUserId())
- .eq(UserAssets::getAccectType, "IN")
+ .eq(UserAssets::getAccectType, stockType)
);
if (userAssets.getAmountToBeCovered().compareTo(BigDecimal.ZERO) > 0) {
continue;
@@ -132,6 +146,11 @@
} else {
userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(aml));
}
+ UserPosition userPosition = userPositionMapper.selectOne(new LambdaQueryWrapper<UserPosition>().gt(UserPosition::getAmountToBeCovered, BigDecimal.ZERO).eq(UserPosition::getUserId,userAssets.getUserId()));
+ if(null != userPosition){
+ userPosition.setAmountToBeCovered(userAssets.getAmountToBeCovered());
+ userPositionMapper.updateById(userPosition);
+ }
userAssets.setFreezeMoney(userAssets.getFreezeMoney().subtract(money));
userAssetsMapper.updateById(userAssets);
orderEchoBean.setState("2");
@@ -145,7 +164,6 @@
log.error("基金定时任务---失败: ", ex);
}
}
-
@Override
public int insertEcho(EChoBean eChoBean) {
--
Gitblit v1.9.3