From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/UserMsgController.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/UserMsgController.java b/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/UserMsgController.java
index c69f50c..c0721c1 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/UserMsgController.java
+++ b/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));
--
Gitblit v1.8.0