From c70caa91e6b0e1f944b148b55685aca43bb90783 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 01 四月 2020 14:40:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/money/msg/MsgMoneyDetailServiceImpl.java | 19 ++++++++++++++-----
1 files changed, 14 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..a08e1f9 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,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.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());
@@ -150,6 +152,13 @@
detail.setUpdateTime(new Date());
detail.setRead(false);
msgMoneyDetailMapper.insertSelective(detail);
+ } else if (detail.getMsgType() == MsgTypeMoneyTypeEnum.orderTeamReward) {
+ if (detail.getMoney() == null || detail.getUser() == null)
+ throw new MsgMoneyDetailException(2, "娑堟伅淇℃伅涓嶅叏");
+ detail.setCreateTime(new Date());
+ detail.setUpdateTime(new Date());
+ detail.setRead(false);
+ msgMoneyDetailMapper.insertSelective(detail);
}
userMsgReadStateService.addMoneyMsgUnReadCount(detail.getUser().getId(), 1);
}
--
Gitblit v1.8.0