From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/UserInviteMsgNotificationServiceImpl.java | 48 +++++++++++++++++++-----------------------------
1 files changed, 19 insertions(+), 29 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/UserInviteMsgNotificationServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/UserInviteMsgNotificationServiceImpl.java
index ca3ba76..ba4a702 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/UserInviteMsgNotificationServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/UserInviteMsgNotificationServiceImpl.java
@@ -5,16 +5,10 @@
import javax.annotation.Resource;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
-import com.yeshi.fanli.dto.msg.MsgInviteContentDTO;
-import com.yeshi.fanli.dto.push.PushContentDTO;
-import com.yeshi.fanli.entity.bus.msg.MsgExtra;
import com.yeshi.fanli.entity.bus.msg.MsgInviteDetail;
-import com.yeshi.fanli.entity.bus.user.ThreeSale;
-import com.yeshi.fanli.entity.config.push.PushMsgFactory;
import com.yeshi.fanli.exception.msg.MsgInviteDetailException;
-import com.yeshi.fanli.exception.push.PushException;
-import com.yeshi.fanli.service.inter.msg.MsgExtraService;
import com.yeshi.fanli.service.inter.push.PushService;
import com.yeshi.fanli.service.inter.user.invite.MsgInviteDetailService;
import com.yeshi.fanli.service.inter.user.invite.UserInviteMsgNotificationService;
@@ -26,40 +20,36 @@
@Resource
private MsgInviteDetailService msgInviteDetailService;
- @Resource
- private MsgExtraService msgExtraService;
@Resource
private PushService pushService;
- @Override
- public void directInviteSuccess(Long uid, String nickName, String portrait, Date time) {
- MsgInviteDetail detail = MsgInviteDetailFactory.directInviteSuccess(uid, nickName, portrait, time);
+ @Transactional(rollbackFor = Exception.class)
+ private void saveMsgDetail(MsgInviteDetail detail) {
try {
msgInviteDetailService.addMsgInviteDetail(detail);
- // 娑堟伅鍐呭
- msgExtraService.addMsgExtra(detail.getId(), detail.getExtraInfo(), MsgExtra.MSG_TYPE_INVITE);
- } catch (MsgInviteDetailException e) {
- e.printStackTrace();
- }
- }
-
- @Override
- public void indirectInviteSuccess(Long uid, String inviteName, String nickName, String portrait, Date time) {
- MsgInviteDetail detail = MsgInviteDetailFactory.indirectInviteSuccess(uid, inviteName, nickName, portrait, time);
- try {
- msgInviteDetailService.addMsgInviteDetail(detail);
- // 娑堟伅鍐呭
- msgExtraService.addMsgExtra(detail.getId(), detail.getExtraInfo(), MsgExtra.MSG_TYPE_INVITE);
} catch (MsgInviteDetailException e) {
e.printStackTrace();
}
}
@Override
- public void receiveGift(Long uid, String beizu, MsgInviteContentDTO content) {
- MsgInviteDetail detail = MsgInviteDetailFactory.receiveGift(uid, beizu, content);
- msgInviteDetailService.insertSelective(detail);
+ @Transactional(rollbackFor = Exception.class)
+ public void directInviteSuccess(Long uid, String nickName, String portrait, Date time) {
+ saveMsgDetail(MsgInviteDetailFactory.directInviteSuccess(uid, nickName, portrait, time));
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void indirectInviteSuccess(Long uid, String inviteName, String nickName, String portrait, Date time) {
+ saveMsgDetail(MsgInviteDetailFactory.indirectInviteSuccess(uid, inviteName, nickName, portrait, time));
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void fansUpgrade(Long uid, String rankName, String nickName, String item, Date time) {
+ saveMsgDetail(MsgInviteDetailFactory.fansUpgrade(uid, rankName, nickName, item, time));
+ }
+
+
}
--
Gitblit v1.8.0