From 651a15c78f668bef3859d9ed1bb7ad0b669d3600 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 03 七月 2020 17:52:07 +0800
Subject: [PATCH] 多APP优化
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserMsgController.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 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 3089d9f..2cc74ab 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
@@ -688,7 +688,7 @@
// 瀹樺浠诲姟
if (uid != null) {
- MsgCommonDTO guanXuanMsg = msgConfigService.getGuanXuanMsg();
+ MsgCommonDTO guanXuanMsg = msgConfigService.getGuanXuanMsg(acceptData.getSystem());
if (guanXuanMsg != null && guanXuanMsg.getShow() == true) {
boolean read = false;
UserMsgUnReadNum num = userMsgReadStateService.getReadStateByUid(uid);
@@ -707,7 +707,7 @@
}
// 鏉挎牀蹇渷灏忓姪鎵�
- MsgCommonDTO zhuShouMsg = msgConfigService.getZhuShouMsg();
+ MsgCommonDTO zhuShouMsg = msgConfigService.getZhuShouMsg(acceptData.getSystem());
if (zhuShouMsg != null && zhuShouMsg.getShow() == true) {
boolean read = false;
MsgDeviceReadState state = msgDeviceReadStateService.getByDeviceAndPlatformAndType(
@@ -760,7 +760,7 @@
int platformCode = Constant.getPlatformCode(acceptData.getPlatform());
List<Special> listSpecial = specialService.listByPlaceKey("msg_activities", platformCode,
- Integer.parseInt(acceptData.getVersion()));
+ Integer.parseInt(acceptData.getVersion()),acceptData.getSystem());
if (listSpecial != null && listSpecial.size() > 0) {
for (Special special : listSpecial) {
@@ -890,7 +890,7 @@
* 鎻愰啋澶у浘
*/
if (!"douyin".equalsIgnoreCase(acceptData.getChannel())) {
- MsgCommonDTO notify = msgConfigService.getNotifyMsg();
+ MsgCommonDTO notify = msgConfigService.getNotifyMsg(acceptData.getSystem());
if (notify != null && notify.getShow() == true) {
boolean read = false;
@@ -1061,7 +1061,6 @@
*
* @param acceptData
* @param content
- * @param time
* @param out
*/
@RequestMapping(value = "uploadLatestKeFuMsg", method = RequestMethod.POST)
--
Gitblit v1.8.0