Merge branch 'activity' of http://120.27.238.55:7000/r/exchange into activity

Helius

2021-03-30 2cdf732d4130b227514d2c0ba1e40e6c1cece54a

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

@@ -205,10 +205,9 @@
                        //带单返利的记录要在资产页面的其他记录
                        LogRecordUtils.insertMemberAccountMoneyChange(
                              traderInfoEntity.getMemberId(),
                                StrUtil.format(NoticeConstant.RETURN_MONEY_CONTENT,
                                StrUtil.format(NoticeConstant.RETURN_MONEY_CONTENT_MAMC,
                                        orderNo,
                                      holdOrderEntity.getSymbol(),
                                        returnMoney.setScale(2, BigDecimal.ROUND_HALF_UP).toString()), 
                                      holdOrderEntity.getSymbol()),
                              returnMoney.setScale(2, BigDecimal.ROUND_HALF_UP),
                              MemberWalletCoinEnum.WALLETCOINCODE.getValue(),
                              MemberAccountMoneyChange.STATUS_SUCCESS_INTEGER,