Merge remote-tracking branch 'origin/master'

admin

2019-04-12 2406574c36a8c4e8e8ffe7c56a34e25dde107a84

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

@@ -553,30 +553,37 @@
      List<MsgOrderDetail> detailList = msgOrderDetailService.listMsgOrderDetail(uid, page);

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

         for (MsgOrderDetail detail : detailList) {

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

            UserMsgVO userMsgVO = UserMsgVOFactory.create(detail);

            userMsgVO.setType(MSG_TYPE_ORDER);

            list.add(userMsgVO);

         }

      }



      List<MsgMoneyDetail> detailList1 = msgMoneyDetailService.listMsgMoneyDetail(uid, page);

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

         for (MsgMoneyDetail detail : detailList1) {

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

            UserMsgVO userMsgVO = UserMsgVOFactory.create(detail);

            userMsgVO.setType(MSG_TYPE_MONEY);

            list.add(userMsgVO);

         }

      }



      List<MsgAccountDetail> detailList2 = msgAccountDetailService.listMsgAccountDetail(uid, page);

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

         for (MsgAccountDetail detail : detailList2) {

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

            UserMsgVO userMsgVO = UserMsgVOFactory.create(detail);

            userMsgVO.setType(MSG_TYPE_ACCOUNT);

            list.add(userMsgVO);

         }

      }



      List<MsgInviteDetail> detailList3 = msgInviteDetailService.listMsgInviteDetail(uid, page);

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

         for (MsgInviteDetail detail : detailList3) {

            UserMsgVO vo = UserMsgVOFactory.create(detail);

            if (vo != null) {

               list.add(vo);

            UserMsgVO userMsgVO = UserMsgVOFactory.create(detail);

            if (userMsgVO != null) {

               userMsgVO.setType(MSG_TYPE_INVITE);

               list.add(userMsgVO);

            }

         }

      }

@@ -584,16 +591,17 @@
      List<MsgOtherDetail> detailList4 = msgOtherDetailService.listMsgOtherDetail(uid, page);

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

         for (MsgOtherDetail detail : detailList4) {

            UserMsgVO vo = UserMsgVOFactory.create(detail);

            if (vo != null) {

               list.add(vo);

            UserMsgVO userMsgVO = UserMsgVOFactory.create(detail);

            if (userMsgVO != null) {

               userMsgVO.setType(MSG_TYPE_OTHER);

               list.add(userMsgVO);

            }

         }

      }

      

      List<UserMsgCenter> listCenter = new ArrayList<>();

      

      List<Special> listSpecial = specialService.listBySystemAndCard("", system.getId());

      List<Special> listSpecial = specialService.listByPlaceKey("msg_activities");

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

         for (Special special: listSpecial) {

            UserMsgCenter msgCenter = new UserMsgCenter();

@@ -606,9 +614,7 @@
         // 时间排序

         listSort(list);

         

         if (list.size() <= 20 ) {

				
         } else {

         if (list.size() >= 20 ) {

            list = list.subList(0, 19);

         }