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

xiaoyong931011

2021-01-26 5003922498b3780660217ef2c77c50b836e166a3

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

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

@@ -855,7 +855,7 @@
                contractOrderService.save(contractOrderEntity);

                //更新用户钱包数据
                MemberWalletContractEntity usdt = memberWalletContractService.findWalletContractByMemberIdAndSymbol(memId, "USDT");
                MemberWalletContractEntity usdt = memberWalletContractService.findWalletContractByMemberIdAndSymbol(memId, CoinTypeConvert.convertContractTypeToCoin(coinsOrder.getSymbol()));

                // 减去的时候用负数
                BigDecimal totalPrice = coinsOrder.getBondAmount().negate();
@@ -872,7 +872,7 @@
                record.setPrice(coinsOrder.getBondAmount());
                memberAccountFlowEntityDao.insert(record);
            } else {
                MemberWalletContractEntity wallet = memberWalletContractService.findWalletContractByMemberIdAndSymbol(memId, CoinTypeConvert.convertContractTypeToCoin(coinsOrder.getSymbol()));
                MemberWalletContractEntity wallet = memberWalletContractService.findWalletContractByMemberIdAndSymbol(memId, "USDT");

//                BigDecimal rewardRatio = BigDecimal.ZERO;
//                // 开多