admin
2019-02-26 52ae4f687bd246d6b200ed8605ddcb4631f83b84
fanli/src/main/java/com/yeshi/fanli/controller/client/UserMsgController.java
@@ -167,8 +167,13 @@
         List<MsgInviteDetail> detailList3 = msgInviteDetailService.listMsgInviteDetail(uid, page);
         count = msgInviteDetailService.countMsgInviteDetail(uid);
         if (detailList3 != null)
            for (MsgInviteDetail detail : detailList3)
               list.add(UserMsgVOFactory.create(detail));
            for (MsgInviteDetail detail : detailList3) {
               UserMsgVO vo = UserMsgVOFactory.create(detail);
               if (vo != null)
                  list.add(vo);
               else
                  count--;
            }
         break;
      }
@@ -356,13 +361,21 @@
         }
         String key = "recommend-goods-user-" + uid;
         if (canAdd && StringUtil.isNullOrEmpty(redisManager.getCommonString(key))) {
            redisManager.cacheCommonString(key, "1", 20);
         if (Constant.IS_OUTNET) {
            if (canAdd && StringUtil.isNullOrEmpty(redisManager.getCommonString(key))) {
               if (Constant.IS_OUTNET)
                  redisManager.cacheCommonString(key, "1", 20);
               if (hour < 12)
                  addRecommendGoods(uid);
               else
                  addRecommendGoods(uid, acceptData.getImei(), acceptData.getIdfa());
               session.removeAttribute("recommendgoods");
            }
         } else {
            if (hour < 12)
               addRecommendGoods(uid);
            else
               addRecommendGoods(uid, acceptData.getImei(), acceptData.getIdfa());
            session.removeAttribute("recommendgoods");
         }
      }
@@ -411,7 +424,7 @@
         volist.add(vo);
      }
      Long time = userInfoService.getUserById(uid).getCreatetime();
      Long time = userInfoService.selectByPKey(uid).getCreatetime();
      if (time > TimeUtil.convertToTimeTemp("2019-01-28", "yyyy-MM-dd"))
         count++;// 计算欢迎语的数量