Merge remote-tracking branch 'origin/master'

admin

2019-02-26 a381a654833decf21cad316ffbda8b3e9c834118

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

@@ -112,6 +112,7 @@
   final static String MSG_TYPE_MONEY = "money";

   final static String MSG_TYPE_ACCOUNT = "account";

   final static String MSG_TYPE_INVITE = "invite";

   final static String MSG_TYPE_OTHER = "other";



   /**

    * 获取订单消息列表

@@ -361,13 +362,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");

         }

      }