From bd331a582851cffcce54316e677e23760de4f384 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 24 六月 2019 11:36:49 +0800
Subject: [PATCH] 冲突文件
---
fanli/src/main/java/com/yeshi/fanli/service/impl/msg/MsgOtherDetailServiceImpl.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/msg/MsgOtherDetailServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/msg/MsgOtherDetailServiceImpl.java
index 26fddc0..2ad8708 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/msg/MsgOtherDetailServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/msg/MsgOtherDetailServiceImpl.java
@@ -37,6 +37,9 @@
detail.setCreateTime(new Date());
msgOtherDetailMapper.insertSelective(detail);
userMsgReadStateService.addOtherMsgUnReadCount(detail.getUser().getId(), 1);
+ } else if (detail.getType() == MsgTypeOtherTypeEnum.taoLiJin) {
+ msgOtherDetailMapper.insertSelective(detail);
+ userMsgReadStateService.addOtherMsgUnReadCount(detail.getUser().getId(), 1);
}
}
--
Gitblit v1.8.0