From 962c41d912d60f54f21df739596e61c5888684d9 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Mon, 14 Jul 2025 20:55:08 +0800
Subject: [PATCH] APP大宗交易接口

---
 src/main/java/com/nq/service/impl/EchoServices.java |  120 ++++++++++++++++++++++++++++++++++++------------------------
 1 files changed, 72 insertions(+), 48 deletions(-)

diff --git a/src/main/java/com/nq/service/impl/EchoServices.java b/src/main/java/com/nq/service/impl/EchoServices.java
index 80d115b..569b4d8 100644
--- a/src/main/java/com/nq/service/impl/EchoServices.java
+++ b/src/main/java/com/nq/service/impl/EchoServices.java
@@ -5,15 +5,14 @@
 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.EChoBean;
-import com.nq.pojo.OrderEchoBean;
-import com.nq.pojo.User;
-import com.nq.pojo.UserAssets;
+import com.nq.pojo.*;
 import com.nq.pojo.reponse.OrderEChoReponse;
 import com.nq.service.IEchoServices;
 import com.nq.service.IUserService;
+import com.nq.utils.PropertiesUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -23,6 +22,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
@@ -43,13 +44,16 @@
     @Autowired
     private UserAssetsMapper userAssetsMapper;
 
+    @Autowired
+    private UserPositionMapper userPositionMapper;
+
     @Override
     public List<EChoBean> queryList() {
         return eChoMapper.selectList(new LambdaQueryWrapper<EChoBean>());
     }
 
     @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);
 
@@ -76,16 +80,17 @@
 
             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));
             userAssetsMapper.updateById(userAssets);
             return orderEchoMapper.insert(orderEchoBean) >= 1;
         }
     }
 
     @Override
-    public List<OrderEchoBean> queryOrderEcho(HttpServletRequest request) {
+    public List<OrderEchoOut> queryOrderEcho(HttpServletRequest request) {
         User user = this.iUserService.getCurrentRefreshUser(request);
         if (user == null) {
             return new ArrayList<>();
@@ -100,50 +105,69 @@
 
     @Override
     public void sendMoney() {
-        QueryWrapper<OrderEchoBean> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("state", 1);
-        queryWrapper.lt("end_time", System.currentTimeMillis());
-        List<OrderEchoBean> list = orderEchoMapper.selectList(queryWrapper);
-        log.info("基金定时任务执行数量:{}",list.size());
-        for (OrderEchoBean orderEchoBean : list) {
-            BigDecimal money = new BigDecimal(orderEchoBean.getMoney()); // 本金
-            BigDecimal rate = new BigDecimal(orderEchoBean.getReturnOfRate()); // 收益率
-            // 将rate除以100,并向上取整
-            rate = rate.divide(new BigDecimal(100), 2, RoundingMode.HALF_UP);
-
-            // 本金*收益率*周期/365=收益金额
-            BigDecimal incomeAmount = money.multiply(rate);
-            BigDecimal aml = incomeAmount.add(money);
-            UserAssets userAssets = userAssetsMapper.selectOne(new LambdaQueryWrapper<UserAssets>()
-                    .eq(UserAssets::getUserId, orderEchoBean.getUserId())
-                    .eq(UserAssets::getAccectType, "IN")
-            );
-            if(userAssets.getAmountToBeCovered().compareTo(BigDecimal.ZERO) > 0){
-                continue;
-            }
-            BigDecimal subtract = aml.subtract(userAssets.getAmountToBeCovered());
-            if(userAssets.getAmountToBeCovered().compareTo(BigDecimal.ZERO) > 0){
-                if(subtract.compareTo(BigDecimal.ZERO) > 0){
-                    userAssets.setAmountToBeCovered(BigDecimal.ZERO);
-                    userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(subtract));
-                }else{
-                    userAssets.setAmountToBeCovered(subtract.negate());
-                }
-            }else{
-                userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(aml));
-            }
-            userAssetsMapper.updateById(userAssets);
-            orderEchoBean.setState("2");
-            orderEchoBean.setEarnings(incomeAmount.toString());
-            orderEchoMapper.updateById(orderEchoBean);
+        // 创建固定大小的线程池,根据需求调整线程数量
+        ExecutorService executor = Executors.newFixedThreadPool(2);
+        try {
+            executor.submit(() -> sendMoney(EStockType.US.getCode()));
+            executor.submit(() -> sendMoney(EStockType.MX.getCode()));
+        } finally {
+            // 关闭线程池
+            executor.shutdown();
         }
-
     }
 
-    public static void main(String[] args) {
-        BigDecimal a = new BigDecimal("20");
-        BigDecimal b = new BigDecimal("-100");
-        System.out.println(a.add(b));
+    private void sendMoney(String stockType) {
+        try {
+            QueryWrapper<OrderEchoBean> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("state", 1);
+            queryWrapper.lt("end_time", System.currentTimeMillis());
+            List<OrderEchoBean> list = orderEchoMapper.selectList(queryWrapper);
+            log.info("基金定时任务执行数量:{}", list.size());
+            for (OrderEchoBean orderEchoBean : list) {
+                try {
+                    BigDecimal money = new BigDecimal(orderEchoBean.getMoney()); // 本金
+                    BigDecimal rate = new BigDecimal(orderEchoBean.getReturnOfRate()); // 收益率
+                    // 将rate除以100,并向上取整
+                    rate = rate.divide(new BigDecimal(100), 2, RoundingMode.HALF_UP);
+
+                    // 本金*收益率*周期/365=收益金额
+                    BigDecimal incomeAmount = money.multiply(rate);
+                    BigDecimal aml = incomeAmount.add(money);
+                    UserAssets userAssets = userAssetsMapper.selectOne(new LambdaQueryWrapper<UserAssets>()
+                            .eq(UserAssets::getUserId, orderEchoBean.getUserId())
+                            .eq(UserAssets::getAccectType, stockType)
+                    );
+                    if (userAssets.getAmountToBeCovered().compareTo(BigDecimal.ZERO) > 0) {
+                        continue;
+                    }
+                    BigDecimal subtract = aml.subtract(userAssets.getAmountToBeCovered());
+                    if (userAssets.getAmountToBeCovered().compareTo(BigDecimal.ZERO) > 0) {
+                        if (subtract.compareTo(BigDecimal.ZERO) > 0) {
+                            userAssets.setAmountToBeCovered(BigDecimal.ZERO);
+                            userAssets.setAvailableBalance(userAssets.getAvailableBalance().add(subtract));
+                        } else {
+                            userAssets.setAmountToBeCovered(subtract.negate());
+                        }
+                    } 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");
+                    orderEchoBean.setEarnings(incomeAmount.toString());
+                    orderEchoMapper.updateById(orderEchoBean);
+                } catch (Exception e) {
+                    log.error("基金定时任务---失败: " + orderEchoBean.getId(), e);
+                }
+            }
+        } catch (Exception ex) {
+            log.error("基金定时任务---失败: ", ex);
+        }
     }
 
     @Override

--
Gitblit v1.9.3