Merge remote-tracking branch 'origin/master'

admin

2019-02-26 4fe5f879c1b2919099a6e193ab4db8d25725ca40

 fanli/src/main/java/com/yeshi/fanli/controller/client/UserMsgController.java

@@ -54,6 +54,7 @@
import com.yeshi.fanli.service.inter.user.UserCustomSettingsService;

import com.yeshi.fanli.service.inter.user.UserInfoService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.RedisManager;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TimeUtil;

import com.yeshi.fanli.util.factory.CommonGoodsFactory;

@@ -102,6 +103,9 @@


   @Resource

   private UserCustomSettingsService userCustomSettingsService;



   @Resource

   private RedisManager redisManager;



   // 消息的类型

   final static String MSG_TYPE_ORDER = "order";

@@ -163,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;

      }



@@ -351,8 +360,9 @@
            }

         }



         if (canAdd && session.getAttribute("recommendgoods") == null) {

            session.setAttribute("recommendgoods", 1);

         String key = "recommend-goods-user-" + uid;

         if (canAdd && StringUtil.isNullOrEmpty(redisManager.getCommonString(key))) {

            redisManager.cacheCommonString(key, "1", 20);

            if (hour < 12)

               addRecommendGoods(uid);

            else

@@ -406,7 +416,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++;// 计算欢迎语的数量