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

yujian

2019-08-21 1aa0a5f84f41ba08c8a37404fdc2ca7bb9b30d2d

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

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/TokenRecordServiceImpl.java

@@ -102,7 +102,7 @@
        if (StringUtil.isNullOrEmpty(parseToken)) 

            throw new TokenRecordException(1, "未发现口令");

        

        TokenRecord rokenRecord = tokenRecordMapper.getByToken(token);

        TokenRecord rokenRecord = tokenRecordMapper.getByToken(parseToken);

        if (rokenRecord == null)

            throw new TokenRecordException(1, "口令不存在");



@@ -256,7 +256,7 @@
        

        TokenVO tokenVO = new TokenVO();

        tokenVO.setAmount(num);

        tokenVO.setToken(token);

        tokenVO.setToken(parseToken);

        tokenVO.setNickName(nickName + "赠送");

        tokenVO.setPortrait(portrait);

        tokenVO.setTips(tips);