From e9285f6e48b26bdd494569e660006ec87f3ad66b Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 31 十月 2019 14:00:43 +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 | 22 +++++++++++++++++++++-
1 files changed, 21 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 cbb5482..1e9dfc3 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
@@ -110,7 +110,7 @@
} else if (detail.getMsgType() == MsgTypeMoneyTypeEnum.extractAutoWX) {
if (detail.getMoney() == null || detail.getUser() == null)
throw new MsgMoneyDetailException(2, "娑堟伅淇℃伅涓嶅叏");
-
+
MsgMoneyDetail msg = msgMoneyDetailMapper.selectBySourceIdAndMsgType(detail.getExtract().getId(),
MsgTypeMoneyTypeEnum.extractAutoWX);
if (msg == null) {
@@ -126,6 +126,26 @@
update.setStateDesc(detail.getStateDesc());
msgMoneyDetailMapper.updateByPrimaryKeySelective(update);
}
+ } else if (detail.getMsgType() == MsgTypeMoneyTypeEnum.redPackGiveOff
+ || detail.getMsgType() == MsgTypeMoneyTypeEnum.redPackExchangePass
+ || detail.getMsgType() == MsgTypeMoneyTypeEnum.redPackExchangeReject
+ || detail.getMsgType() == MsgTypeMoneyTypeEnum.redPackNewUserReward
+ || detail.getMsgType() == MsgTypeMoneyTypeEnum.redPackInviteSucceed
+ || detail.getMsgType() == MsgTypeMoneyTypeEnum.redPackFirstSharedOrder
+ || detail.getMsgType() == MsgTypeMoneyTypeEnum.redPackMonthSharedOrder) {
+ 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, "娑堟伅淇℃伅涓嶅叏");
+ detail.setCreateTime(new Date());
+ detail.setUpdateTime(new Date());
+ detail.setRead(false);
+ msgMoneyDetailMapper.insertSelective(detail);
}
userMsgReadStateService.addMoneyMsgUnReadCount(detail.getUser().getId(), 1);
--
Gitblit v1.8.0