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/MsgInviteDetailServiceImpl.java | 52 ++++++++++++++++++++++++++--------------------------
1 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/MsgInviteDetailServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/MsgInviteDetailServiceImpl.java
index 83f0c62..1da1d74 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/MsgInviteDetailServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/MsgInviteDetailServiceImpl.java
@@ -6,14 +6,18 @@
import javax.annotation.Resource;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import com.yeshi.fanli.dao.mybatis.msg.MsgInviteDetailMapper;
+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.exception.msg.MsgInviteDetailException;
+import com.yeshi.fanli.service.inter.msg.MsgExtraService;
import com.yeshi.fanli.service.inter.msg.UserMsgReadStateService;
import com.yeshi.fanli.service.inter.user.invite.MsgInviteDetailService;
import com.yeshi.fanli.util.Constant;
+import com.yeshi.fanli.util.StringUtil;
@Service
public class MsgInviteDetailServiceImpl implements MsgInviteDetailService {
@@ -24,39 +28,24 @@
@Resource
private UserMsgReadStateService userMsgReadStateService;
+ @Resource
+ private MsgExtraService msgExtraService;
+
+
@Override
+ @Transactional(rollbackFor = Exception.class)
public void addMsgInviteDetail(MsgInviteDetail detail) throws MsgInviteDetailException {
if (detail == null)
throw new MsgInviteDetailException(1, "娑堟伅涓虹┖");
- if (detail.getInviteUser() == null || detail.getMsgType() == null || detail.getUser() == null
- || detail.getDesc() == null)
+ if (detail.getMsgType() == null || detail.getUser() == null || StringUtil.isNullOrEmpty(detail.getExtraInfo()))
throw new MsgInviteDetailException(2, "娑堟伅鍐呭涓嶅畬鏁�");
- // 鏌ヨ鏄惁宸插瓨鍦ㄨ閭�璇稩D
- MsgInviteDetail oldDetail = msgInviteDetailMapper.selectByThreeSaleId(detail.getInviteUser().getId());
- if (oldDetail == null) {
- detail.setCreateTime(new Date());
- detail.setUpdateTime(new Date());
- detail.setRead(false);
- msgInviteDetailMapper.insertSelective(detail);
- } else {
- MsgInviteDetail update = new MsgInviteDetail();
- update.setId(oldDetail.getId());
- if (!detail.getInviteUser().getState()) {
- if (detail.getInviteUser().getExpire() == ThreeSale.EXPIRE_NORMAL) {
- update.setDesc("鎭枩浣狅紝鏈夋柊绮変笣鍔犲叆浣犵殑闃熷垪锛岃嫢瀵规柟60澶╁唴鏈縺娲诲皢浼氫笌浣犺劚绂婚個璇峰叧绯�");
- } else {
- update.setDesc("鎶辨瓑锛岃绮変笣鍥�60澶╁唴鏈縺娲伙紝宸茶劚绂讳簡浣犵殑闃熷垪锛屽彲浠ヨ瘯鐫�閲嶆柊閭�璇�");
- }
- } else {
- update.setDesc("鎭枩浣狅紝鎴愬姛閭�璇蜂竴涓矇涓�");
- }
- update.setUpdateTime(new Date());
- update.setRead(false);
- msgInviteDetailMapper.updateByPrimaryKeySelective(update);
- }
-
+ detail.setCreateTime(new Date());
+ detail.setUpdateTime(new Date());
+ detail.setRead(false);
+ msgInviteDetailMapper.insertSelective(detail);
+ msgExtraService.addMsgExtra(detail.getId(), detail.getExtraInfo(), MsgExtra.MSG_TYPE_INVITE);
userMsgReadStateService.addInviteMsgUnReadCount(detail.getUser().getId(), 1);
}
@@ -88,4 +77,15 @@
userMsgReadStateService.addInviteMsgUnReadCount(detail.getUser().getId(), 1);
}
+ @Override
+ public MsgInviteDetail selectByPrimaryKey(Long id) {
+ return msgInviteDetailMapper.selectByPrimaryKey(id);
+ }
+
+ @Override
+ public void deleteByPrimaryKey(Long id) {
+ msgInviteDetailMapper.deleteByPrimaryKey(id);
+ msgExtraService.deleteByPidAndType(id, MsgExtra.MSG_TYPE_INVITE);
+ }
+
}
--
Gitblit v1.8.0