客服消息修改，新版大淘客数据添加

admin

2019-06-10 6b8ab82d1d7fb9d44d85eeb1dfd2e36d3c28c9cf

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

@@ -576,6 +576,27 @@
      out.print(JsonUtil.loadTrueResult(root));

   }



   private UserCommonMsgVO getKeFuMsg(AcceptData acceptData) {

      MsgDeviceReadState kefuState = msgDeviceReadStateService.getByDeviceAndPlatformAndType(

            UserCommonMsgVO.TYPE_KEFU, acceptData.getDevice(),

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

      // 人工客服

      UserCommonMsgVO vo = new UserCommonMsgVO("http://img.flqapp.com/resource/msg/icon_kefu.png", "人工客服", new Date(),

            UserCommonMsgVO.TYPE_KEFU, "", false, null, null, 0);

      if (kefuState != null) {

         vo.setUnReadCount(kefuState.getUnReadCount() == null ? 0 : kefuState.getUnReadCount());

         if (!StringUtil.isNullOrEmpty(kefuState.getLatestContent()))

            vo.setLatestMsg(kefuState.getLatestContent());



         if (vo.getUnReadCount() != null && vo.getUnReadCount() > 0)

            vo.setRead(false);

         else

            vo.setRead(true);

      }



      return vo;

   }



   /**

    * 获取消息列表

    * 

@@ -600,7 +621,7 @@
      // 官宣任务

      if (uid != null) {

         MsgCommonDTO guanXuanMsg = msgConfigService.getGuanXuanMsg();

         if (guanXuanMsg != null&&guanXuanMsg.getShow()==true) {

         if (guanXuanMsg != null && guanXuanMsg.getShow() == true) {

            boolean read = false;

            UserMsgUnReadNum num = userMsgReadStateService.getReadStateByUid(uid);

            if (num != null && (num.getGuanXuanReadTime() != null

@@ -613,16 +634,14 @@
            } else

               commonMsgList.add(new UserCommonMsgVO(guanXuanMsg.getIcon(), guanXuanMsg.getTitle(),

                     guanXuanMsg.getUpdateTime(), UserCommonMsgVO.TYPE_GUANXUAN, guanXuanMsg.getContent(), read,

                     guanXuanMsg.getJumpDetail(), guanXuanMsg.getParams()));

                     guanXuanMsg.getJumpDetail(), guanXuanMsg.getParams(), 0));

         }

      }



      // 返利券小助手

      MsgCommonDTO zhuShouMsg = msgConfigService.getZhuShouMsg();

      if (zhuShouMsg != null&&zhuShouMsg.getShow()==true) {



      if (zhuShouMsg != null && zhuShouMsg.getShow() == true) {

         boolean read = false;



         MsgDeviceReadState state = msgDeviceReadStateService.getByDeviceAndPlatformAndType(

               UserCommonMsgVO.TYPE_ZHUSHOU, acceptData.getDevice(),

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

@@ -637,12 +656,11 @@
         } else

            commonMsgList.add(new UserCommonMsgVO(zhuShouMsg.getIcon(), zhuShouMsg.getTitle(),

                  zhuShouMsg.getUpdateTime(), UserCommonMsgVO.TYPE_ZHUSHOU, zhuShouMsg.getContent(), read,

                  zhuShouMsg.getJumpDetail(), zhuShouMsg.getParams()));

                  zhuShouMsg.getJumpDetail(), zhuShouMsg.getParams(), 0));

      }



      // 人工客服

      commonMsgList.add(new UserCommonMsgVO("http://img.flqapp.com/resource/msg/icon_kefu.png", "人工客服", new Date(),

            UserCommonMsgVO.TYPE_KEFU, "", false, null, null));

      commonMsgList.add(getKeFuMsg(acceptData));



      // 推荐记录

      DeviceActive deviceActive = deviceActiveService.getDeviceByDeviceAndPlatform(acceptData.getDevice(),

@@ -662,7 +680,7 @@


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

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

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

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

         }

      }