modify

Helius

2020-09-04 6a7c8aa36b389adf6542a6acf466e86750968744

modify

 src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java

@@ -483,7 +483,7 @@
                holdOrderListVo.setReturnRate(returnRate);
                holdOrderListVo.setProfitOrLoss(rewardRatio);
                if (ContractEntrustOrderEntity.POSITION_TYPE_ALL == memberEntity.getContractPositionType()) {
                    BigDecimal forcePrice = CalculateUtil.getForceSetPriceForWhole(symbol, memberEntity);
                    BigDecimal forcePrice = CalculateUtil.getForceSetPriceForWhole(holdOrderEntity.getSymbol(), memberEntity);
                    holdOrderListVo.setForceClosingPrice(forcePrice);
                }
                resultList.add(holdOrderListVo);

 src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java

@@ -479,9 +479,29 @@

            BigDecimal currentPrice = new BigDecimal(orderModel.getPrice());
            if (CollUtil.isNotEmpty(holdOrderEntities)) {

                PlatformTradeSettingEntity tradeSetting = cacheSettingUtils.getTradeSetting();
                for (ContractHoldOrderEntity holdOrderEntity : holdOrderEntities) {
                    BigDecimal lotNumber = cacheSettingUtils.getSymbolSku(holdOrderEntity.getSymbol());

                    // 单个订单盈利
                    BigDecimal profitOrLess = BigDecimal.ZERO;
                    // 开多
                    if (ContractHoldOrderEntity.OPENING_TYPE_MORE == holdOrderEntity.getOpeningType()) {
                        profitOrLess = currentPrice.subtract(holdOrderEntity.getOpeningPrice()).multiply(new BigDecimal(holdOrderEntity.getSymbolCnt())).multiply(lotNumber);
                        // 开空
                    } else {
                        profitOrLess = holdOrderEntity.getOpeningPrice().subtract(currentPrice).multiply(new BigDecimal(holdOrderEntity.getSymbolCnt())).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()));
                        }
                    }

                    ContractOrderEntity contractOrderEntity = ContractHoldOrderEntityMapper.INSTANCE.holdOrderToOrder(holdOrderEntity);
                }
            } else {
                log.info("无当前持仓");