Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-12-07 8c93d2e3b22ac543f8f94c2cf0eb982258fb708b

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/integral/IntegralExchangeServiceImpl.java

@@ -266,9 +266,7 @@
            exchange.setNeedJump(true);

            exchange.setBtnName("去查看");

         } else if (ExchangeTypeEnum.taoLiJin == type) {

            thing = "推广红包";

            thingNum = exchange.getAmount() + "元";

            userTaoLiJinOriginService.exchangeMoney(uid, exchange.getAmount());

            throw new IntegralExchangeException(1, "推广红包相关功能已下线！");

         } else if (ExchangeTypeEnum.cash == type) {

            thing = "现金红包";

            BigDecimal money = exchange.getAmount();