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 | 61 ++++++++++++++++++++----------
1 files changed, 40 insertions(+), 21 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 b9fb8e2..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
@@ -31,10 +31,12 @@
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.user.UserInfoExtra;
import com.yeshi.fanli.entity.bus.msg.MsgOtherDetail;
import com.yeshi.fanli.entity.bus.msg.UserMsgUnReadNum;
import com.yeshi.fanli.entity.bus.msg.UserSystemMsg;
import com.yeshi.fanli.entity.common.JumpDetailV2;
+import com.yeshi.fanli.exception.user.UserCustomSettingsException;
import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
import com.yeshi.fanli.service.inter.money.msg.MsgMoneyDetailService;
import com.yeshi.fanli.service.inter.msg.MsgConfigService;
@@ -45,9 +47,11 @@
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;
+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.msg.UserMsgVOFactory;
@@ -55,6 +59,7 @@
import com.yeshi.fanli.vo.msg.UserMsgCenter;
import com.yeshi.fanli.vo.msg.UserMsgVO;
import com.yeshi.fanli.vo.msg.UserSystemMsgVO;
+import com.yeshi.fanli.vo.user.UserSettingsVO;
import net.sf.json.JSONObject;
@@ -92,7 +97,6 @@
@Resource
private MsgDeviceReadStateService msgDeviceReadStateService;
-
// 娑堟伅鐨勭被鍨�
final static String MSG_TYPE_ORDER = "order";
final static String MSG_TYPE_MONEY = "money";
@@ -100,10 +104,9 @@
final static String MSG_TYPE_INVITE = "invite";
final static String MSG_TYPE_OTHER = "other";
-
-
/**
* 娑堟伅鍒楄〃
+ *
* @param acceptData
* @param uid
* @param page
@@ -147,12 +150,12 @@
params = JSONObject.fromObject(zhuShouMsg.getParams());
}
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, null, 0));
-
-
+ wxmpJumDetail, zhuShouMsg.getParams(), 0));
}
}
@@ -165,11 +168,12 @@
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.getWXMPJumDetail(jumpDetailV2Service.getByTypeCache("order_search"));
-
+
+ JumpDetailV2 wxmpJumDetail = JumpDetailUtil
+ .getWXMPJumDetail(jumpDetailV2Service.getByTypeCache("order_search"));
+
UserMsgVO userMsgVO = UserMsgVOFactory.create(detail, wxmpJumDetail, params);
userMsgVO.setType(MSG_TYPE_ORDER);
list.add(userMsgVO);
@@ -240,17 +244,18 @@
UserMsgUnReadNum num = userMsgReadStateService.getReadStateByUid(uid);
UserSystemMsg usm = userSystemMsgService.getLatestUserSystemMsg(uid);
if (usm != null) {
- UserSystemMsgVO userSystemMsgVO = new UserSystemMsgVO(usm.getId(), usm.getType().name(), usm.getSolved(), "绯荤粺娑堟伅", usm.getTitle(),
+ UserSystemMsgVO userSystemMsgVO = new UserSystemMsgVO(usm.getId(), usm.getType().name(),
+ usm.getSolved(), "绯荤粺娑堟伅", usm.getTitle(),
usm.getTimeTag() == 1 ? "http://img.flqapp.com/resource/msg/icon_emergent.png" : "",
"http://img.flqapp.com/resource/msg/icon_msg_system.png",
getTimeDesc(new Date(), usm.getCreateTime()), num.getTypeSystem());
-
- // TODO 璺宠浆鍦板潃
+
+ // TODO 璺宠浆鍦板潃
JSONObject params = new JSONObject();
- params.put("url", "http://apph5.yeshitv.com/special/1.0.9/jingXuanN_9.html?type=9_9");
+ params.put("url", "http://apph5.banliapp.com/special/1.0.9/jingXuanN_9.html?type=9_9");
JumpDetailV2 wxmpJumDetail = JumpDetailUtil.getWXMPJumDetail(jumpDetailV2Service.getByTypeCache("web"));
userSystemMsgVO.setJumpDetail(wxmpJumDetail);
-
+
root.put("systemMsg", userSystemMsgVO);
}
}
@@ -275,7 +280,7 @@
}
});
}
-
+
private String getTimeDesc(Date nowDate, Date targetDate) {
Calendar now = Calendar.getInstance();
now.setTime(nowDate);
@@ -289,8 +294,7 @@
return TimeUtil.getGernalTime(targetDate.getTime(), "yyyy.MM.dd HH:mm");
}
}
-
-
+
private GsonBuilder getTimeDescJsonBuilder(GsonBuilder builder) {
builder = builder.registerTypeAdapter(Date.class, new JsonSerializer<Date>() {
@Override
@@ -315,9 +319,10 @@
return builder;
}
-
+
/**
- * 娑堟伅鏈娓呯悊
+ * 娑堟伅鏈娓呯悊
+ *
* @param acceptData
* @param uid
* @param out
@@ -353,5 +358,19 @@
out.print(JsonUtil.loadTrueResult(""));
}
+ @RequestMapping(value = "getUnReadMsgCount", method = RequestMethod.POST)
+ public void getUnReadMsgCount(AcceptData acceptData, Long uid, PrintWriter out) {
+ JSONObject data = new JSONObject();
+ if (uid == null) {
+ data.put("totalCount", 0);
+ } else {
+ 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 + "");
+ }
+
+ out.print(JsonUtil.loadTrueResult(data));
+ }
}
--
Gitblit v1.8.0