From 9a56e9987f4d17d7d838ec05731aa683beee28bd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 15 六月 2019 16:58:50 +0800
Subject: [PATCH] 9.9的618活动商品添加
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserMsgController.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 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 ddfb5db..affe905 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
@@ -295,6 +295,12 @@
} 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));
return;
}
@@ -604,8 +610,8 @@
} else
vo.setRead(true);
-
- if(StringUtil.isNullOrEmpty(vo.getLatestMsg()))
+
+ if (StringUtil.isNullOrEmpty(vo.getLatestMsg()))
vo.setLatestMsg("[鐐瑰嚮鎵撳紑浜哄伐瀹㈡湇]");
return vo;
--
Gitblit v1.8.0