modify

Helius

2020-08-26 ed69a1c44fa9bce098d412985e8f17163d7def8c

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

@@ -146,7 +146,7 @@
        BigDecimal openFeePrice = CalculateUtil.getOpenFeePrice(openingPrice, lotNumber, submitOrderDto.getSymbolCnt(), tradeSettingEntity.getFeeRatio());
        log.info("开仓手续费:{}", openFeePrice);

        ContractHoldOrderEntity wholeHoldOrder = contractHoldOrderDao.selectWholeHoldOrderByOrderType(memberEntity.getId(), submitOrderDto.getOrderType());
        ContractHoldOrderEntity wholeHoldOrder = contractHoldOrderDao.selectWholeHoldOrderByOrderType(memberEntity.getId(), submitOrderDto.getOrderType(), submitOrderDto.getSymbol());
        // 判断当前是否存在全仓订单，若存在则直接合并，若不存在则创建订单
        if (wholeHoldOrder != null) {
            BigDecimal totalPrice = openingPrice.multiply(BigDecimal.valueOf(submitOrderDto.getSymbolCnt()));
@@ -159,7 +159,7 @@
            log.info("手续费相加:{}", fee);
            BigDecimal prePaymentAmount = bondAmount.add(fee).add(fee);

            BigDecimal subBondAmount = bondAmount.subtract(wholeHoldOrder.getBondAmount());
            BigDecimal subBondAmount = bondAmount.subtract(wholeHoldOrder.getBondAmount()).subtract(wholeHoldOrder.getOpeningFeeAmount());
            log.info("保证金差值:{}", subBondAmount);

            if (subBondAmount.compareTo(walletContract.getAvailableBalance()) > -1) {
@@ -172,7 +172,7 @@
//            log.info("新预估强平价:{}", forceClosingPrice);

            ContractOrderEntity contractOrderEntity = ContractHoldOrderEntityMapper.INSTANCE.holdOrderToOrder(wholeHoldOrder);
            contractOrderEntity.setBondAmount(bondAmount.add(openFeePrice));
            contractOrderEntity.setBondAmount(subBondAmount.add(openFeePrice));
//            contractOrderEntity.setForceClosingPrice(forceClosingPrice);
            contractOrderEntity.setOpeningPrice(newOpenPrice);
            contractOrderEntity.setSymbolCnt(submitOrderDto.getSymbolCnt());
@@ -183,7 +183,7 @@

            wholeHoldOrder.setOpeningFeeAmount(fee);
            wholeHoldOrder.setOpeningPrice(newOpenPrice);
            wholeHoldOrder.setBondAmount(bondAmount);
            wholeHoldOrder.setBondAmount(bondAmount.add(fee));
            wholeHoldOrder.setSymbolCnt(wholeHoldOrder.getSymbolCnt() + submitOrderDto.getSymbolCnt());
            wholeHoldOrder.setSymbolCntSale(wholeHoldOrder.getSymbolCntSale() + submitOrderDto.getSymbolCnt());
//            wholeHoldOrder.setForceClosingPrice(forceClosingPrice);
@@ -191,7 +191,8 @@
            wholeHoldOrder.setOperateNo(wholeHoldOrder.getOperateNo() + 1);
            int i = contractHoldOrderDao.updateById(wholeHoldOrder);
            if (i > 0) {
                memberWalletContractDao.increaseWalletContractBalanceById(subBondAmount.add(openFeePrice).negate(), openFeePrice.negate(), null, walletContract.getId());
                BigDecimal total = subBondAmount.add(openFeePrice).add(openFeePrice);
                memberWalletContractDao.increaseWalletContractBalanceById(total.negate(), openFeePrice.negate(), null, walletContract.getId());

                // 发送爆仓消息
//                sendOrderBombMsg(wholeHoldOrder.getId(), wholeHoldOrder.getOpeningType(), forceClosingPrice, wholeHoldOrder.getSymbol(), wholeHoldOrder.getOperateNo());
@@ -756,9 +757,9 @@
        PlatformTradeSettingEntity tradeSetting = cacheSettingUtils.getTradeSetting();
        BigDecimal newPriceSymbol = new BigDecimal(redisUtils.getString(CoinTypeConvert.convertToKey(symbol)));

        List<ContractEntrustOrderEntity> entrustOrderEntities = new ArrayList<>();
        List<ContractHoldOrderEntity> holdOrderEntities = new ArrayList<>();
        MemberWalletContractEntity walletContractEntity = null;
        List<ContractEntrustOrderEntity> entrustOrderEntities;
        List<ContractHoldOrderEntity> holdOrderEntities;
        MemberWalletContractEntity walletContractEntity;
        if (memberEntity.getContractPositionType().equals(ContractEntrustOrderEntity.POSITION_TYPE_ADD)) {
            // 当前合约委托单
            entrustOrderEntities = contractEntrustOrderDao.selectEntrustOrderListByMemberId(memberEntity.getId());
@@ -962,6 +963,7 @@
        updateEntity.setId(member.getId());
        int i = memberDao.updateById(updateEntity);
        if (i > 0) {
            member.setContractPositionType(positionType);
            LoginUserUtils.resetAppLoginUser(member);
            return Result.ok(MessageSourceUtils.getString("member_service_0040"));
        }