modify

Helius

2020-07-03 94ea5d9a1639d0b8be60cf729d5bf988c97c0145

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

@@ -92,7 +92,7 @@
            PlatformTradeSettingEntity tradeSettingEntity = cacheSettingUtils.getTradeSetting();

            // 保证金计算 -- 建仓价X规格X手数X（1/杠杆倍率）
            BigDecimal bondAmount = submitEntrustDto.getEntrustPrice().multiply(lotNumber).multiply((BigDecimal.ONE.divide(BigDecimal.valueOf(submitEntrustDto.getLeverRatio()), 8, BigDecimal.ROUND_DOWN)));
            BigDecimal bondAmount = submitEntrustDto.getEntrustPrice().multiply(lotNumber).multiply(new BigDecimal(submitEntrustDto.getSymbolCnt())).multiply((BigDecimal.ONE.divide(BigDecimal.valueOf(submitEntrustDto.getLeverRatio()), 8, BigDecimal.ROUND_DOWN)));

            // 开仓手续费 建仓价*规格*手数*手续费率
            BigDecimal openFeePrice = submitEntrustDto.getEntrustPrice().multiply(lotNumber)
@@ -121,9 +121,7 @@

            int i = contractEntrustOrderDao.insert(entrustOrderEntity);

            walletContract.setFrozenBalance(walletContract.getFrozenBalance().add(entrustTotalAmount));
            walletContract.setAvailableBalance(walletContract.getAvailableBalance().subtract(entrustTotalAmount));
            memberWalletContractDao.updateById(walletContract);
            memberWalletContractDao.increaseWalletContractBalanceById(entrustTotalAmount.negate(), null, entrustOrderEntity.getBondAmount(), walletContract.getId());
            if (i > 0) {

                // 发送委托单队列消息
@@ -149,9 +147,9 @@
    }

    @Override
    public Result findEntrustOrderList() {
    public Result findEntrustOrderList(String symbol) {
        MemberEntity memberEntity = LoginUserUtils.getAppLoginUser();
        List<ContractEntrustOrderEntity> list = contractEntrustOrderDao.selectEntrustOrderListByMemberId(memberEntity.getId());
        List<ContractEntrustOrderEntity> list = contractEntrustOrderDao.selectEntrustOrderListByMemberIdAndSymbol(memberEntity.getId(), symbol);
        List<ContractEntrustVo> resultList = ContractEntrustOrderEntityMapper.INSTANCE.entityListToVoList(list);
        return Result.ok(resultList);
    }
@@ -170,13 +168,11 @@
        MemberWalletContractEntity walletContractEntity = memberWalletContractDao.findWalletContractByMemberIdAndSymbol(memberEntity.getId(), MemberWalletCoinEnum.WALLETCOINCODE.getValue());

        BigDecimal total = entrustOrderEntity.getEntrustAmount();
        walletContractEntity.setAvailableBalance(walletContractEntity.getAvailableBalance().add(total));
        walletContractEntity.setFrozenBalance(walletContractEntity.getFrozenBalance().subtract(total));
        memberWalletContractDao.updateById(walletContractEntity);
        memberWalletContractDao.increaseWalletContractBalanceById(total, null, entrustOrderEntity.getBondAmount().negate(), walletContractEntity.getId());

        ContractOrderEntity orderEntity = ContractEntrustOrderEntityMapper.INSTANCE.entrustOrderToOrder(entrustOrderEntity);
        orderEntity.setTradeType(ContractOrderEntity.TRADE_TYPE_MARK_PRICE);
        orderEntity.setOrderType(ContractOrderEntity.ORDER_TYPE_CANCEL);
        orderEntity.setOrderStatus(ContractOrderEntity.ORDER_STATUS_CANCEL);
        int i = contractOrderDao.insert(orderEntity);

        contractEntrustOrderDao.deleteById(entrustOrderEntity.getId());