From 486e22c57ca8a1e2dc6877b539e2f3add67250f1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 23 十一月 2019 18:28:00 +0800
Subject: [PATCH] 冲突解决
---
fanli/src/main/java/com/yeshi/fanli/service/impl/money/msg/MsgMoneyDetailServiceImpl.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/money/msg/MsgMoneyDetailServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/money/msg/MsgMoneyDetailServiceImpl.java
index 5b7271a..31bd694 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/money/msg/MsgMoneyDetailServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/money/msg/MsgMoneyDetailServiceImpl.java
@@ -131,10 +131,9 @@
|| detail.getMsgType() == MsgTypeMoneyTypeEnum.redPackGiveBack
|| detail.getMsgType() == MsgTypeMoneyTypeEnum.redPackExchangePass
|| detail.getMsgType() == MsgTypeMoneyTypeEnum.redPackExchangeReject
- || detail.getMsgType() == MsgTypeMoneyTypeEnum.redPackNewUserReward
- || detail.getMsgType() == MsgTypeMoneyTypeEnum.redPackInviteSucceed
- || detail.getMsgType() == MsgTypeMoneyTypeEnum.redPackFirstSharedOrder
- || detail.getMsgType() == MsgTypeMoneyTypeEnum.redPackMonthSharedOrder
+ || detail.getMsgType() == MsgTypeMoneyTypeEnum.redPackOneStageReward
+ || detail.getMsgType() == MsgTypeMoneyTypeEnum.redPackTwoStageReward
+ || detail.getMsgType() == MsgTypeMoneyTypeEnum.redPackThreeStageReward
|| detail.getMsgType() == MsgTypeMoneyTypeEnum.redPackUseFail
|| detail.getMsgType() == MsgTypeMoneyTypeEnum.redPackUseSuccess) {
if (detail.getUser() == null)
--
Gitblit v1.8.0