From 8c93d2e3b22ac543f8f94c2cf0eb982258fb708b Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 07 十二月 2019 15:33:00 +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 | 11 ++++++-----
1 files changed, 6 insertions(+), 5 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..ed2e92b 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,12 +131,13 @@
|| 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.redPackUseSuccess
+ || detail.getMsgType() == MsgTypeMoneyTypeEnum.redPackDeduct
+ || detail.getMsgType() == MsgTypeMoneyTypeEnum.redPackForbid) {
if (detail.getUser() == null)
throw new MsgMoneyDetailException(2, "娑堟伅淇℃伅涓嶅叏");
detail.setCreateTime(new Date());
--
Gitblit v1.8.0