Merge branch 'activity' of http://120.27.238.55:7000/r/exchange into activity

Helius

2021-03-29 2e9bc4526f025c366c3ab1662dd1864b27b13716

Merge branch 'activity' of http://120.27.238.55:7000/r/exchange into activity

 src/main/java/com/xcong/excoin/modules/coin/service/impl/CoinServiceImpl.java

@@ -416,41 +416,40 @@
        if (balance.compareTo(BigDecimal.ZERO) <= 0) {

            return Result.fail(MessageSourceUtils.getString("member_service_0004"));

        }



        //获取全仓模式下的所有持仓信息

        PlatformTradeSettingEntity tradeSetting = cacheSettingUtils.getTradeSetting();

        BigDecimal newPriceSymbol = new BigDecimal(redisUtils.getString(CoinTypeConvert.convertToKey(symbol)));

        List<ContractHoldOrderEntity> holdOrderEntities = contractHoldOrderDao.selectHoldOrderListForWholeByMemberIdAndSymbol(memberEntity.getId(),"");



        //获取合约当前持仓类型

        Integer contractPositionType = memberEntity.getContractPositionType();

        // 总盈利

        BigDecimal totalProfitOrLess = BigDecimal.ZERO;

        if (CollUtil.isNotEmpty(holdOrderEntities)) {

            for (ContractHoldOrderEntity holdOrderEntity : holdOrderEntities) {

                // 获取最新价

                BigDecimal newPrice = new BigDecimal(redisUtils.getString(CoinTypeConvert.convertToKey(holdOrderEntity.getSymbol())));

                BigDecimal lotNumber = cacheSettingUtils.getSymbolSku(holdOrderEntity.getSymbol());



                // 单个订单盈利

                BigDecimal profitOrLess = BigDecimal.ZERO;

                // 开多

                if (ContractHoldOrderEntity.OPENING_TYPE_MORE == holdOrderEntity.getOpeningType()) {

                    profitOrLess = newPrice.subtract(holdOrderEntity.getOpeningPrice()).multiply(new BigDecimal(holdOrderEntity.getSymbolCntSale())).multiply(lotNumber);

                    // 开空

                } else {

                    profitOrLess = holdOrderEntity.getOpeningPrice().subtract(newPrice).multiply(new BigDecimal(holdOrderEntity.getSymbolCntSale())).multiply(lotNumber);

                }



                if (MemberEntity.IS_PROFIT_Y == memberEntity.getIsProfit()) {

                    if (profitOrLess.compareTo(BigDecimal.ZERO) > 0) {

                        profitOrLess = profitOrLess.multiply(BigDecimal.ONE.subtract(tradeSetting.getForceParam()));

        if(contractPositionType == 2){

            //获取全仓模式下的所有持仓信息

            PlatformTradeSettingEntity tradeSetting = cacheSettingUtils.getTradeSetting();

            List<ContractHoldOrderEntity> holdOrderEntities = contractHoldOrderDao.selectHoldOrderListForWholeByMemberIdAndSymbol(memberEntity.getId(),"");

            if (CollUtil.isNotEmpty(holdOrderEntities)) {

                for (ContractHoldOrderEntity holdOrderEntity : holdOrderEntities) {

                    // 获取最新价

                    BigDecimal newPrice = new BigDecimal(redisUtils.getString(CoinTypeConvert.convertToKey(holdOrderEntity.getSymbol())));

                    BigDecimal lotNumber = cacheSettingUtils.getSymbolSku(holdOrderEntity.getSymbol());

                    // 单个订单盈利

                    BigDecimal profitOrLess = BigDecimal.ZERO;

                    // 开多

                    if (ContractHoldOrderEntity.OPENING_TYPE_MORE == holdOrderEntity.getOpeningType()) {

                        profitOrLess = newPrice.subtract(holdOrderEntity.getOpeningPrice()).multiply(new BigDecimal(holdOrderEntity.getSymbolCntSale())).multiply(lotNumber);

                        // 开空

                    } else {

                        profitOrLess = profitOrLess.multiply(BigDecimal.ONE.add(tradeSetting.getForceParam()));

                        profitOrLess = holdOrderEntity.getOpeningPrice().subtract(newPrice).multiply(new BigDecimal(holdOrderEntity.getSymbolCntSale())).multiply(lotNumber);

                    }

                    if (MemberEntity.IS_PROFIT_Y == memberEntity.getIsProfit()) {

                        if (profitOrLess.compareTo(BigDecimal.ZERO) > 0) {

                            profitOrLess = profitOrLess.multiply(BigDecimal.ONE.subtract(tradeSetting.getForceParam()));

                        } else {

                            profitOrLess = profitOrLess.multiply(BigDecimal.ONE.add(tradeSetting.getForceParam()));

                        }

                    }

                    totalProfitOrLess = totalProfitOrLess.add(profitOrLess);

                }

                totalProfitOrLess = totalProfitOrLess.add(profitOrLess);

            }

        }

    	


        String walletCode = MemberWalletCoinEnum.WALLETCOINCODE.getValue();

        MemberWalletContractEntity walletContract = memberWalletContractDao.findWalletContractByMemberIdAndSymbol(memberId, symbol);

        BigDecimal availableBalance = walletContract.getAvailableBalance();

@@ -512,8 +511,52 @@
    public Result findWalletContractBySymbol(String symbol) {

        //获取用户ID

        Long memberId = LoginUserUtils.getAppLoginUser().getId();

        MemberEntity memberEntity = memberDao.selectById(memberId);

        //获取合约当前持仓类型

        Integer contractPositionType = memberEntity.getContractPositionType();

        // 总盈利

        BigDecimal totalProfitOrLess = BigDecimal.ZERO;

        if(contractPositionType == 2){

            //获取全仓模式下的所有持仓信息

            PlatformTradeSettingEntity tradeSetting = cacheSettingUtils.getTradeSetting();

            List<ContractHoldOrderEntity> holdOrderEntities = contractHoldOrderDao.selectHoldOrderListForWholeByMemberIdAndSymbol(memberEntity.getId(),"");

            if (CollUtil.isNotEmpty(holdOrderEntities)) {

                for (ContractHoldOrderEntity holdOrderEntity : holdOrderEntities) {

                    // 获取最新价

                    BigDecimal newPrice = new BigDecimal(redisUtils.getString(CoinTypeConvert.convertToKey(holdOrderEntity.getSymbol())));

                    BigDecimal lotNumber = cacheSettingUtils.getSymbolSku(holdOrderEntity.getSymbol());

                    // 单个订单盈利

                    BigDecimal profitOrLess = BigDecimal.ZERO;

                    // 开多

                    if (ContractHoldOrderEntity.OPENING_TYPE_MORE == holdOrderEntity.getOpeningType()) {

                        profitOrLess = newPrice.subtract(holdOrderEntity.getOpeningPrice()).multiply(new BigDecimal(holdOrderEntity.getSymbolCntSale())).multiply(lotNumber);

                        // 开空

                    } else {

                        profitOrLess = holdOrderEntity.getOpeningPrice().subtract(newPrice).multiply(new BigDecimal(holdOrderEntity.getSymbolCntSale())).multiply(lotNumber);

                    }

                    if (MemberEntity.IS_PROFIT_Y == memberEntity.getIsProfit()) {

                        if (profitOrLess.compareTo(BigDecimal.ZERO) > 0) {

                            profitOrLess = profitOrLess.multiply(BigDecimal.ONE.subtract(tradeSetting.getForceParam()));

                        } else {

                            profitOrLess = profitOrLess.multiply(BigDecimal.ONE.add(tradeSetting.getForceParam()));

                        }

                    }

                    totalProfitOrLess = totalProfitOrLess.add(profitOrLess);

                }

            }

        }



        MemberWalletContractEntity walletContract = memberWalletContractDao.findWalletContractByMemberIdAndSymbol(memberId, symbol);

        BigDecimal availableBalance = walletContract.getAvailableBalance().setScale(4, BigDecimal.ROUND_DOWN);

        BigDecimal availableBalance = walletContract.getAvailableBalance();

        //可用减去盈亏

        if(totalProfitOrLess.compareTo(BigDecimal.ZERO) < 0){

            availableBalance = availableBalance.add(totalProfitOrLess);

        }

        if(availableBalance.compareTo(BigDecimal.ZERO) > 0){

            availableBalance = availableBalance.setScale(4, BigDecimal.ROUND_DOWN);

        }else{

            availableBalance = BigDecimal.ZERO;

        }

        return Result.ok(availableBalance);

    }