Merge remote-tracking branch 'origin/master'

admin

2019-07-18 2a671d23fa0e5c979a8b6459b4914481cd10c353

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

@@ -190,8 +190,12 @@
         List<MsgOrderDetail> detailList = msgOrderDetailService.listMsgOrderDetail(uid, page);

         count = msgOrderDetailService.countMsgOrderDetail(uid);

         if (detailList != null)

            for (MsgOrderDetail detail : detailList)

               list.add(UserMsgVOFactory.create(detail));

            for (MsgOrderDetail detail : detailList) {

               JSONObject params = new JSONObject();

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

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

                     params));

            }

         break;

      case MSG_TYPE_MONEY:

         userMsgReadStateService.readMoneyMsg(uid);

@@ -293,6 +297,12 @@
               data.put("totalCount", 0);

            }

         } catch (UserCustomSettingsException e) {

         }



         if (VersionUtil.greaterThan_1_5_50(acceptData.getPlatform(), acceptData.getVersion())) {

            int totalCount = msgDeviceReadStateService.getUnReadCount(acceptData.getDevice(),

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

            data.put("totalCount", totalCount);

         }



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

@@ -605,6 +615,9 @@
      } else

         vo.setRead(true);



      if (StringUtil.isNullOrEmpty(vo.getLatestMsg()))

         vo.setLatestMsg("[点击打开人工客服]");



      return vo;

   }



@@ -686,11 +699,11 @@
                  acceptData.getPlatform().equalsIgnoreCase("android") ? 1 : 2);

            boolean read = false;

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

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

                  && list.get(0).getPushTime().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(), read,

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

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

         }

      }

@@ -724,7 +737,10 @@
         List<MsgOrderDetail> detailList = msgOrderDetailService.listMsgOrderDetail(uid, page);

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

            for (MsgOrderDetail detail : detailList) {

               UserMsgVO userMsgVO = UserMsgVOFactory.create(detail);

               JSONObject params = new JSONObject();

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

               UserMsgVO userMsgVO = UserMsgVOFactory.create(detail,

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

               userMsgVO.setType(MSG_TYPE_ORDER);

               list.add(userMsgVO);

            }