yujian
2020-04-29 bdce38de757cc606fbdc58d66dd604de8fd74efa
fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/UserMsgController.java
@@ -47,6 +47,7 @@
import com.yeshi.fanli.service.inter.order.msg.MsgOrderDetailService;
import com.yeshi.fanli.service.inter.user.invite.MsgInviteDetailService;
import com.yeshi.fanli.service.inter.user.msg.MsgAccountDetailService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.JumpDetailUtil;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TimeUtil;
@@ -150,10 +151,11 @@
            }
            JumpDetailV2 wxmpJumDetail = JumpDetailUtil.getWXMPJumDetail(zhuShouMsg.getJumpDetail());
            if (Constant.IS_TEST)
               read = false;
            commonMsgList.add(new UserCommonMsgVO(zhuShouMsg.getIcon(), zhuShouMsg.getTitle(),
                  zhuShouMsg.getUpdateTime(), UserCommonMsgVO.TYPE_ZHUSHOU, zhuShouMsg.getContent(), read,
                  wxmpJumDetail, zhuShouMsg.getParams(), 0));
         }
      }
@@ -166,8 +168,7 @@
            for (MsgOrderDetail detail : detailList) {
               JSONObject params = new JSONObject();
               params.put("orderNo", detail.getOrderId());
               if (detail.getType() == MsgTypeOrderTypeEnum.share
                     || detail.getType() == MsgTypeOrderTypeEnum.invite)
               if (detail.getType() == MsgTypeOrderTypeEnum.invite || detail.getType() == MsgTypeOrderTypeEnum.orderInvite)
                  params.put("orderHideNo", UserUtil.filterOrderId(detail.getOrderId()));
               JumpDetailV2 wxmpJumDetail = JumpDetailUtil
@@ -366,7 +367,7 @@
         UserMsgUnReadNum num = userMsgReadStateService.getReadStateByUid(uid);
         int totalCount = num.getTypeAccount() + num.getTypeInvite() + num.getTypeMoney() + num.getTypeOrder()
               + num.getTypeScore() + num.getTypeSystem() + num.getTypeOther();
         data.put("totalCount", totalCount>=100?"99+":totalCount+"");
         data.put("totalCount", totalCount >= 100 ? "99+" : totalCount + "");
      }
      out.print(JsonUtil.loadTrueResult(data));