Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-08-16 e97b71caed03d1f1aa3ae21b1ea0deac4dd9ffe0

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

@@ -39,6 +39,7 @@
import com.yeshi.fanli.entity.bus.msg.MsgInviteDetail;

import com.yeshi.fanli.entity.bus.msg.MsgMoneyDetail;

import com.yeshi.fanli.entity.bus.msg.MsgOrderDetail;

import com.yeshi.fanli.entity.bus.msg.MsgOrderDetail.MsgTypeOrderTypeEnum;

import com.yeshi.fanli.entity.bus.msg.MsgOtherDetail;

import com.yeshi.fanli.entity.bus.msg.UserMsgUnReadNum;

import com.yeshi.fanli.entity.bus.msg.UserSystemMsg;

@@ -77,6 +78,8 @@
import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TimeUtil;

import com.yeshi.fanli.util.VersionUtil;

import com.yeshi.fanli.util.account.UserUtil;

import com.yeshi.fanli.util.annotation.RequestSerializableByKey;

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

import com.yeshi.fanli.util.factory.msg.UserMsgVOFactory;

import com.yeshi.fanli.util.taobao.TaoKeApiUtil;

@@ -193,6 +196,9 @@
            for (MsgOrderDetail detail : detailList) {

               JSONObject params = new JSONObject();

               params.put("orderNo", detail.getOrderId());

               if (detail.getType() == MsgTypeOrderTypeEnum.share

                     || detail.getType() == MsgTypeOrderTypeEnum.invite)

                  params.put("orderHideNo", UserUtil.filterOrderId(detail.getOrderId()));

               list.add(UserMsgVOFactory.create(detail, jumpDetailV2Service.getByTypeCache("order_search"),

                     params));

            }

@@ -256,6 +262,7 @@
    * @param uid

    * @param out

    */

   @RequestSerializableByKey(key="#acceptData.device")

   @RequestMapping(value = "getUnReadMsgCount", method = RequestMethod.POST)

   public void getUnReadMsgCount(AcceptData acceptData, Long uid, PrintWriter out) {

      GsonBuilder androidBuilder = new GsonBuilder().registerTypeAdapter(Integer.class,

@@ -630,6 +637,7 @@
    * @param type

    * @param out

    */

   @RequestSerializableByKey(key="#acceptData.device")

   @RequestMapping(value = "getHomeMsgListNew", method = RequestMethod.POST)

   public void getHomeMsgListNew(AcceptData acceptData, Long uid, PrintWriter out) {

      if (uid != null && uid == 0)

@@ -739,6 +747,9 @@
            for (MsgOrderDetail detail : detailList) {

               JSONObject params = new JSONObject();

               params.put("orderNo", detail.getOrderId());

               if (detail.getType() == MsgTypeOrderTypeEnum.share

                     || detail.getType() == MsgTypeOrderTypeEnum.invite)

                  params.put("orderHideNo", UserUtil.filterOrderId(detail.getOrderId()));

               UserMsgVO userMsgVO = UserMsgVOFactory.create(detail,

                     jumpDetailV2Service.getByTypeCache("order_search"), params);

               userMsgVO.setType(MSG_TYPE_ORDER);

@@ -834,6 +845,29 @@
         }

      }



      /**

       * 提醒大图

       */

      MsgCommonDTO notify = msgConfigService.getNotifyMsg();



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

         boolean read = false;

         MsgDeviceReadState state = msgDeviceReadStateService.getByDeviceAndPlatformAndType(

               UserCommonMsgVO.TYPE_NOTIFY, acceptData.getDevice(),

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

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

               && zhuShouMsg.getUpdateTime().getTime() < state.getReadTime().getTime())

            read = true;

         if (notify.getJumpDetail() == null)

            read = true;

         // 查询是否已读

         UserCommonMsgVO vo = new UserCommonMsgVO(notify.getIcon(), notify.getTitle(), notify.getUpdateTime(),

               UserCommonMsgVO.TYPE_NOTIFY, notify.getContent(), read, notify.getJumpDetail(), notify.getParams(),

               0);

         vo.setPicture(notify.getPicture());

         root.put("notifyMsg", builder.create().toJson(vo));

      }



      root.put("list", builder.create().toJson(listCenter));

      root.put("commonList", builder.create().toJson(commonMsgList));

      root.put("count", listCenter.size());