From 24a8d17e007545f7426c48352109aa1a9c6587ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 06 五月 2020 12:02:09 +0800
Subject: [PATCH] IOS上线隐藏我的界面的banner与超级会员升级信息

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/msg/MsgOtherDetailServiceImpl.java |   52 +++++++++++++++-------------------------------------
 1 files changed, 15 insertions(+), 37 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 7145976..1aafd56 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
@@ -6,15 +6,19 @@
 import javax.annotation.Resource;
 
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import com.google.gson.Gson;
 import com.yeshi.fanli.dao.mybatis.msg.MsgOtherDetailMapper;
+import com.yeshi.fanli.entity.bus.msg.MsgExtra;
 import com.yeshi.fanli.entity.bus.msg.MsgOtherDetail;
 import com.yeshi.fanli.entity.bus.msg.MsgOtherDetail.MsgTypeOtherTypeEnum;
 import com.yeshi.fanli.exception.msg.MsgOtherDetailException;
+import com.yeshi.fanli.service.inter.msg.MsgExtraService;
 import com.yeshi.fanli.service.inter.msg.MsgOtherDetailService;
 import com.yeshi.fanli.service.inter.msg.UserMsgReadStateService;
 import com.yeshi.fanli.util.Constant;
+import com.yeshi.fanli.util.StringUtil;
 
 @Service
 public class MsgOtherDetailServiceImpl implements MsgOtherDetailService {
@@ -25,46 +29,20 @@
 	@Resource
 	private UserMsgReadStateService userMsgReadStateService;
 
+	@Resource
+	private MsgExtraService msgExtraService;
+	
+	
 	@Override
+	@Transactional(rollbackFor = Exception.class)
 	public void addMsgOtherDetail(MsgOtherDetail detail) throws MsgOtherDetailException {
-		if (detail.getType() == MsgTypeOtherTypeEnum.couponMianDan
-				|| detail.getType() == MsgTypeOtherTypeEnum.couponReward
-				|| detail.getType() == MsgTypeOtherTypeEnum.couponWelfareMianDan) {
-			if (detail.getCoupnContent() == null)
-				throw new MsgOtherDetailException(1, "鍐呭涓虹┖");
-			detail.setContent(new Gson().toJson(detail.getCoupnContent()));
-			if (detail.getCreateTime() == null)
-				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);
-		} else if (detail.getType() == MsgTypeOtherTypeEnum.give) {
-			msgOtherDetailMapper.insertSelective(detail);
-			userMsgReadStateService.addOtherMsgUnReadCount(detail.getUser().getId(), 1);
-		} else if (detail.getType() == MsgTypeOtherTypeEnum.exchange) {
-			msgOtherDetailMapper.insertSelective(detail);
-			userMsgReadStateService.addOtherMsgUnReadCount(detail.getUser().getId(), 1);
-		} else if (detail.getType() == MsgTypeOtherTypeEnum.couponActivate) {
-			msgOtherDetailMapper.insertSelective(detail);
-			userMsgReadStateService.addOtherMsgUnReadCount(detail.getUser().getId(), 1);
-		} else if (detail.getType() == MsgTypeOtherTypeEnum.firstOrderReward) {
-			msgOtherDetailMapper.insertSelective(detail);
-			userMsgReadStateService.addOtherMsgUnReadCount(detail.getUser().getId(), 1);
-		}else if (detail.getType() == MsgTypeOtherTypeEnum.systemGive) {
-			msgOtherDetailMapper.insertSelective(detail);
-			userMsgReadStateService.addOtherMsgUnReadCount(detail.getUser().getId(), 1);
-		} else if (detail.getType() == MsgTypeOtherTypeEnum.taoLiJinExchange) {
-			msgOtherDetailMapper.insertSelective(detail);
-			userMsgReadStateService.addOtherMsgUnReadCount(detail.getUser().getId(), 1);
-		} else if (detail.getType() == MsgTypeOtherTypeEnum.passVIPApply 
-				|| detail.getType() == MsgTypeOtherTypeEnum.rejectVIPApply 
-				|| detail.getType() == MsgTypeOtherTypeEnum.teamVIPCallBoss
-				|| detail.getType() == MsgTypeOtherTypeEnum.teamSplitCallBoss) {
-			msgOtherDetailMapper.insertSelective(detail);
-			userMsgReadStateService.addOtherMsgUnReadCount(detail.getUser().getId(), 1);
+		if (detail == null || detail.getUser() == null || StringUtil.isNullOrEmpty(detail.getExtraInfo())) {
+			throw new MsgOtherDetailException(1, "娑堟伅鍐呭涓嶅叏");
 		}
+		
+		msgOtherDetailMapper.insertSelective(detail);
+		msgExtraService.addMsgExtra(detail.getId(), detail.getExtraInfo(), MsgExtra.MSG_TYPE_OTHER);
+		userMsgReadStateService.addOtherMsgUnReadCount(detail.getUser().getId(), 1);
 	}
 
 	@Override

--
Gitblit v1.8.0