Merge branch 'whole_new' of https://gitee.com/chonggaoxiao/new_excoin into ...

Helius

2021-01-29 93f666908b8b84336aed251a1cc22b49b5c4b12f

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

@@ -197,9 +197,6 @@
            if (i > 0) {
                memberWalletContractDao.increaseWalletContractBalanceById(prePaymentAmount.negate(), openFeePrice.negate(), null, walletContract.getId());

                // 全仓爆仓
                ThreadPoolUtils.sendWholePrice(memberEntity.getId());

                // 发送预估强平价
                ThreadPoolUtils.sendWholeForceClosingPrice(submitOrderDto.getSymbol(), memberEntity);
                // 计算佣金
@@ -211,6 +208,9 @@
                } else {
                    LogRecordUtils.insertMemberAccountFlow(memberEntity.getId(), prePaymentAmount, walletContract.getAvailableBalance().subtract(prePaymentAmount), submitOrderDto.getSymbol(), "买跌持仓", "买跌:" + submitOrderDto.getSymbol());
                }

                // 全仓爆仓
                ThreadPoolUtils.sendWholePrice(memberEntity.getId());

                // 提交成功
                return Result.ok(MessageSourceUtils.getString("member_service_0024"));
@@ -250,9 +250,6 @@
        if (i > 0) {
            memberWalletContractDao.increaseWalletContractBalanceById(prePaymentAmount.negate(), openFeePrice.negate(), null, walletContract.getId());

            // 全仓爆仓
            ThreadPoolUtils.sendWholePrice(memberEntity.getId());

            // 发送预估强平价
            ThreadPoolUtils.sendWholeForceClosingPrice(submitOrderDto.getSymbol(), memberEntity);
            // 计算佣金
@@ -264,6 +261,9 @@
            } else {
                LogRecordUtils.insertMemberAccountFlow(memberEntity.getId(), prePaymentAmount, walletContract.getAvailableBalance().subtract(prePaymentAmount), submitOrderDto.getSymbol(), "买跌持仓", "买跌:" + submitOrderDto.getSymbol());
            }

            // 全仓爆仓
            ThreadPoolUtils.sendWholePrice(memberEntity.getId());

            // 提交成功
            return Result.ok(MessageSourceUtils.getString("member_service_0024"));
@@ -444,7 +444,8 @@
    public Result findHoldOrderList(String symbol, int type) {
        MemberEntity memberEntity = LoginUserUtils.getAppLoginUser();

        List<ContractHoldOrderEntity> list = contractHoldOrderDao.selectHoldOrderListByMemberIdAndSymbol(memberEntity.getId(), symbol, type);
//        List<ContractHoldOrderEntity> list = contractHoldOrderDao.selectHoldOrderListByMemberIdAndSymbol(memberEntity.getId(), symbol, type);
        List<ContractHoldOrderEntity> list = contractHoldOrderDao.selectHoldOrderListByMemberIdAndSymbolTest(memberEntity.getId(),type);
        MemberWalletContractEntity walletContractEntity = memberWalletContractDao.findWalletContractByMemberIdAndSymbol(memberEntity.getId(), CoinTypeEnum.USDT.name());
        if (CollUtil.isNotEmpty(list)) {
            BigDecimal totalProfitOrLoss = BigDecimal.ZERO;