From 5aad3f49f4d00e4c15456a50a0c06e656ac5007d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 29 四月 2020 10:57:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserMsgController.java | 6 ++----
1 files changed, 2 insertions(+), 4 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 a09c987..4333cf3 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
@@ -202,8 +202,7 @@
for (MsgOrderDetail detail : detailList) {
JSONObject params = new JSONObject();
params.put("orderNo", detail.getOrderId());
- if (detail.getType() == MsgTypeOrderTypeEnum.share || detail.getType() == MsgTypeOrderTypeEnum.invite
- || detail.getType() == MsgTypeOrderTypeEnum.orderShare || detail.getType() == MsgTypeOrderTypeEnum.orderInvite)
+ if (detail.getType() == MsgTypeOrderTypeEnum.invite || detail.getType() == MsgTypeOrderTypeEnum.orderInvite)
params.put("orderHideNo", UserUtil.filterOrderId(detail.getOrderId()));
list.add(UserMsgVOFactory.create(detail, jumpDetailV2Service.getByTypeCache("order_search"),
params));
@@ -776,8 +775,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()));
UserMsgVO userMsgVO = UserMsgVOFactory.create(detail,
jumpDetailV2Service.getByTypeCache("order_search"), params);
--
Gitblit v1.8.0