Merge branches 'cpv' and 'feature/撮合交易' of https://gitee.com/chonggaoxiao/n...

zainali5120

2020-10-12 335ec6398bb70d60a765b4782376e8141cbfa9cf

 src/main/java/com/xcong/excoin/modules/coin/service/impl/OrderCoinServiceImpl.java

@@ -520,7 +520,7 @@
            if (SymbolsConstats.EXCHANGE_SYMBOLS.contains(orderCoinsEntity.getSymbol())) {

                orderSubmitProducer.sendCancelMsg(orderId);

               // return this.cancelEntrustWalletCoinOrderForMatch(orderId);

                return Result.ok("order_service_0013");

                return Result.ok(MessageSourceUtils.getString("order_service_0013"));

            }

            if (orderCoinsEntity.getOrderStatus() == OrderCoinsEntity.ORDERSTATUS_CANCEL || orderCoinsEntity.getOrderStatus()==OrderCoinsEntity.ORDERSTATUS_DONE) {

                return Result.fail(MessageSourceUtils.getString("order_service_0012"));

@@ -628,8 +628,6 @@
            detail.setDealPrice(orderCoinsEntity.getDealPrice());

            detail.setDealAmount(orderCoinsEntity.getDealAmount());

            detail.setFeeAmount(orderCoinsEntity.getFeeAmount());

            orderCoinDealDao.insert(detail);



            if (OrderCoinsEntity.ORDERTYPE_BUY.equals(orderCoinsEntity.getOrderType())) {

                //如果是限价买入，撤单将USDT账户冻结金额返回

                String walletCode = MemberWalletCoinEnum.WALLETCOINCODE.getValue();

@@ -658,7 +656,7 @@
                        BigDecimal needFee = orderCoinsEntity.getFeeAmount().multiply(dealAmount.divide(orderCoinsEntity.getEntrustAmount(), 8, BigDecimal.ROUND_DOWN));

                        returnFee = orderCoinsEntity.getFeeAmount().subtract(needFee);

                    }

                    BigDecimal avi = walletCoin.getAvailableBalance().add(returnBalance).add(returnFee);

                    BigDecimal avi = returnBalance.add(returnFee);

                    memberWalletCoinDao.updateWalletBalance(walletCoin.getId(),avi,null,returnBalance.negate());

                    walletCoin.setAvailableBalance(walletCoin.getAvailableBalance().add(returnBalance).add(returnFee));

                    walletCoin.setFrozenBalance(walletCoin.getFrozenBalance().subtract(returnBalance));

@@ -695,6 +693,7 @@
                    return Result.ok(MessageSourceUtils.getString("order_service_0013"));

                }

            }

            orderCoinDealDao.insert(detail);

        }

        return Result.fail(MessageSourceUtils.getString("order_service_0043"));

    }

@@ -736,7 +735,7 @@


    @Override

    public Result findAllWalletCoinOrder() {

        List<OrderCoinsDealEntity> orderCoinsDealEntities = orderCoinDealDao.selectAllCoinDealsOrderBySymbol(CoinTypeEnum.ROC.toString());

        List<OrderCoinsDealEntity> orderCoinsDealEntities = orderCoinDealDao.selectAllCoinDealsOrderBySymbol(CoinTypeEnum.CPV.toString());

        return Result.ok(orderCoinsDealEntities);

    }



@@ -855,7 +854,7 @@
    @Transactional(rollbackFor = Exception.class)

    public void dealEntrustCoinOrder() {

        List<String> ignoreTypes = new ArrayList<>();

        ignoreTypes.add(SymbolsConstats.ROC);

        ignoreTypes.add(SymbolsConstats.CPV);

        List<OrderCoinsEntity> list = orderCoinsDao.selectAllEntrustingCoinOrderList(ignoreTypes);

        if (CollUtil.isNotEmpty(list)) {

            for (OrderCoinsEntity orderCoinsEntity : list) {

@@ -1094,12 +1093,5 @@
            }

        }

    }



    @Override

    public void initOrders(String symbol, Integer type, Integer tradeType, BigDecimal price,

                           BigDecimal amount, BigDecimal entrustAmount) {



    }





}