Merge branch 'div_8'

yujian

2019-05-14 26b5b1a6bbbb5ff64dc2ec73cf8b11f1aa61c1c5

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

@@ -578,8 +578,16 @@
         Date createTime = deviceActive.getCreateTime();

         List<PushGoods> list = pushGoodsService.listHistoryByPushTime(0, 1, uid, createTime);

         if (list != null && list.size() > 0) {

            MsgDeviceReadState state = msgDeviceReadStateService.getByDeviceAndPlatformAndType(

                  UserCommonMsgVO.TYPE_ZHUSHOU, acceptData.getDevice(),

                  acceptData.getPlatform().equalsIgnoreCase("android") ? 1 : 2);

            boolean read=false;

            if (state != null && state.getReadTime() != null

                  &&  list.get(0).getCreateTime().getTime() < state.getReadTime().getTime())

               read = true;

				
            commonMsgList.add(new UserCommonMsgVO("http://img.flqapp.com/resource/msg/icon_recommend.png", "推荐记录",

                  list.get(0).getCreateTime(), UserCommonMsgVO.TYPE_RECOMMEND, list.get(0).getContent(), false,

                  list.get(0).getCreateTime(), UserCommonMsgVO.TYPE_RECOMMEND, list.get(0).getContent(), read,

                  jumpDetailV2Service.getByTypeCache("recommend_list"), null));

         }

      }

@@ -886,7 +894,7 @@
         msgDeviceReadStateService.setDeviceMsgRead(UserCommonMsgVO.TYPE_RECOMMEND, acceptData.getDevice(),

               (acceptData.getPlatform().equalsIgnoreCase("android") ? 1 : 2));

      } else if (type.equalsIgnoreCase(UserCommonMsgVO.TYPE_ZHUSHOU)) {

         msgDeviceReadStateService.setDeviceMsgRead(UserCommonMsgVO.TYPE_RECOMMEND, acceptData.getDevice(),

         msgDeviceReadStateService.setDeviceMsgRead(UserCommonMsgVO.TYPE_ZHUSHOU, acceptData.getDevice(),

               (acceptData.getPlatform().equalsIgnoreCase("android") ? 1 : 2));

      }

      out.print(JsonUtil.loadTrueResult(""));