zyy
2025-08-28 76388afc59b66335dcf630e5ed30beccbe7aeb5b
src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
@@ -148,16 +148,27 @@
                }
                StockConfig mainBuyConfig =  iStockConfigServices.queryByKey(EConfigKey.MIN_BUY.getCode());
                /*StockConfig mainBuyConfig =  iStockConfigServices.queryByKey(EConfigKey.MIN_BUY.getCode());
                if(buyNum<Integer.parseInt(mainBuyConfig.getCValue())){
                    return ServerResponse.createByErrorMsg("最低购买数量"+mainBuyConfig.getCValue(), request);
                }*/
                //最低购买数量 US 10 印度100 香港台湾1000
                Integer minBuyNum;
                if (stock.getStockType().equals(EStockType.US.getCode())) {
                    minBuyNum = 10;
                } else if (stock.getStockType().equals(EStockType.IN.getCode())) {
                    minBuyNum = 100;
                } else {
                    minBuyNum = 1000;
                }
                if(buyNum < minBuyNum){
                    return ServerResponse.createByErrorMsg("最低购买数量" + minBuyNum, 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(buyNum > Integer.parseInt(maxBuyConfig.getCValue())){
                    return ServerResponse.createByErrorMsg("最高购买数量" + maxBuyConfig.getCValue(), request);
                }
                if(userAssets.getAmountToBeCovered().compareTo(BigDecimal.ZERO) > 0){
                    return ServerResponse.createByErrorMsg("请先缴清待补资金", request);
@@ -1462,7 +1473,7 @@
            userPosition.setOrderStayDays(Integer.valueOf(0));
            userPosition.setOrderStayFee(new BigDecimal("0"));
            userPosition.setAmountToBeCovered(amountToBeCovered);
            //userPosition.setAmountToBeCovered(amountToBeCovered);
            userPosition.setNewId(stockSubscribe.getNewlistId());
            int ret = 0;
            ret = this.userPositionMapper.insert(userPosition);
@@ -2152,20 +2163,21 @@
                    }else{
                        userPositionVO.setProfitAndLose(userPositionVO.getProfitAndLose().multiply(new BigDecimal(userPositionVO.getOrderLever())));
                    }
                    BigDecimal nowPriceSUM = nowPrice.multiply(BigDecimal.valueOf(position.getOrderNum()));
                    if (position.getStockGid().equals(EStockType.US.getCode())) {
                        usMarketValue = usMarketValue.add(nowPrice);
                        usMarketValue = usMarketValue.add(nowPriceSUM);
                        usPositionEarnings = usPositionEarnings.add(userPositionVO.getProfitAndLose());
                        usPositionEarningsParent = usPositionEarningsParent.add(userPositionVO.getProfitAndLoseParent2());
                    } else if(position.getStockGid().equals(EStockType.HK.getCode())) {
                        hkMarketValue = hkMarketValue.add(nowPrice);
                        hkMarketValue = hkMarketValue.add(nowPriceSUM);
                        hkPositionEarnings = hkPositionEarnings.add(userPositionVO.getProfitAndLose());
                        hkPositionEarningsParent = hkPositionEarningsParent.add(userPositionVO.getProfitAndLoseParent2());
                    } else if(position.getStockGid().equals(EStockType.IN.getCode())) {
                        inMarketValue = inMarketValue.add(nowPrice);
                        inMarketValue = inMarketValue.add(nowPriceSUM);
                        inPositionEarnings = inPositionEarnings.add(userPositionVO.getProfitAndLose());
                        inPositionEarningsParent = inPositionEarningsParent.add(userPositionVO.getProfitAndLoseParent2());
                    } else if(position.getStockGid().equals(EStockType.TW.getCode())) {
                        twMarketValue = twMarketValue.add(nowPrice);
                        twMarketValue = twMarketValue.add(nowPriceSUM);
                        twPositionEarnings = twPositionEarnings.add(userPositionVO.getProfitAndLose());
                        twPositionEarningsParent = twPositionEarningsParent.add(userPositionVO.getProfitAndLoseParent2());
                    }