admin
2019-11-12 0cf8c0bf5649b0b7269f78f6eae7c09cffea75cd
fanli/src/main/java/com/yeshi/fanli/service/impl/user/TokenRecordServiceImpl.java
@@ -171,7 +171,7 @@
            state = true;
            UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
            if (userInfoExtra == null || StringUtil.isNullOrEmpty(userInfoExtra.getInviteCode())) {
               tips.add("确认领取后,你将成为赠送者的一级队员;");
               tips.add("确认领取后,你将成为赠送人的一级队员;");
               tips.add("获赠的免单券,需要激活后才能使用,详情参见免单券激活规则;");
               tips.add("成功领取后,请到“我的-福利中心”查看。");
            } else {
@@ -207,7 +207,7 @@
            state = true;
            UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
            if (userInfoExtra == null || StringUtil.isNullOrEmpty(userInfoExtra.getInviteCode())) {
               tips.add("确认领取后,你将成为赠送者的一级队员;");
               tips.add("确认领取后,你将成为赠送人的一级队员;");
               tips.add("板栗快省奖励券,可用于“已到账”的返利订单,在返利的基础上再获得一定比例的返利;");
               tips.add("成功领取后,请到“我的-福利中心”中查看。");
            } else {
@@ -238,7 +238,7 @@
            state = true;
            UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
            if (userInfoExtra == null || StringUtil.isNullOrEmpty(userInfoExtra.getInviteCode())) {
               tips.add("确认领取后,你将成为增值的一级队员;");
               tips.add("确认领取后,你将成为赠送人的一级队员;");
               tips.add("红包可提现,可购买折扣商品;");
               tips.add("成功领取后,请到“我的-红包”中查看。");
            } else {
@@ -507,7 +507,7 @@
         try {
            msg = "领取红包成功,请到[我的-红包]中查看";
            // 领取红包、更新记录
            RedPackGiveRecord giveRecord = redPackGiveRecordService.receiveFriendsGive(uidToken, Long.parseLong(identify));
            RedPackGiveRecord giveRecord = redPackGiveRecordService.receiveFriendsGive(uid, Long.parseLong(identify));
            // 消息 + 队员
            executor.execute(new Runnable() {
               @Override
@@ -534,7 +534,7 @@
                  dto.setUserInfo("昵称:" + giveUserName + " ID:" + giveUid);
                  dto.setTime(sd.format(giveRecord.getGiveTime()));
                  dto.setMoney("¥" + giveRecord.getAmount().setScale(2));
                  userMoneyMsgNotificationService.redPackMsg(giveUid, MsgTypeMoneyTypeEnum.redPackReceiveOff, new Gson().toJson(dto), beiZhu);
                  userMoneyMsgNotificationService.redPackMsg(uid, MsgTypeMoneyTypeEnum.redPackReceiveOff, new Gson().toJson(dto), beiZhu);
                  
                  // 赠送人消息
                  String userName = "无";
@@ -542,7 +542,7 @@
                  if (user != null && !StringUtil.isNullOrEmpty(user.getNickName()))
                     userName = user.getNickName();
                  MsgRedPackGiveContentDTO givedto = new MsgRedPackGiveContentDTO();
                  givedto.setTitle("红包领取");
                  givedto.setTitle("红包赠送");
                  givedto.setUserInfo("昵称:" + userName + " ID:" + uid);
                  givedto.setTime(sd.format(new Date()));
                  givedto.setMoney("¥" + giveRecord.getAmount().setScale(2));