From 3824cbcaec6e6c67418d5280a53e9c2fedeef6f9 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 11 七月 2019 16:34:13 +0800
Subject: [PATCH] 订单bug，分享爆款自购修改
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserMsgController.java | 46 +++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 43 insertions(+), 3 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 c973cf0..dbb57f0 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));
@@ -598,8 +608,15 @@
vo.setRead(false);
else
vo.setRead(true);
+
+ if (kefuState.getLatestContentTime() != null)
+ vo.setTime(kefuState.getLatestContentTime());
+
} else
vo.setRead(true);
+
+ if (StringUtil.isNullOrEmpty(vo.getLatestMsg()))
+ vo.setLatestMsg("[鐐瑰嚮鎵撳紑浜哄伐瀹㈡湇]");
return vo;
}
@@ -720,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);
}
@@ -960,4 +980,24 @@
out.print(JsonUtil.loadTrueResult(""));
}
+ /**
+ * 涓婁紶鏈�杩戠殑瀹㈡湇娑堟伅
+ *
+ * @param acceptData
+ * @param content
+ * @param time
+ * @param out
+ */
+ @RequestMapping(value = "uploadLatestKeFuMsg", method = RequestMethod.POST)
+ public void uploadLatestKeFuMsg(AcceptData acceptData, String content, Long datetime, PrintWriter out) {
+
+ 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(datetime));
+ out.print(JsonUtil.loadTrueResult(""));
+ }
+
}
--
Gitblit v1.8.0