From 2f2860b50f24e5e3598d223db03d43df61d95c97 Mon Sep 17 00:00:00 2001
From: yj <Administrator@192>
Date: 星期五, 13 三月 2020 16:31:30 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/money/msg/MsgMoneyDetailServiceImpl.java | 12 ++++++++----
1 files changed, 8 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 54a469e..1a55a85 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,14 @@
|| 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
+ || detail.getMsgType() == MsgTypeMoneyTypeEnum.redPackDeduct
+ || detail.getMsgType() == MsgTypeMoneyTypeEnum.redPackForbidRemove
+ || detail.getMsgType() == MsgTypeMoneyTypeEnum.redPackForbid) {
if (detail.getUser() == null)
throw new MsgMoneyDetailException(2, "娑堟伅淇℃伅涓嶅叏");
detail.setCreateTime(new Date());
--
Gitblit v1.8.0