From ec72fc1827d3e46a99d302dd3c9ca61411c70943 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Thu, 24 Jul 2025 14:41:25 +0800
Subject: [PATCH] 修改

---
 src/main/java/com/nq/service/impl/EchoServices.java |   25 +++++++++++++++++--------
 1 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/nq/service/impl/EchoServices.java b/src/main/java/com/nq/service/impl/EchoServices.java
index 972ddc6..73d09fb 100644
--- a/src/main/java/com/nq/service/impl/EchoServices.java
+++ b/src/main/java/com/nq/service/impl/EchoServices.java
@@ -7,7 +7,6 @@
 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;
@@ -21,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
@@ -36,9 +37,6 @@
     IUserService iUserService;
 
     @Autowired
-    private UserAssetsServices serAssetsServices;
-
-    @Autowired
     private UserAssetsMapper userAssetsMapper;
 
     @Autowired
@@ -50,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);
 
@@ -77,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));
@@ -102,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);
@@ -120,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;
@@ -154,7 +164,6 @@
             log.error("基金定时任务---失败: ", ex);
         }
     }
-
 
     @Override
     public int insertEcho(EChoBean eChoBean) {

--
Gitblit v1.9.3