modify

Helius

2021-04-09 d0e43a32a5cc440368eba83a48cf4a9269da3178

 src/main/java/com/xcong/excoin/utils/CalculateUtil.java

@@ -230,25 +230,7 @@
                    totalBondAmount = totalBondAmount.add(holdOrderEntity.getBondAmount());

                }



                // 盈亏

                BigDecimal rewardRatio = BigDecimal.ZERO;

                // 开多

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

                    // (最新价-开仓价)*规格*张数

                    rewardRatio = newPrice.subtract(holdOrderEntity.getOpeningPrice()).multiply(contractHoldOrderEntity.getSymbolSku()).multiply(new BigDecimal(holdOrderEntity.getSymbolCntSale()));

                    // 开空

                } else {

                    // (开仓价-最新价)*规格*张数

                    rewardRatio = holdOrderEntity.getOpeningPrice().subtract(newPrice).multiply(contractHoldOrderEntity.getSymbolSku()).multiply(new BigDecimal(holdOrderEntity.getSymbolCntSale()));

                }



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

                    PlatformTradeSettingEntity tradeSettingEntity = cacheSettingUtils.getTradeSetting();

                    if (rewardRatio.compareTo(BigDecimal.ZERO) > -1) {

                        rewardRatio = rewardRatio.multiply(BigDecimal.ONE.subtract(tradeSettingEntity.getProfitParam()));

                    }

                }

                totalProfitOrLoss = totalProfitOrLoss.add(rewardRatio);

                totalProfitOrLoss = totalProfitOrLoss.add(calProfitOrLoss(holdOrderEntity, memberEntity));

            }



            // 维持保证金

@@ -280,6 +262,7 @@
                log.info("ratio : {}", ratio);

                log.info("orderProfitOrLoss : {}", orderProfitOrLoss);

                log.info("total : {}", walletContract.getTotalBalance());

                log.info("totalProfitOrLoss : {}", totalProfitOrLoss);

                log.info("qy : {}", qy);

            }

        }

@@ -291,6 +274,7 @@
        RedisUtils redisUtils = SpringContextHolder.getBean(RedisUtils.class);

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

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

        log.info("最新价为:{}", newPrice);



        // 盈亏

        BigDecimal rewardRatio = BigDecimal.ZERO;