From 677c87ad5b0057a09381cfe023e857229aa770dd Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Wed, 04 Sep 2024 16:48:40 +0800
Subject: [PATCH] 1

---
 src/main/java/com/nq/service/impl/UserPositionServiceImpl.java |  301 ++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 243 insertions(+), 58 deletions(-)

diff --git a/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java b/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
index 6209313..c536946 100644
--- a/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
@@ -13,6 +13,7 @@
 import com.google.common.collect.Lists;
 import com.nq.common.ServerResponse;
 import com.nq.utils.*;
+import com.nq.utils.redis.RedisKeyUtil;
 import com.nq.utils.stock.BuyAndSellUtils;
 import com.nq.utils.stock.GeneratePosition;
 import com.nq.utils.stock.GetStayDays;
@@ -32,11 +33,15 @@
 
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 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;
 
@@ -57,6 +62,9 @@
 
     @Autowired
     IUserAssetsServices userAssetsServices;
+
+    @Autowired
+    UserAssetsMapper userAssetsMapper;
 
     @Autowired
     ISiteSettingService iSiteSettingService;
@@ -117,12 +125,24 @@
     @Autowired
     IStockConfigServices iStockConfigServices;
 
+    @Autowired
+    ISiteVipRobService iSiteVipRobService;
+
+    @Autowired
+    IStockConfigServices stockConfigServices;
+    @Autowired
+    private UserPurchaseApplicationServiceImpl purchaseApplicationService;
+
+
     @Transactional
-    public ServerResponse buy(Integer stockId, Integer buyNum, Integer buyType, Integer lever, BigDecimal profitTarget, BigDecimal stopTarget, HttpServletRequest request) {
+    public ServerResponse buy(Integer stockId, Integer buyNum, Integer buyType, Integer lever, BigDecimal profitTarget, BigDecimal stopTarget, HttpServletRequest request,Integer userId) {
 
         SiteProduct siteProduct = iSiteProductService.getProductSetting();
 
         User user = this.iUserService.getCurrentRefreshUser(request);
+        if(null == user && null != userId){
+            user = userMapper.selectById(userId);
+        }
         if (siteProduct.getRealNameDisplay() && user.getIsActive() != 2) {
             return ServerResponse.createByErrorMsg("订单失败,请先实名认证", request);
         }
@@ -150,21 +170,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,12 +192,30 @@
         if (nowPrice.compareTo(new BigDecimal("0")) == 0) {
             return ServerResponse.createByErrorMsg("报价0,请稍后再试", request);
         }
-
+//        //vip抢筹
+//        SiteSetting siteSetting = iSiteSettingService.getSiteSetting();
+//        StockRealTimeBean stockRealTimeBean = RedisKeyUtil.getCacheRealTimeStock(stock);
+//        BigDecimal pcp = new BigDecimal(stockRealTimeBean.getPcp());
+//        SiteVipRob siteVipRob = iSiteVipRobService.getByStockCode(stock.getStockCode());
+//        // 检查VIP抢筹功能是否开启且用户符合条件
+//        if (null != siteVipRob && siteVipRob.getStatus() == 1 && pcp.compareTo(siteVipRob.getStockChg()) >= 0) {
+//            // 检查密码是否为空
+//            if (StringUtils.isBlank(password)) {
+//                return ServerResponse.createByErrorMsg("VIP抢筹秘钥错误", request);
+//            }
+//            // 检查交易数量是否达到最低要求
+//            if (buyNum < siteVipRob.getLowestTrade()) {
+//                return ServerResponse.createByErrorMsg("VIP抢筹秘最低交易数量为" + siteVipRob.getLowestTrade(), request);
+//            }
+//            // 检查VIP密码是否正确
+//            if (!siteSetting.getVipPassword().equals(password)) {
+//                return ServerResponse.createByErrorMsg("VIP抢筹秘钥错误", request);
+//            }
+//        }
         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 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);
@@ -317,11 +354,18 @@
 
 
     @Transactional
-    public ServerResponse sell(String positionSn, int doType, HttpServletRequest request) {
+    public ServerResponse sell(String positionSn,Integer closeNumber, int doType, HttpServletRequest request) {
         UserPosition userPosition = this.userPositionMapper.findPositionBySn(positionSn);
         // 手续费率
         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")
+        );
+        if(userAssets.getAmountToBeCovered().compareTo(BigDecimal.ZERO) > 0){
+            return ServerResponse.createByErrorMsg("请先缴清待补资金", request);
+        }
         Boolean b = tradingHourService.timeCheck(userPosition.getStockCode());
         if (!b) {
             return ServerResponse.createByErrorMsg("订单失败,不在交易时间之内", request);
@@ -356,27 +400,58 @@
         if (nowPrice.compareTo(new BigDecimal("0")) != 1) {
             return ServerResponse.createByErrorMsg("报价0,平仓失败,请稍后再试", request);
         }
-        userPosition.setSellOrderId(GeneratePosition.getPositionId());
-        userPosition.setSellOrderPrice(nowPrice);
-        userPosition.setSellOrderTime(new Date());
 
         BigDecimal sellOrderTotel = nowPrice.multiply(new BigDecimal(userPosition.getOrderNum()));
-        BigDecimal xsPrice = sellOrderTotel.multiply(siitteBuyFee);
+        if(closeNumber > userPosition.getOrderNum()){
+            return ServerResponse.createByErrorMsg("平仓数量不能大于持仓", request);
+        }
+        if(closeNumber < 1){
+            return ServerResponse.createByErrorMsg("平仓数量不能小于1", request);
+        }
+        boolean part = false;
+        if(null != closeNumber && closeNumber != 0 && closeNumber != userPosition.getOrderNum()){
+            sellOrderTotel = nowPrice.multiply(new BigDecimal(closeNumber));
+            userPosition.setOrderNum(userPosition.getOrderNum() - closeNumber);
+            userPosition.setOrderTotalPrice(userPosition.getBuyOrderPrice().multiply(new BigDecimal(userPosition.getOrderNum())).setScale(5,RoundingMode.DOWN));
+            part = true;
+        }else {
+            userPosition.setSellOrderId(GeneratePosition.getPositionId());
+            userPosition.setSellOrderPrice(nowPrice);
+            userPosition.setSellOrderTime(new Date());
+        }
         userPositionMapper.updateById(userPosition);
-        userAssetsServices.availablebalanceChange(stock.getStockType(),
-                userPosition.getUserId(),
-                EUserAssets.CLOSE_POSITION_RETURN_SECURITY_DEPOSIT,
-                userPosition.getOrderTotalPrice(), "", "");
-        userAssetsServices.availablebalanceChange(stock.getStockType(),
-                userPosition.getUserId(), EUserAssets.HANDLING_CHARGE,
-                xsPrice, "", "");
 
         PositionProfitVO profitVO = UserPointUtil.getPositionProfitVO(userPosition,
                 priceServices.getNowPrice(userPosition.getStockCode()));
+        if(part){
+            //*********部分平仓**********
+            //若盈亏不为0
+            BigDecimal profitAndLose = BigDecimal.ZERO;
+            if(profitVO.getAllProfitAndLose().compareTo(new BigDecimal(0)) != 0){
+                profitAndLose = new BigDecimal(closeNumber).multiply(new BigDecimal(profitVO.getNowPrice())).setScale(5,RoundingMode.DOWN);
+            }else {
+                profitAndLose = new BigDecimal(closeNumber).multiply(userPosition.getBuyOrderPrice()).setScale(5,RoundingMode.DOWN);
+            }
+            //钱包冻结重新结算=当前冻结-平仓后股数*购买价
+            BigDecimal differ = userPosition.getBuyOrderPrice().multiply(new BigDecimal(closeNumber));
+            userAssetsServices.availablebalanceChangePart(stock.getStockType(),
+                    userPosition.getUserId(),
+                    EUserAssets.PART_CLOSE_POSITION,
+                    profitAndLose, differ);
+        }else {
+            BigDecimal xsPrice = sellOrderTotel.multiply(siitteBuyFee);
+            userAssetsServices.availablebalanceChange(stock.getStockType(),
+                    userPosition.getUserId(),
+                    EUserAssets.CLOSE_POSITION_RETURN_SECURITY_DEPOSIT,
+                    userPosition.getOrderTotalPrice(), "", "");
+            userAssetsServices.availablebalanceChange(stock.getStockType(),
+                    userPosition.getUserId(), EUserAssets.HANDLING_CHARGE,
+                    xsPrice, "", "");
 
-        userAssetsServices.availablebalanceChange(stock.getStockType(),
-                userPosition.getUserId(), EUserAssets.CLOSE_POSITION,
-                profitVO.getAllProfitAndLose(), "", "");
+            userAssetsServices.availablebalanceChange(stock.getStockType(),
+                    userPosition.getUserId(), EUserAssets.CLOSE_POSITION,
+                    profitVO.getAllProfitAndLose(), "", "");
+        }
         return ServerResponse.createBySuccessMsg("平仓成功!", request);
     }
 
@@ -569,6 +644,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);
             }
         }
@@ -1185,8 +1262,10 @@
             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());
@@ -1198,7 +1277,7 @@
             userPosition.setIsLock(Integer.valueOf(0));
 
 
-            userPosition.setOrderLever(10);
+            userPosition.setOrderLever(1);
 
 
             //递延费特殊处理
@@ -1237,7 +1316,13 @@
 
             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);
@@ -1526,11 +1611,16 @@
         /*实名认证开关开启*/
         SiteProduct siteProduct = iSiteProductService.getProductSetting();
         User user = this.iUserService.getCurrentRefreshUser(request);
+
         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");
+        }
+        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("stock_code", stockCode));
         if (!Objects.equals(stockDz.getPassword(), password)) {
@@ -1554,12 +1644,13 @@
             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);
         }
+
+        // 创建UserPosition对象
         UserPosition userPosition = new UserPosition();
         userPosition.setPositionType(3);
         userPosition.setPositionSn(KeyUtils.getUniqueKey());
@@ -1591,7 +1682,7 @@
 
         userPosition.setOrderSpread(BigDecimal.ZERO);
         userPositionMapper.insert(userPosition);
-        userAssetsServices.availablebalanceChange(EStockType.IN.getCode(), user.getId(), EUserAssets.BUY, buyAmt.negate(),"","");
+        userAssetsServices.availablebalanceChange(stockDz.getStockType(), user.getId(), EUserAssets.BUY, buyAmt.negate(),"","");
         return ServerResponse.createBySuccess("购买成功", request);
     }
 
@@ -1609,20 +1700,102 @@
     @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;
 
-            boolean liquidation = false;
-            liquidation = isLiquidation(position, result.signum, result.profit, liquidation);
-            if(liquidation){
-                extracted(position, result.nowPrice, result.stock);
+                Integer liquidation = 0;
+                liquidation = isLiquidation(position, result.signum, result.profit, liquidation);
+                if(liquidation != 0){
+                    extracted(position, result.nowPrice, result.stock,liquidation);
+                }
+            }
+        }catch (Exception e){
+            log.error("强制平仓--->错误",e);
+        }
+    }
+
+    @Override
+    public Integer checkStockVip(Integer stockId,Integer buyNum,Integer buyType,Integer lever,BigDecimal profitTarget,BigDecimal stopLoss, HttpServletRequest request) {
+        Stock stock = stockMapper.selectByPrimaryKey(stockId);
+        User user = this.iUserService.getCurrentRefreshUser(request);
+        if(null == stock){
+            return 0;
+        }
+        //获取当前股票价格
+        StockRealTimeBean stockRealTimeBean = RedisKeyUtil.getCacheRealTimeStock(stock);
+        BigDecimal pcp = new BigDecimal(stockRealTimeBean.getPcp());
+        //涨停板配置
+        //组装需要查询的key
+        String[] keysArray = new String[]{EConfigKey.LIMIT_UP_INTERVAL.getCode(),EConfigKey.LIMIT_UP_IS_BUY.getCode()};
+        List<String> keysList = Arrays.asList(keysArray);
+        Map<String, StockConfig> stockConfigs = stockConfigServices.queryByKeys(keysList);
+        if(null != stockConfigs && "1".equals(stockConfigs.get(EConfigKey.LIMIT_UP_IS_BUY.getCode()).getCValue())){
+            //判断区间
+            if(!isInAnyInterval(pcp, stockConfigs.get(EConfigKey.LIMIT_UP_INTERVAL.getCode()).getCValue())){
+                return 0;
+            }
+            //插入购买申请
+            UserPurchaseApplication purchaseApplication = new UserPurchaseApplication();
+            purchaseApplication.setStockCode(stock.getStockCode());
+            purchaseApplication.setUserId(user.getId());
+            purchaseApplication.setBuyNum(buyNum);
+            purchaseApplication.setBuyType(buyType);
+            purchaseApplication.setLever(lever);
+            purchaseApplication.setProfitTarget(profitTarget);
+            purchaseApplication.setStopTarget(stopLoss);
+            purchaseApplication.setNowPrice(priceServices.getNowPrice(stock.getStockCode()));
+            purchaseApplication.setStatus(0);
+            purchaseApplication.setAddTime(new Date());
+            purchaseApplicationService.save(purchaseApplication);
+            return 1;
+        }
+
+        //vip抢筹配置
+        SiteVipRob siteVipRob = iSiteVipRobService.getByStockCode(stock.getStockCode());
+        if(null == siteVipRob || siteVipRob.getStatus() == 0){
+            return 0;
+        }
+
+        if(pcp.compareTo(siteVipRob.getStockChg()) >= 0){
+            return 2;
+        }
+        return 0;
+    }
+
+    public boolean isInAnyInterval(BigDecimal pcp, String intervals) {
+        if(intervals.indexOf(",")>0){
+            String[] intervalArray = intervals.split(",");
+            for (String interval : intervalArray) {
+                if (isInSingleInterval(pcp, interval.trim())) {
+                    return true;
+                }
+            }
+        }else {
+            if (isInSingleInterval(pcp, intervals.trim())) {
+                return true;
             }
         }
+        return false;
+    }
+
+    public boolean isInSingleInterval(BigDecimal pcp, String interval) {
+        String[] parts = interval.split("-");
+        BigDecimal start = new BigDecimal(parts[0].trim());
+        BigDecimal end = new BigDecimal(parts[1].trim());
+
+        return pcp.compareTo(start) >= 0 && pcp.compareTo(end) <= 0;
     }
 
     private Result getResult(UserPosition position) {
@@ -1690,7 +1863,8 @@
     }
 
     //判断平仓
-    private 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("买涨")){
@@ -1701,17 +1875,17 @@
                 //止损
                 if(null != position.getStopTargetPrice() && nowPrice.compareTo(position.getStopTargetPrice()) <= 0){
                     //强制平仓
-                    return liquidation = true;
+                    return liquidation = 1;
                 }
                 if (negate.compareTo(position.getOrderTotalPrice()) >= 0){//亏平强平
                     //强制平仓
-                    return liquidation = true;
+                    return liquidation = -1;
                 }
             }else{
                 //止盈
                 if(null != position.getProfitTargetPrice() && nowPrice.compareTo(position.getProfitTargetPrice()) >= 0){
                     //强制平仓
-                    return liquidation = true;
+                    return liquidation = 2;
                 }
             }
         }else{
@@ -1720,18 +1894,18 @@
                 //止损
                 if(null != position.getStopTargetPrice() && nowPrice.compareTo(position.getStopTargetPrice()) >= 0){
                     //强制平仓
-                    return liquidation = true;
+                    return liquidation = 1;
                 }
                 //判断亏损金额是否达到保证金金额
                 if (profit.compareTo(position.getOrderTotalPrice()) >= 0){//亏平强平
                     //强制平仓
-                    return liquidation = true;
+                    return liquidation = -1;
                 }
             }else{
                 //止盈
                 if(null != position.getProfitTargetPrice() && nowPrice.compareTo(position.getProfitTargetPrice()) <= 0){
                     //强制平仓
-                    return liquidation = true;
+                    return liquidation = 2;
                 }
             }
         }
@@ -1739,21 +1913,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