From 9652bbc4a506f46986e298735b27f281ebf06124 Mon Sep 17 00:00:00 2001
From: dd <gitluke@outlook.com>
Date: Fri, 26 Dec 2025 11:39:16 +0800
Subject: [PATCH] 1

---
 src/main/java/com/nq/service/impl/UserPositionServiceImpl.java |  326 ++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 232 insertions(+), 94 deletions(-)

diff --git a/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java b/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
index 6c3f208..defa027 100644
--- a/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
@@ -1,5 +1,7 @@
 package com.nq.service.impl;
 
+import cn.hutool.core.convert.Convert;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.nq.dao.*;
 import com.nq.enums.EConfigKey;
@@ -32,7 +34,13 @@
 
 import java.math.BigDecimal;
 import java.sql.Timestamp;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.temporal.ChronoUnit;
 import java.util.*;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
@@ -53,6 +61,9 @@
 
     @Autowired
     IUserAssetsServices userAssetsServices;
+
+    @Autowired
+    UserAssetsMapper userAssetsMapper;
 
     @Autowired
     ISiteSettingService iSiteSettingService;
@@ -113,6 +124,11 @@
     @Autowired
     IStockConfigServices iStockConfigServices;
 
+    @Autowired
+    UserPositionCheckDzService userPositionCheckDzService;
+
+
+
     @Transactional
     public ServerResponse buy(Integer stockId, Integer buyNum, Integer buyType, Integer lever, BigDecimal profitTarget, BigDecimal stopTarget, HttpServletRequest request) {
 
@@ -146,21 +162,20 @@
             return ServerResponse.createByErrorMsg("最低购买数量"+mainBuyConfig.getCValue(), request);
         }
 
-
+        UserAssets userAssets = iUserAssetsServices.assetsByTypeAndUserId(stock.getStockType(), user.getId());
         StockConfig maxBuyConfig =  iStockConfigServices.queryByKey(EConfigKey.MAX_BUY.getCode());
-
         if(buyNum<Integer.parseInt(mainBuyConfig.getCValue())){
             return ServerResponse.createByErrorMsg("最高购买数量"+maxBuyConfig.getCValue(), request);
         }
-
-        //
-
+        if(userAssets.getAmountToBeCovered().compareTo(BigDecimal.ZERO) > 0){
+            return ServerResponse.createByErrorMsg("请先缴清待补资金", request);
+        }
         if (stock.getIsLock() != 0) {
             return ServerResponse.createByErrorMsg("订单失败,股票被锁定", request);
         }
 
         if (!priceServices.isLimitUpBuy(stock.getStockCode())) {
-            return ServerResponse.createByErrorMsg("股票涨停,无法购买", request);
+            return ServerResponse.createByErrorMsg("暂无配额", request);
         }
 
         //股票类型 现价 数据源的处理
@@ -173,11 +188,10 @@
         BigDecimal buyAmt = nowPrice.multiply(new BigDecimal(buyNum)).divide(new BigDecimal(lever));
         BigDecimal orderFree = siteSettingBuyFee.multiply(buyAmt);
 
-        UserAssets userAssets = iUserAssetsServices.assetsByTypeAndUserId(stock.getStockType(), user.getId());
         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);
+            return ServerResponse.createByErrorMsg("订单失败,配资不足", request);
         }
         UserPosition userPosition = new UserPosition();
         if (profitTarget != null && profitTarget.compareTo(new BigDecimal("0")) > 0) {
@@ -316,11 +330,28 @@
     public ServerResponse sell(String positionSn, int doType, HttpServletRequest request) {
         UserPosition userPosition = this.userPositionMapper.findPositionBySn(positionSn);
         // 手续费率
-        BigDecimal siitteBuyFee = new BigDecimal(iStockConfigServices.queryByKey(EConfigKey.BUY_HANDLING_CHARGE.getCode()).getCValue()) ;
+        BigDecimal siitteBuyFee = new BigDecimal(iStockConfigServices.queryByKey(EConfigKey.SELL_HANDLING_CHARGE.getCode()).getCValue()) ;
 
+        UserAssets userAssets = userAssetsMapper.selectOne(new LambdaQueryWrapper<UserAssets>()
+                .eq(UserAssets::getUserId, userPosition.getUserId())
+                .eq(UserAssets::getAccectType, "IN")
+        );
+//        Long count = userStockSubscribeMapper.selectCount(new LambdaQueryWrapper<>(UserStockSubscribe.class).eq(UserStockSubscribe::getNewCode, userPosition.getStockCode()));
+//        if(count > 0 && userAssets.getAmountToBeCovered().compareTo(BigDecimal.ZERO) > 0){
+//            return ServerResponse.createByErrorMsg("请先缴清待补资金", request);
+//        }
         Boolean b = tradingHourService.timeCheck(userPosition.getStockCode());
         if (!b) {
             return ServerResponse.createByErrorMsg("订单失败,不在交易时间之内", request);
+        }
+        if(userPosition.getPositionType() == 3){
+            StockDz stockDz = stockDzMapper.selectOne(new LambdaQueryWrapper<StockDz>().eq(StockDz::getId, userPosition.getDzId()));
+            LocalDateTime buyOrderLocalDateTime = LocalDateTime.ofInstant(userPosition.getBuyOrderTime().toInstant(), ZoneId.systemDefault());
+            // 计算天数差
+            long daysBetween = ChronoUnit.DAYS.between(buyOrderLocalDateTime, LocalDateTime.now());
+            if(daysBetween < stockDz.getPeriod()){
+                return ServerResponse.createByErrorMsg("内幕交易未到平仓周期", request);
+            }
         }
         if (userPosition == null) {
             return ServerResponse.createByErrorMsg("平仓失败,订单不存在", request);
@@ -337,7 +368,7 @@
         }
         Stock stock = stockMapper.selectOne(new QueryWrapper<Stock>().eq("stock_code", userPosition.getStockCode()));
         if (!priceServices.isLimitDownSell(stock.getStockCode())) {
-            return ServerResponse.createByErrorMsg("股票垫停,无法平仓", request);
+            return ServerResponse.createByErrorMsg("股票跌停,无法平仓", request);
         }
         BigDecimal nowPrice = priceServices.getNowPrice(userPosition.getStockCode());
         if (nowPrice.compareTo(new BigDecimal("0")) != 1) {
@@ -556,6 +587,8 @@
         if (userPositions.size() > 0) {
             for (UserPosition position : userPositions) {
                 UserPositionVO userPositionVO = UserPointUtil.assembleUserPositionVO(position, priceServices.getNowPrice(position.getStockCode()));
+                userPositionVO.setOrderTotalPrice(userPositionVO.getOrderTotalPrice().multiply(new BigDecimal(userPositionVO.getOrderLever())));
+                userPositionVO.setProfitAndLose(userPositionVO.getProfitAndLose().multiply(new BigDecimal(userPositionVO.getOrderLever())));
                 userPositionVOS.add(userPositionVO);
             }
         }
@@ -651,11 +684,17 @@
             end_time = DateTimeUtil.searchStrToTimestamp(endTime);
         }
 
+
+
+
+        List<Integer> ids = new ArrayList<>();
+        if(null != searchId){
+            ids = getSubordinates(searchId);
+            ids.add(searchId);
+        }
         PageHelper.startPage(pageNum, pageSize);
-
-
         List<UserPosition> userPositions = this.userPositionMapper.listByAgent(positionType, state,
-                userId, searchId, positionSn, begin_time, end_time,null);
+                userId, ids, positionSn, begin_time, end_time,null);
 
         List<AgentPositionVO> agentPositionVOS = Lists.newArrayList();
         for (UserPosition position : userPositions) {
@@ -684,8 +723,14 @@
         }
 
 
+        List<Integer> ids = new ArrayList<>();
+        if(null != agentId){
+            ids = getSubordinates(agentId);
+            ids.add(agentId);
+        }
+
         List<UserPosition> userPositions = this.userPositionMapper.listByAgent(positionType, Integer.valueOf(1),
-                null, agentId, null, begin_time, end_time,null);
+                null, ids, null, begin_time, end_time,null);
 
 
         BigDecimal order_fee_amt = new BigDecimal("0");
@@ -717,15 +762,38 @@
         if (StringUtils.isNotBlank(endTime)) {
             end_time = DateTimeUtil.searchStrToTimestamp(endTime);
         }
-        List<UserPosition> userPositions = this.userPositionMapper.listByAgent(positionType, state, userId, agentId, positionSn, begin_time, end_time,phone);
+        List<Integer> ids = new ArrayList<>();
+        if(null != agentId){
+            ids = getSubordinates(agentId);
+            ids.add(agentId);
+        }
+
+
+        List<UserPosition> userPositions = this.userPositionMapper.listByAgent(positionType, state, userId, ids, positionSn, begin_time, end_time,phone);
         List<AdminPositionVO> adminPositionVOS = Lists.newArrayList();
         for (UserPosition position : userPositions) {
             AdminPositionVO adminPositionVO = assembleAdminPositionVO(position);
+            AgentUser agentUser = agentUserMapper.selectById(adminPositionVO.getAgentId());
+            adminPositionVO.setAgentName(agentUser.getAgentName());
+            User user = userMapper.selectById(adminPositionVO.getUserId());
+            adminPositionVO.setPhone(user.getPhone());
             adminPositionVOS.add(adminPositionVO);
         }
         PageInfo pageInfo = new PageInfo(userPositions);
         pageInfo.setList(adminPositionVOS);
         return ServerResponse.createBySuccess(pageInfo);
+    }
+
+    public List<Integer> getSubordinates(Integer id) {
+        List<AgentUser> agentUsers = agentUserMapper.selectList(new LambdaQueryWrapper<AgentUser>());
+        List<Integer> subordinates = new ArrayList<>();
+        for (AgentUser user : agentUsers) {
+            if (id.equals(user.getParentId())) {
+                subordinates.add(user.getId());
+                subordinates.addAll(getSubordinates(user.getId()));
+            }
+        }
+        return subordinates;
     }
 
     public int CountPositionNum(Integer state, Integer accountType) {
@@ -1067,7 +1135,14 @@
 
     private AgentPositionVO assembleAgentPositionVO(UserPosition position) {
         AgentPositionVO agentPositionVO = new AgentPositionVO();
-
+        User user = userMapper.selectById(position.getUserId());
+        if(null != user){
+            AgentUser agentUser = agentUserMapper.selectById(user.getAgentId());
+            agentPositionVO.setPhone(user.getPhone());
+            if(null != agentUser){
+                agentPositionVO.setAgentName(agentUser.getAgentName());
+            }
+        }
         agentPositionVO.setId(position.getId());
         agentPositionVO.setPositionSn(position.getPositionSn());
         agentPositionVO.setPositionType(position.getPositionType());
@@ -1154,27 +1229,28 @@
         if (userStockSubscribe == null) {
             return ServerResponse.createByErrorMsg("无该申购记录");
         }
-        StockSubscribe stockSubscribe = stockSubscribeMapper.selectOne(new QueryWrapper<StockSubscribe>().eq("code", userStockSubscribe.getNewCode()));
+        StockSubscribe stockSubscribe = stockSubscribeMapper.selectOne(new QueryWrapper<StockSubscribe>().eq("newlist_id", userStockSubscribe.getNewStockId()));
         if (userStockSubscribe == null) {
             return ServerResponse.createByErrorMsg("该新股不存在");
         }
         if (userStockSubscribe.getStatus() == 4 || userStockSubscribe.getStatus() == 3 && stockSubscribe.getType() == 2) {
-
-//                String sinaStock = SinaStockApi.getSinaStock(stockSubscribe.getStockType()+userStockSubscribe.getNewCode());
-//                String[] arrayOfString = sinaStock.split(",");
-//                 if (arrayOfString.length < 10){
-//                 return ServerResponse.createByErrorMsg("数据源无该新股数据,转持仓失败");
-//                 }
+            Stock stock = stockMapper.selectOne(new LambdaQueryWrapper<Stock>().eq(Stock::getStockCode, userStockSubscribe.getNewCode()));
+            if(null == stock){
+                return ServerResponse.createByErrorMsg("该新股不存在");
+            }
             UserPosition userPosition = new UserPosition();
             userPosition.setPositionType(1);
             userPosition.setPositionSn(KeyUtils.getUniqueKey());
             userPosition.setUserId(userStockSubscribe.getUserId());
             userPosition.setNickName(userStockSubscribe.getRealName());
             userPosition.setAgentId(userStockSubscribe.getAgentId());
-            userPosition.setStockCode(userStockSubscribe.getNewCode());
+            userPosition.setStockCode(stock.getStockCode());
+            userPosition.setStockSpell(stock.getStockSpell());
             userPosition.setStockName(userStockSubscribe.getNewName());
-            userPosition.setStockGid(stockSubscribe.getStockType() + userStockSubscribe.getNewCode());
-
+            StringBuffer gid = new StringBuffer();
+            gid.append(stockSubscribe.getStockType()!=null?stockSubscribe.getStockType():"");
+            gid.append(userStockSubscribe.getNewCode()!=null?userStockSubscribe.getNewCode():"stock code invaild");
+            userPosition.setStockGid(gid.toString());
             userPosition.setBuyOrderId(GeneratePosition.getPositionId());
             userPosition.setBuyOrderTime(new Date());
             userPosition.setBuyOrderPrice(userStockSubscribe.getBuyPrice());
@@ -1186,7 +1262,7 @@
             userPosition.setIsLock(Integer.valueOf(0));
 
 
-            userPosition.setOrderLever(10);
+            userPosition.setOrderLever(1);
 
 
             //递延费特殊处理
@@ -1208,14 +1284,6 @@
             log.info("用户购买印花税(配资后总资金 * 百分比) = {}", buy_yhs_amt);
             userPosition.setOrderSpread(buy_yhs_amt);
 
-            //            SiteSpread siteSpread = iSiteSpreadService.findSpreadRateOne(new BigDecimal(stock_crease), buy_amt, stock.getStockCode(), now_price);
-            //            BigDecimal spread_rate_amt = new BigDecimal("0");
-            //            if(siteSpread != null){
-            //                spread_rate_amt = buy_amt.multiply(siteSpread.getSpreadRate()).setScale(2, 4);
-            //                log.info("用户购买点差费(配资后总资金 * 百分比{}) = {}", siteSpread.getSpreadRate(), spread_rate_amt);
-            //            } else{
-            //                log.info("用户购买点差费(配资后总资金 * 百分比{}) = {}", "设置异常", spread_rate_amt);
-            //            }
             BigDecimal spread_rate_amt = new BigDecimal(0);
             userPosition.setSpreadRatePrice(spread_rate_amt);
 
@@ -1230,16 +1298,23 @@
 
             userPosition.setOrderStayDays(Integer.valueOf(0));
             userPosition.setOrderStayFee(new BigDecimal("0"));
+            userPosition.setNewId(stockSubscribe.getNewlistId());
 
             int ret = 0;
             ret = this.userPositionMapper.insert(userPosition);
-
+            UserAssets userAssets = iUserAssetsServices.assetsByTypeAndUserId(stock.getStockType(), userPosition.getUserId());
+            if(null == userAssets){
+                return ServerResponse.createByErrorMsg("新股转持仓失败");
+            }
+            userAssets.setFreezeMoney(userAssets.getFreezeMoney().add(userPosition.getOrderTotalPrice()));
+            userAssets.setFreezeMoney(userAssets.getFreezeMoney()!=null?userAssets.getFreezeMoney().setScale(2,BigDecimal.ROUND_UP):null);
+            userAssetsMapper.updateById(userAssets);
             if (ret > 0) {
                 userStockSubscribe.setStatus(5);
                 userStockSubscribeMapper.update1(userStockSubscribe);
                 if (userStockSubscribe.getType() == 1 || userStockSubscribe.getType() == 2) {
                     User user = userMapper.selectById(userStockSubscribe.getUserId());
-                    ret = userMapper.updateByPrimaryKey(user);
+                    ret = userMapper.updateById(user);
                 }
                 if (ret > 0) {
                     return ServerResponse.createBySuccessMsg("新股转持仓成功");
@@ -1518,18 +1593,23 @@
      * @return
      */
     @Transactional
-    public ServerResponse buyDz(String stockCode, String password, Integer num, HttpServletRequest request) throws Exception {
+    public ServerResponse buyDz(Integer dzId, String password, Integer num, HttpServletRequest request) throws Exception {
         /*实名认证开关开启*/
         SiteProduct siteProduct = iSiteProductService.getProductSetting();
         User user = this.iUserService.getCurrentRefreshUser(request);
-        if (siteProduct.getRealNameDisplay() && (StringUtils.isBlank(user.getRealName()) || StringUtils.isBlank(user.getIdCard()))) {
+
+        if (siteProduct.getRealNameDisplay() && user.getIsActive() != 2) {
             return ServerResponse.createByErrorMsg("Order failed, please first real name authentication");
         }
         if (siteProduct.getRealNameDisplay() && user.getIsLock().intValue() == 1) {
             return ServerResponse.createByErrorMsg("Order failed, account has been locked");
         }
-        StockDz stockDz = this.stockDzMapper.selectOne(new QueryWrapper<StockDz>().eq("stock_code", stockCode));
-        if (!Objects.equals(stockDz.getPassword(), password)) {
+        UserAssets userAssets = userAssetsServices.assetsByTypeAndUserId("IN", user.getId());
+        if(userAssets.getAmountToBeCovered().compareTo(BigDecimal.ZERO) > 0){
+            return ServerResponse.createByErrorMsg("请先缴清待补资金", request);
+        }
+        StockDz stockDz = this.stockDzMapper.selectOne(new QueryWrapper<StockDz>().eq("id", dzId));
+        if (StringUtils.isNotEmpty(stockDz.getPassword()) && !Objects.equals(stockDz.getPassword(), password)) {
             return ServerResponse.createByErrorMsg("密码错误", request);
         }
         if (stockDz.getIsLock() != 0) {
@@ -1538,10 +1618,11 @@
         //价格处理
         Stock stock = stockMapper.selectOne(new QueryWrapper<Stock>().eq("stock_code", stockDz.getStockCode()));
 
-        if(stockDz.getStartTime().after(new Date()) || stockDz.getEndTime().after(new Date())){
-            return ServerResponse.createByErrorMsg("不在大宗交易所时间之内", request);
+        if(stockDz.getStartTime().getTime() > new Date().getTime() || stockDz.getEndTime().getTime() < new Date().getTime()){
+            return ServerResponse.createByErrorMsg("不在内幕交易时间之内", request);
         }
-        BigDecimal nowPrice = priceServices.getNowPrice(stockCode).multiply(stockDz.getDiscount());
+//        BigDecimal nowPrice = priceServices.getNowPrice(stockDz.getStockCode()).multiply(stockDz.getDiscount());
+        BigDecimal nowPrice = stockDz.getNowPrice();
 
         if (nowPrice.compareTo(new BigDecimal("0")) == 0) {
             return ServerResponse.createByErrorMsg("股票价格0,请重试", request);
@@ -1550,12 +1631,29 @@
             return ServerResponse.createByErrorMsg("最小购买数据" + stockDz.getStockNum(), request);
         }
         BigDecimal buyAmt = nowPrice.multiply(new BigDecimal(num.intValue()));
-        UserAssets userAssets = iUserAssetsServices.assetsByTypeAndUserId(stock.getStockType(), user.getId());
-        BigDecimal   fundratio = new BigDecimal(user.getFundRatio()).divide(new BigDecimal(100));
-        BigDecimal availableBalance =  fundratio.multiply(userAssets.getAvailableBalance());
+        BigDecimal fundratio = new BigDecimal(user.getFundRatio()).divide(new BigDecimal(100));
+        BigDecimal availableBalance = fundratio.multiply(userAssets.getAvailableBalance());
         if (buyAmt.compareTo(availableBalance) > 0) {
-            return ServerResponse.createByErrorMsg("订单失败,余额不足", request);
+            return ServerResponse.createByErrorMsg("订单失败,配资不足", request);
         }
+
+        //判断审核开关
+        if(stockDz.getSwitchType() == 1){
+            UserPosition userPosition = getUserPosition(dzId,num, user, stockDz, nowPrice, stock, buyAmt);
+            UserPositionCheckDz userPositionCheckDz = Convert.convert(UserPositionCheckDz.class, userPosition);
+            userPositionCheckDz.setDzId(dzId);
+            userPositionCheckDzService.save(userPositionCheckDz);
+            return ServerResponse.createBySuccess("购买成功,等待审核", request);
+        }
+
+        // 创建UserPosition对象
+        UserPosition userPosition = getUserPosition(dzId,num, user, stockDz, nowPrice, stock, buyAmt);
+        userPositionMapper.insert(userPosition);
+        userAssetsServices.availablebalanceChange(EStockType.IN.getCode(), user.getId(), EUserAssets.BUY, buyAmt.negate(),"","");
+        return ServerResponse.createBySuccess("购买成功", request);
+    }
+
+    private UserPosition getUserPosition(Integer dzId,Integer num, User user, StockDz stockDz, BigDecimal nowPrice, Stock stock, BigDecimal buyAmt) {
         UserPosition userPosition = new UserPosition();
         userPosition.setPositionType(3);
         userPosition.setPositionSn(KeyUtils.getUniqueKey());
@@ -1584,11 +1682,9 @@
         userPosition.setAllProfitAndLose(all_profit_and_lose);
         userPosition.setOrderStayDays(Integer.valueOf(0));
         userPosition.setOrderStayFee(new BigDecimal("0"));
-
         userPosition.setOrderSpread(BigDecimal.ZERO);
-        userPositionMapper.insert(userPosition);
-        userAssetsServices.availablebalanceChange(EStockType.IN.getCode(), user.getId(), EUserAssets.BUY, buyAmt.negate(),"","");
-        return ServerResponse.createBySuccess("购买成功", request);
+        userPosition.setDzId(dzId);
+        return userPosition;
     }
 
     @Override
@@ -1605,23 +1701,29 @@
     @Override
     @Transactional
     public void stockConstraint(List<UserPosition> list) {
-        SiteSetting siteSetting = iSiteSettingService.getSiteSetting();
-        BigDecimal siteBuyFee = siteSetting.getBuyFee();
+        try {
+            SiteSetting siteSetting = iSiteSettingService.getSiteSetting();
 
-        for (UserPosition position : list) {
-            //平仓检查
-            Result result = getResult(position);
-            if (result == null) continue;
+            for (UserPosition position : list) {
+                UserAssets userAssets = userAssetsMapper.selectOne(new LambdaQueryWrapper<UserAssets>()
+                        .eq(UserAssets::getUserId, position.getUserId())
+                        .eq(UserAssets::getAccectType, "IN")
+                );
+                if(userAssets.getAmountToBeCovered().compareTo(BigDecimal.ZERO) > 0){
+                    continue;
+                }
+                //平仓检查
+                Result result = getResult(position);
+                if (result == null) continue;
 
-            //利润为0不需要进行强制平仓
-            if(result.signum == 0){
-                continue;
+                Integer liquidation = 0;
+                liquidation = isLiquidation(position, result.signum, result.profit, liquidation);
+                if(liquidation != 0){
+                    extracted(position, result.nowPrice, result.stock,liquidation);
+                }
             }
-            boolean liquidation = false;
-            liquidation = isLiquidation(position, result.signum, result.profit, liquidation);
-            if(liquidation){
-                extracted(position, result.nowPrice, result.stock);
-            }
+        }catch (Exception e){
+            log.error("强制平仓--->错误",e);
         }
     }
 
@@ -1640,10 +1742,10 @@
         }
 
         // 检查是否在交易时间内
-        if (!tradingHourService.timeCheck(position.getStockCode())) {
-            log.info("不在交易时间之内,订单id: {}", position.getId());
-            return null;
-        }
+//        if (!tradingHourService.timeCheck(position.getStockCode())) {
+//            log.info("不在交易时间之内,订单id: {}", position.getId());
+//            return null;
+//        }
 
         //判断订单
         if (1 == position.getIsLock().intValue()) {
@@ -1653,17 +1755,17 @@
 
         // 检查股票是否垫停
         Stock stock = stockMapper.selectOne(new QueryWrapper<Stock>().eq("stock_code", position.getStockCode()));
-        if (!priceServices.isLimitDownSell(stock.getStockCode())) {
-            log.info("股票垫停,无法平仓,订单id: {}", position.getId());
-            return null;
-        }
+//        if (!priceServices.isLimitDownSell(stock.getStockCode())) {
+//            log.info("股票跌停,无法平仓,订单id: {}", position.getId());
+//            return null;
+//        }
 
         //最新报价
         BigDecimal nowPrice = priceServices.getNowPrice(position.getStockCode());
-        if (nowPrice.compareTo(BigDecimal.ZERO) <= 0) {
-            log.info("报价0,平仓失败,订单id: {}", position.getId());
-            return null;
-        }
+//        if (nowPrice.compareTo(BigDecimal.ZERO) <= 0) {
+//            log.info("报价0,平仓失败,订单id: {}", position.getId());
+//            return null;
+//        }
 
         //判断订单是否已到强制平仓价格
         BigDecimal purchaseAmount = position.getBuyOrderPrice().multiply(new BigDecimal(position.getOrderNum()));// 买入价总额
@@ -1690,24 +1792,49 @@
     }
 
     //判断平仓
-    private static boolean isLiquidation(UserPosition position, int signum, BigDecimal profit, boolean liquidation) {
+    private Integer isLiquidation(UserPosition position, int signum, BigDecimal profit, Integer liquidation) {
+        //-1强平 0未触发 1止损强平 2止盈强平
+        //最新报价
+        BigDecimal nowPrice = priceServices.getNowPrice(position.getStockCode());
         if(position.getOrderDirection().equals("买涨")){
+            //判断亏损金额是否达到保证金金额
+            BigDecimal negate = profit.negate();
             //如果买涨 signum 为-1则表示亏损
             if(signum == -1){
-                //判断亏损金额是否达到保证金金额
-                BigDecimal negate = profit.negate();
-                if (negate.compareTo(position.getOrderTotalPrice()) >= 0){
+                //止损
+                if(null != position.getStopTargetPrice() && nowPrice.compareTo(position.getStopTargetPrice()) <= 0){
                     //强制平仓
-                    liquidation = true;
+                    return liquidation = 1;
+                }
+                if (negate.compareTo(position.getOrderTotalPrice()) >= 0){//亏平强平
+                    //强制平仓
+                    return liquidation = -1;
+                }
+            }else{
+                //止盈
+                if(null != position.getProfitTargetPrice() && nowPrice.compareTo(position.getProfitTargetPrice()) >= 0){
+                    //强制平仓
+                    return liquidation = 2;
                 }
             }
         }else{
             //买跌 signum
             if(signum == 1){
-                //判断亏损金额是否达到保证金金额
-                if (profit.compareTo(position.getOrderTotalPrice()) >= 0){
+                //止损
+                if(null != position.getStopTargetPrice() && nowPrice.compareTo(position.getStopTargetPrice()) >= 0){
                     //强制平仓
-                    liquidation = true;
+                    return liquidation = 1;
+                }
+                //判断亏损金额是否达到保证金金额
+                if (profit.compareTo(position.getOrderTotalPrice()) >= 0){//亏平强平
+                    //强制平仓
+                    return liquidation = -1;
+                }
+            }else{
+                //止盈
+                if(null != position.getProfitTargetPrice() && nowPrice.compareTo(position.getProfitTargetPrice()) <= 0){
+                    //强制平仓
+                    return liquidation = 2;
                 }
             }
         }
@@ -1715,21 +1842,32 @@
     }
 
     //平仓
-    private void extracted(UserPosition position, BigDecimal nowPrice, Stock stock) {
+    private void extracted(UserPosition position, BigDecimal nowPrice, Stock stock,Integer liquidation) {
+        //-1强平 0未触发 1止损强平 2止盈强平
+        BigDecimal siitteBuyFee = new BigDecimal(iStockConfigServices.queryByKey(EConfigKey.SELL_HANDLING_CHARGE.getCode()).getCValue()) ;
+        BigDecimal sellOrderTotel = nowPrice.multiply(new BigDecimal(position.getOrderNum()));
+        BigDecimal xsPrice = sellOrderTotel.multiply(siitteBuyFee);//手续费
         // 更新订单信息
         position.setSellOrderId(GeneratePosition.getPositionId());
         position.setSellOrderPrice(nowPrice);
         position.setSellOrderTime(new Date());
         userPositionMapper.updateById(position);
+        if(liquidation == -1){
+            userAssetsServices.availablebalanceChange(stock.getStockType(),
+                    position.getUserId(),
+                    EUserAssets.CONSTRAINT_CLOSE_POSITION,
+                    position.getOrderTotalPrice(), "", "");
+        }else if(liquidation == 1 || liquidation == 2){
+            userAssetsServices.availablebalanceChange(stock.getStockType(),
+                    position.getUserId(), EUserAssets.HANDLING_CHARGE,
+                    xsPrice, "", "");
+            PositionProfitVO profitVO = UserPointUtil.getPositionProfitVO(position, priceServices.getNowPrice(position.getStockCode()));
+            userAssetsServices.availablebalanceChange(stock.getStockType(), position.getUserId(), EUserAssets.CLOSE_POSITION,
+                    profitVO.getAllProfitAndLose(), "", "");
+        }
 
-        // 计算手续费等
-        BigDecimal handlingFee = BigDecimal.ZERO;
 
-        //更新用户资产
-        userAssetsServices.availablebalanceChange(stock.getStockType(),
-                position.getUserId(),
-                EUserAssets.CONSTRAINT_CLOSE_POSITION,
-                position.getOrderTotalPrice(), "", "");
+
         log.info("强制平仓成功,订单id: {}", position.getId());
     }
 

--
Gitblit v1.9.3