日股，美股

zj

2026-01-11 28701d9c708089cd64e3dc813ad1d9079de6528a

 src/main/java/com/nq/service/impl/UserPositionServiceImpl.java

@@ -2155,28 +2155,18 @@
                            null, null, state, null);

            BigDecimal usMarketValue = BigDecimal.ZERO; //美股市值
            BigDecimal hkMarketValue = BigDecimal.ZERO; //港股市值
            BigDecimal inMarketValue = BigDecimal.ZERO; //印股市值
            BigDecimal twMarketValue = BigDecimal.ZERO; //台股市值
            BigDecimal jpMarketValue = BigDecimal.ZERO; //日股市值

            BigDecimal usPositionEarnings = BigDecimal.ZERO; //美股持仓收益
            BigDecimal hkPositionEarnings = BigDecimal.ZERO; //港股持仓收益
            BigDecimal inPositionEarnings = BigDecimal.ZERO; //印股持仓收益
            BigDecimal twPositionEarnings = BigDecimal.ZERO; //台股持仓收益
            BigDecimal jpPositionEarnings = BigDecimal.ZERO; //日股持仓收益

            BigDecimal usPositionEarningsParent = BigDecimal.ZERO; //美股持仓收益百分比
            BigDecimal hkPositionEarningsParent = BigDecimal.ZERO; //港股持仓收益百分比
            BigDecimal inPositionEarningsParent = BigDecimal.ZERO; //印股持仓收益百分比
            BigDecimal twPositionEarningsParent = BigDecimal.ZERO; //台股持仓收益百分比
            BigDecimal jpPositionEarningsParent = BigDecimal.ZERO; //日股持仓收益百分比

            if (!userPositions.isEmpty()) {
                for (UserPosition position : userPositions) {
                    BigDecimal nowPrice = priceServices.getNowPrice(position.getStockCode());
                    /*if(state == 0){
                        nowPrice = priceServices.getNowPrice(position.getStockCode());
                    }else{
                        nowPrice = position.getSellOrderPrice();
                    }*/

                    UserPositionVO userPositionVO = UserPointUtil.assembleUserPositionVO(position,nowPrice);
                    userPositionVO.setOrderTotalPrice(userPositionVO.getOrderTotalPrice().multiply(new BigDecimal(userPositionVO.getOrderLever())));

@@ -2200,25 +2190,15 @@
                        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(nowPriceSUM);
                        hkPositionEarnings = hkPositionEarnings.add(userPositionVO.getProfitAndLose());
                        hkPositionEarningsParent = hkPositionEarningsParent.add(userPositionVO.getProfitAndLoseParent2());
                    } else if(position.getStockGid().equals(EStockType.IN.getCode())) {
                        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(nowPriceSUM);
                        twPositionEarnings = twPositionEarnings.add(userPositionVO.getProfitAndLose());
                        twPositionEarningsParent = twPositionEarningsParent.add(userPositionVO.getProfitAndLoseParent2());
                    } else if(position.getStockGid().equals(EStockType.JP.getCode())) {
                        jpMarketValue = jpMarketValue.add(nowPriceSUM);
                        jpPositionEarnings = jpPositionEarnings.add(userPositionVO.getProfitAndLose());
                        jpPositionEarningsParent = jpPositionEarningsParent.add(userPositionVO.getProfitAndLoseParent2());
                    }

                }
                usPositionEarnings = usPositionEarnings.setScale(2, RoundingMode.DOWN);
                hkPositionEarnings = hkPositionEarnings.setScale(2, RoundingMode.DOWN);
                inPositionEarnings = inPositionEarnings.setScale(2, RoundingMode.DOWN);
                twPositionEarnings = twPositionEarnings.setScale(2, RoundingMode.DOWN);
                jpPositionEarnings = jpPositionEarnings.setScale(2, RoundingMode.DOWN);
            }

            Map<String, String> map = new HashMap<>();
@@ -2226,17 +2206,9 @@
            map.put("usPositionEarnings", String.valueOf(usPositionEarnings));  //美股持仓收益
            map.put("usPositionEarningsParent", usPositionEarningsParent + "%");//美股持仓收益率

            map.put("hkMarketValue", String.valueOf(hkMarketValue));            //港股市值
            map.put("hkPositionEarnings", String.valueOf(hkPositionEarnings));  //港股持仓收益
            map.put("hkPositionEarningsParent", hkPositionEarningsParent + "%");//港股持仓收益率

            map.put("inMarketValue", String.valueOf(inMarketValue));            //印股市值
            map.put("inPositionEarnings", String.valueOf(inPositionEarnings));  //印股持仓收益
            map.put("inPositionEarningsParent", inPositionEarningsParent + "%");//印股持仓收益率

            map.put("twMarketValue", String.valueOf(twMarketValue));            //台股市值
            map.put("twPositionEarnings", String.valueOf(twPositionEarnings));  //台股持仓收益
            map.put("twPositionEarningsParent", twPositionEarningsParent + "%");//台股持仓收益率
            map.put("jpMarketValue", String.valueOf(jpMarketValue));            //日股市值
            map.put("jpPositionEarnings", String.valueOf(jpPositionEarnings));  //日股持仓收益
            map.put("jpPositionEarningsParent", jpPositionEarningsParent + "%");//日股持仓收益率

            return ServerResponse.createBySuccess(map);
        } catch (Exception e) {