From a39422f2a8ce45dd6cf65701ed5f9e65391c46c1 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 23 七月 2019 11:03:35 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserMsgController.java | 32 ++++++++++++++++++++++++--------
1 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserMsgController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserMsgController.java
index 4048403..663cf58 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserMsgController.java
+++ b/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);
}
@@ -973,14 +989,14 @@
* @param out
*/
@RequestMapping(value = "uploadLatestKeFuMsg", method = RequestMethod.POST)
- public void uploadLatestKeFuMsg(AcceptData acceptData, String content, Long time, PrintWriter out) {
+ public void uploadLatestKeFuMsg(AcceptData acceptData, String content, Long datetime, PrintWriter out) {
- if (StringUtil.isNullOrEmpty(content) || time == null) {
+ if (StringUtil.isNullOrEmpty(content) || datetime == null) {
out.print(JsonUtil.loadFalseResult("鍙傛暟涓嶅畬鏁�"));
return;
}
msgDeviceReadStateService.addUnreadDeviceMsg(MsgDeviceReadState.TYPE_KEFU, acceptData.getDevice(),
- "android".equalsIgnoreCase(acceptData.getPlatform()) ? 1 : 2, 0, content, new Date(time));
+ "android".equalsIgnoreCase(acceptData.getPlatform()) ? 1 : 2, 0, content, new Date(datetime));
out.print(JsonUtil.loadTrueResult(""));
}
--
Gitblit v1.8.0