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

yujian

2019-08-27 d8359ddb48dab5cc797a9d552e11fde571f4920c

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

@@ -243,6 +243,9 @@
            if(codePublishRecordService.countValidRecord(uid) > 0)

               throw new IntegralExchangeException(1, "三天之内不可重复兑换");

            codePublishRecordService.publishInviteCode(uid);

				
            exchange.setNeedJump(true);

            exchange.setBtnName("去查看");

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

            thing = "推广红包";

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

@@ -320,7 +323,6 @@
         

         if (once) // 兑换之后消失

            exchange = null;

			
         

         return exchange;

      } catch (Exception e) {