20200602 代码提交

xiaoyong931011

2020-06-02 e9417d5cb8ccb2324e56ac8a25af97af45cc8c2c

20200602   代码提交

 src/main/java/com/xcong/excoin/modules/blackchain/service/Impl/BlockSeriveImpl.java

@@ -187,6 +187,7 @@
                        coinAddress.setPrivateKey(key);

                        coinAddress.setSymbol("ETH");

                        coinAddress.setLabel(uuid);

                        coinAddress.setTag("ERC20");

                        memberMapper.insert(coinAddress);

                    }

                }


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

@@ -327,6 +327,21 @@
                    

                    String symbol = orderCoinsEntity.getSymbol();

                    

                    OrderCoinsDealEntity detail = new OrderCoinsDealEntity();

                    detail.setMemberId(memberId);

                    detail.setOrderId(orderCoinsEntity.getId());

                    detail.setOrderNo(generateSimpleSerialno(memberId.toString()));

                    detail.setOrderType(orderCoinsEntity.getOrderType());

                    detail.setTradeType(orderCoinsEntity.getTradeType());

                    detail.setSymbol(symbol);

                    detail.setOrderStatus(OrderCoinsDealEntity.ORDERSTATUS_CANCEL);

                    detail.setSymbolCnt(orderCoinsEntity.getEntrustCnt());

                    detail.setEntrustPrice(orderCoinsEntity.getEntrustPrice().setScale(4, BigDecimal.ROUND_DOWN));

                    detail.setDealPrice(orderCoinsEntity.getDealPrice().setScale(4, BigDecimal.ROUND_DOWN));

                    detail.setDealAmount(orderCoinsEntity.getDealAmount().setScale(4, BigDecimal.ROUND_DOWN));

                    detail.setFeeAmount(orderCoinsEntity.getFeeAmount().setScale(4, BigDecimal.ROUND_DOWN));

                    orderCoinDealDao.insert(detail);

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

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

                        String walletCode = MemberWalletCoinEnum.WALLETCOINCODE.getValue();

@@ -372,20 +387,6 @@
                            return Result.ok(MessageSourceUtils.getString("order_service_0013"));

                        }

                    }

                    OrderCoinsDealEntity detail = new OrderCoinsDealEntity();

                    detail.setMemberId(memberId);

                    detail.setOrderId(orderCoinsEntity.getId());

                    detail.setOrderNo(generateSimpleSerialno(memberId.toString()));

                    detail.setOrderType(orderCoinsEntity.getOrderType());

                    detail.setTradeType(orderCoinsEntity.getTradeType());

                    detail.setSymbol(symbol);

                    detail.setOrderStatus(OrderCoinsDealEntity.ORDERSTATUS_CANCEL);

                    detail.setSymbolCnt(orderCoinsEntity.getEntrustCnt());

                    detail.setEntrustPrice(orderCoinsEntity.getEntrustPrice().setScale(4, BigDecimal.ROUND_DOWN));

                    detail.setDealPrice(orderCoinsEntity.getDealPrice().setScale(4, BigDecimal.ROUND_DOWN));

                    detail.setDealAmount(orderCoinsEntity.getDealAmount().setScale(4, BigDecimal.ROUND_DOWN));

                    detail.setFeeAmount(orderCoinsEntity.getFeeAmount().setScale(4, BigDecimal.ROUND_DOWN));

                    orderCoinDealDao.insert(detail);

                }

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

    }