modify

Helius

2021-02-01 b7ba5220be54c7ccef86632f165c079f7a5f0d78

modify

 src/main/java/com/xcong/excoin/modules/contract/parameter/vo/HoldOrderListVo.java

@@ -72,6 +72,9 @@
    @ApiModelProperty(value = "仓位类型 1-逐仓 2-全仓")
    private Integer positionType;

    @ApiModelProperty(value = "维持保证金")
    private BigDecimal holdBond;

    public String getOpeningPrice() {
        return openingPrice.setScale(4, BigDecimal.ROUND_DOWN).toPlainString();
    }

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

@@ -443,12 +443,18 @@
    @Override
    public Result findHoldOrderList(String symbol, int type) {
        MemberEntity memberEntity = LoginUserUtils.getAppLoginUser();
        List<ContractHoldOrderEntity> list = null;

//        List<ContractHoldOrderEntity> list = contractHoldOrderDao.selectHoldOrderListByMemberIdAndSymbol(memberEntity.getId(), symbol, type);
        List<ContractHoldOrderEntity> list = contractHoldOrderDao.selectHoldOrderListByMemberIdAndSymbolTest(memberEntity.getId(),type);
        if (ContractEntrustOrderEntity.POSITION_TYPE_ALL == memberEntity.getContractPositionType()) {
            list = contractHoldOrderDao.selectHoldOrderListByMemberIdAndSymbolTest(memberEntity.getId(), type);
        } else {
            list = contractHoldOrderDao.selectHoldOrderListByMemberIdAndSymbol(memberEntity.getId(), symbol, type);
        }

        MemberWalletContractEntity walletContractEntity = memberWalletContractDao.findWalletContractByMemberIdAndSymbol(memberEntity.getId(), CoinTypeEnum.USDT.name());
        if (CollUtil.isNotEmpty(list)) {
            BigDecimal totalProfitOrLoss = BigDecimal.ZERO;
            BigDecimal totalHoldBond = BigDecimal.ZERO;
            List<HoldOrderListVo> resultList = new ArrayList<>();
            for (ContractHoldOrderEntity holdOrderEntity : list) {
                HoldOrderListVo holdOrderListVo = ContractHoldOrderEntityMapper.INSTANCE.holdOrderToDto(holdOrderEntity);
@@ -510,9 +516,22 @@
                }
                resultList.add(holdOrderListVo);
                totalProfitOrLoss = totalProfitOrLoss.add(rewardRatio);
                totalHoldBond = totalHoldBond.add(holdOrderEntity.getHoldBond() == null ? BigDecimal.ZERO : holdOrderEntity.getHoldBond());
            }

            Map<String, Object> result = new HashMap<>();
            if (ContractEntrustOrderEntity.POSITION_TYPE_ALL == memberEntity.getContractPositionType()) {
                List<ContractEntrustOrderEntity> entrustOrder = contractEntrustOrderDao.selectEntrustOrderListByMemberId(memberEntity.getId());
                BigDecimal totalEntrustAmount = BigDecimal.ZERO;
                if (CollUtil.isNotEmpty(entrustOrder)) {
                    for (ContractEntrustOrderEntity contractEntrustOrderEntity : entrustOrder) {
                        totalEntrustAmount.add(contractEntrustOrderEntity.getEntrustAmount());
                    }
                }
                BigDecimal riskRatio = totalHoldBond.divide(walletContractEntity.getTotalBalance().add(totalProfitOrLoss).subtract(totalEntrustAmount), 4, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(100));
                result.put("riskRatio", riskRatio);
            }

            result.put("hold", resultList);
            result.put("totalProfitOrLoss", totalProfitOrLoss.setScale(4, BigDecimal.ROUND_DOWN).toPlainString());
            return Result.ok(result);

 src/main/java/com/xcong/excoin/rabbit/pricequeue/WebsocketPriceService.java

@@ -12,6 +12,7 @@
import com.xcong.excoin.modules.member.dao.MemberWalletContractDao;
import com.xcong.excoin.modules.member.entity.MemberEntity;
import com.xcong.excoin.modules.member.entity.MemberWalletContractEntity;
import com.xcong.excoin.modules.platform.entity.PlatformTradeSettingEntity;
import com.xcong.excoin.rabbit.pricequeue.whole.HoldOrderDataModel;
import com.xcong.excoin.rabbit.pricequeue.whole.WholeDataQueue;
import com.xcong.excoin.rabbit.pricequeue.whole.WholePriceDataModel;
@@ -42,6 +43,9 @@
    private MemberDao memberDao;
    @Resource
    private MemberWalletContractDao memberWalletContractDao;

    @Resource
    private CacheSettingUtils cacheSettingUtils;
    /**
     * @param symbol
     * @param price
@@ -296,6 +300,8 @@

            if (CollUtil.isNotEmpty(list)) {
                BigDecimal totalProfitOrLoss = BigDecimal.ZERO;

                MemberEntity memberEntity = memberDao.selectById(Long.parseLong(entry.getKey()));
                Map<String, BigDecimal> prices = new HashMap<>();
                for (HoldOrderDataModel holdOrderData : list) {
                    String price = redisUtils.getString(CoinTypeConvert.convertToKey(holdOrderData.getSymbol()));
@@ -311,6 +317,16 @@
                        // (开仓价-最新价)*规格*张数
                        rewardRatio = holdOrderData.getOpeningPrice().subtract(newPrice).multiply(holdOrderData.getSymbolSku()).multiply(new BigDecimal(holdOrderData.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()));
                        } else {
//                        rewardRatio = rewardRatio.multiply(BigDecimal.ONE.add(tradeSettingEntity.getProfitParam()));
                        }
                    }

                    holdOrderData.setRewardAmount(rewardRatio);
                    holdOrderData.setClosingPrice(newPrice);
                    totalProfitOrLoss = totalProfitOrLoss.add(rewardRatio).setScale(8, BigDecimal.ROUND_DOWN);