Merge branch 'mater-1.6.0' into div

admin

2019-08-23 d1bcc87e41d8d176ce58ee9e27a17ec93d0d7cb2

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

@@ -102,10 +102,14 @@
      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, "口令不存在");



      Long uidToken = rokenRecord.getUid();

      if (uid != null && uidToken != null && uid.longValue() == uidToken.longValue())

         throw new TokenRecordException(1, "不能自己赠送给自己");

		
      Date now = new Date();

      Date endTimeToken = rokenRecord.getEndTime();

      Integer stateTtoken = rokenRecord.getState();

@@ -252,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);

@@ -274,7 +278,11 @@
      TokenRecord rokenRecord = tokenRecordMapper.getByToken(token);

      if (rokenRecord == null)

         throw new TokenRecordException(1, "口令已失效");



		
      Long uidToken = rokenRecord.getUid();

      if (uidToken != null && uid.longValue() == uidToken.longValue())

         throw new TokenRecordException(1, "不能自己赠送给自己");

		
      Date now = new Date();

      Date endTimeToken = rokenRecord.getEndTime();

      if (endTimeToken != null && endTimeToken.getTime() < now.getTime())

@@ -365,7 +373,7 @@
               msgOther.setType(MsgOtherGiveContentDTO.TYEP_COUPON);

               msgOther.setTitle("赠送免单券");

               msgOther.setGiveType("你赠送的免单券被成功领取");

               msgOther.setReceiveInfo("昵称:  " + userName + " ID:" + uid);

               msgOther.setReceiveInfo("昵称: ：" + userName + " ID：" + uid);

               msgOther.setGiveTime(sd.format(giveRecord.getGiveTime()));

               msgOther.setReceiveTime(sd.format(new Date()));

               userOtherMsgNotificationService.tokenGiveMsg(giveUid, beiZhu, msgOther);

@@ -487,7 +495,7 @@
                     userName = user.getNickName();



                  MsgOtherGiveContentDTO msgOther = new MsgOtherGiveContentDTO();

                  msgOther.setType(MsgOtherGiveContentDTO.TYEP_COUPON);

                  msgOther.setType(MsgOtherGiveContentDTO.TYEP_TLJ);

                  msgOther.setTitle("赠送推广红包");

                  msgOther.setGiveType("你赠送的推广红包被成功领取");

                  msgOther.setReceiveInfo("昵称:  " + userName + " ID:" + uid);