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 | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 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 f4c89e6..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
@@ -126,6 +126,24 @@
update.setStateDesc(detail.getStateDesc());
msgMoneyDetailMapper.updateByPrimaryKeySelective(update);
}
+ } else if (detail.getMsgType() == MsgTypeMoneyTypeEnum.redPackGiveOff
+ || detail.getMsgType() == MsgTypeMoneyTypeEnum.redPackReceiveOff
+ || detail.getMsgType() == MsgTypeMoneyTypeEnum.redPackGiveBack
+ || detail.getMsgType() == MsgTypeMoneyTypeEnum.redPackExchangePass
+ || detail.getMsgType() == MsgTypeMoneyTypeEnum.redPackExchangeReject
+ || 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.redPackForbid) {
+ if (detail.getUser() == null)
+ throw new MsgMoneyDetailException(2, "娑堟伅淇℃伅涓嶅叏");
+ detail.setCreateTime(new Date());
+ detail.setUpdateTime(new Date());
+ detail.setRead(false);
+ msgMoneyDetailMapper.insertSelective(detail);
} else if (detail.getMsgType() == MsgTypeMoneyTypeEnum.subSidy) {
if (detail.getMoney() == null || detail.getUser() == null)
throw new MsgMoneyDetailException(2, "娑堟伅淇℃伅涓嶅叏");
@@ -134,7 +152,6 @@
detail.setRead(false);
msgMoneyDetailMapper.insertSelective(detail);
}
-
userMsgReadStateService.addMoneyMsgUnReadCount(detail.getUser().getId(), 1);
}
--
Gitblit v1.8.0