modify

Helius

2020-10-14 964faf360762524aed9dc9eeab73cc9ef08ffe03

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

@@ -770,7 +770,7 @@


    @Override

    public Result findAllWalletCoinOrder() {

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

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

        return Result.ok(orderCoinsDealEntities);

    }



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

    public void dealEntrustCoinOrder() {

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

        ignoreTypes.add(SymbolsConstats.ROC);

        ignoreTypes.add(SymbolsConstats.RFNC);

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

        if (CollUtil.isNotEmpty(list)) {

            for (OrderCoinsEntity orderCoinsEntity : list) {

@@ -1077,14 +1077,13 @@
        if (CollectionUtils.isNotEmpty(trades)) {

            for (OrderCoinsEntity trade : trades) {

                if (trade != null) {

                    orderCoinsDao.updateStatus(trade.getId(),OrderCoinsEntity.ORDERSTATUS_DONE);

                    //orderCoinsDao.updateStatus(trade.getId(),OrderCoinsEntity.ORDERSTATUS_DONE);

                    ids.add(trade.getId());

                    // 买单 实际成交金额小于委托的 这一部分从冻结扣除

                    if(OrderCoinsEntity.ORDERTYPE_BUY==trade.getOrderType()){

                        if(trade.getEntrustAmount().compareTo(trade.getDealAmount())>0){

                            // 此时退回这部分的差额

                            BigDecimal subtract = trade.getEntrustAmount().subtract(trade.getDealAmount());

                            System.out.println(subtract);

                            MemberWalletCoinEntity memberWalletCoinEntity = memberWalletCoinDao.selectWalletCoinBymIdAndCode(trade.getMemberId(), CoinTypeEnum.USDT.name());

                            if(memberWalletCoinEntity!=null){

                                memberWalletCoinDao.updateWalletBalance(memberWalletCoinEntity.getId(),subtract,null,subtract.negate());

@@ -1095,7 +1094,7 @@
            }

        }

        if (CollectionUtils.isNotEmpty(ids)) {

           // orderCoinsDao.batchUpdateStatus(ids, OrderCoinsEntity.ORDERSTATUS_DONE);

            orderCoinsDao.batchUpdateStatus(ids, OrderCoinsEntity.ORDERSTATUS_DONE);

        }

    }