modify

Helius

2020-08-26 e75642b807e0382d2c1959dc83bae79deb1110d6

modify

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

@@ -255,12 +255,15 @@
        MemberWalletContractEntity walletContractEntity;
        if (ContractEntrustOrderEntity.POSITION_TYPE_ADD == entrustOrderEntity.getPositionType()) {
            walletContractEntity = memberWalletContractDao.findWalletContractByMemberIdAndSymbol(memberEntity.getId(), MemberWalletCoinEnum.WALLETCOINCODE.getValue());

            BigDecimal total = entrustOrderEntity.getEntrustAmount();
            memberWalletContractDao.increaseWalletContractBalanceById(total, null, entrustOrderEntity.getBondAmount().negate(), walletContractEntity.getId());

            // 插入财务流水
            LogRecordUtils.insertMemberAccountFlow(memberEntity.getId(), total, walletContractEntity.getAvailableBalance().add(total), entrustOrderEntity.getSymbol(), "撤销委托单", "撤销委托单");
        } else {
            walletContractEntity = memberWalletContractDao.findWalletContractByMemberIdAndSymbol(memberEntity.getId(), CoinTypeConvert.convertContractTypeToCoin(entrustOrderEntity.getSymbol()));
        }

        BigDecimal total = entrustOrderEntity.getEntrustAmount();
        memberWalletContractDao.increaseWalletContractBalanceById(total, null, entrustOrderEntity.getBondAmount().negate(), walletContractEntity.getId());

        ContractOrderEntity orderEntity = ContractEntrustOrderEntityMapper.INSTANCE.entrustOrderToOrder(entrustOrderEntity);
        orderEntity.setTradeType(ContractOrderEntity.TRADE_TYPE_MARK_PRICE);
@@ -269,8 +272,6 @@

        contractEntrustOrderDao.deleteById(entrustOrderEntity.getId());

        // 插入财务流水
        LogRecordUtils.insertMemberAccountFlow(memberEntity.getId(), total, walletContractEntity.getAvailableBalance().add(total), entrustOrderEntity.getSymbol(), "撤销委托单", "撤销委托单");
        if (i > 0) {
            return Result.ok(MessageSourceUtils.getString("cancellation_success"));
        }
@@ -343,6 +344,7 @@
        ContractEntrustOrderEntity entrustOrder = new ContractEntrustOrderEntity();
        entrustOrder.setOrderNo(holdOrderEntity.getOrderNo());
        entrustOrder.setEntrustAmount(bondAmount);
        entrustOrder.setBondAmount(bondAmount);
        entrustOrder.setPositionType(ContractEntrustOrderEntity.POSITION_TYPE_ALL);
        entrustOrder.setMemberId(member.getId());
        entrustOrder.setEntrustPrice(submitCloseEntrustDto.getEntrustPrice());