20200530 代码提交

xiaoyong931011

2020-05-30 d2e6c0aba08b697ca5618affc2c34af9a37bbe2b

20200530  代码提交

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

@@ -154,8 +154,7 @@


    @Override

    @Transactional

    public Result submitSalesWalletCoinOrder(String symbol, Integer type, Integer tradeType, BigDecimal price,

            BigDecimal amount) {

    public Result submitSalesWalletCoinOrder(String symbol, Integer type, Integer tradeType, BigDecimal price,BigDecimal amount) {

            //获取用户ID

            Long memberId = LoginUserUtils.getAppLoginUser().getId();

            

@@ -278,7 +277,8 @@
                    walletCoin.setAvailableBalance(walletCoin.getAvailableBalance().subtract(amount).setScale(4, BigDecimal.ROUND_DOWN));

                    memberWalletCoinDao.updateById(walletCoin);

                    

                    walletCoinUsdt.setAvailableBalance(walletCoinUsdt.getAvailableBalance().add(totalPayPrice).setScale(4, BigDecimal.ROUND_DOWN));

                    BigDecimal subtract = totalPayPrice.subtract(closingPrice).subtract(closingPrice);

                    walletCoinUsdt.setAvailableBalance(walletCoinUsdt.getAvailableBalance().add(subtract).setScale(4, BigDecimal.ROUND_DOWN));

                    memberWalletCoinDao.updateById(walletCoinUsdt);

                }

            }

@@ -335,7 +335,7 @@
                    

                    String symbol = orderCoinsEntity.getSymbol();

                    

                    if(orderCoinsEntity.getOrderType() == OrderCoinsEntity.TRADETYPE_FIXEDPRICE) {

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

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

                        String walletCode = MemberWalletCoinEnum.WALLETCOINCODE.getValue();

                        MemberWalletCoinEntity walletCoin = memberWalletCoinDao.selectWalletCoinBymIdAndCode(memberId, walletCode);

@@ -343,7 +343,7 @@
                        if (ObjectUtil.isNotEmpty(walletCoin)) {

                            //手续费 = 开仓价*数量*手续费率

                            //返还金额=开仓价*未成交数量+手续费

                            BigDecimal returnBalance = orderCoinsEntity.getDealAmount().add(orderCoinsEntity.getFeeAmount());

                            BigDecimal returnBalance = orderCoinsEntity.getDealAmount();

                            

                            walletCoin.setAvailableBalance(walletCoin.getAvailableBalance().add(returnBalance).setScale(4, BigDecimal.ROUND_DOWN));

                            walletCoin.setFrozenBalance(walletCoin.getFrozenBalance().subtract(returnBalance).setScale(4, BigDecimal.ROUND_DOWN));