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/wxmp/v1/UserMsgController.java | 5 ++---
1 files changed, 2 insertions(+), 3 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 226c655..bfe1732 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
@@ -130,7 +130,7 @@
long currentTime = System.currentTimeMillis();
// 鏉挎牀蹇渷灏忓姪鎵�
- MsgCommonDTO zhuShouMsg = msgConfigService.getZhuShouMsg();
+ MsgCommonDTO zhuShouMsg = msgConfigService.getZhuShouMsg(acceptData.getSystem());
if (zhuShouMsg != null && zhuShouMsg.getShow() == true) {
boolean read = false;
MsgDeviceReadState state = msgDeviceReadStateService.getByDeviceAndPlatformAndType(
@@ -168,8 +168,7 @@
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
--
Gitblit v1.8.0