From dd5b15229cb15459fa7c31ccea77dac28cbfafbd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 四月 2020 10:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgInviteDetailFactory.java | 31 -------------------------------
fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/UserInviteMsgNotificationServiceImpl.java | 7 -------
fanli/src/main/java/com/yeshi/fanli/service/inter/user/invite/UserInviteMsgNotificationService.java | 8 --------
3 files changed, 0 insertions(+), 46 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 a0cff74..109c8e7 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
@@ -84,11 +84,4 @@
saveMsgDetail(MsgInviteDetailFactory.fansDivorcedIndirect(uid, nickName, fansName, time));
}
-
- @Override
- public void receiveGift(Long uid, String beizu, MsgInviteContentDTO content) {
- MsgInviteDetail detail = MsgInviteDetailFactory.receiveGift(uid, beizu, content);
- msgInviteDetailService.insertSelective(detail);
- }
-
}
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/invite/UserInviteMsgNotificationService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/invite/UserInviteMsgNotificationService.java
index 39a5c6b..84a7dbf 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/invite/UserInviteMsgNotificationService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/invite/UserInviteMsgNotificationService.java
@@ -12,14 +12,6 @@
*/
public interface UserInviteMsgNotificationService {
- /**
- * 棰嗗彇鍒搞�佺孩鍖呮縺娲婚個璇�
- * @param uid
- * @param beizu
- * @param content
- */
- public void receiveGift(Long uid, String beizu, MsgInviteContentDTO content);
-
/**
* 鐩存帴绮変笣閭�璇锋垚鍔�
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgInviteDetailFactory.java b/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgInviteDetailFactory.java
index ff81ede..e4450be 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgInviteDetailFactory.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgInviteDetailFactory.java
@@ -5,11 +5,9 @@
import java.util.List;
import com.google.gson.Gson;
-import com.yeshi.fanli.dto.msg.MsgInviteContentDTO;
import com.yeshi.fanli.entity.bus.msg.MsgInviteDetail;
import com.yeshi.fanli.entity.bus.msg.MsgInviteDetail.MsgTypeInviteTypeEnum;
import com.yeshi.fanli.entity.bus.user.UserInfo;
-import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.vo.msg.ClientTextStyleVO;
import com.yeshi.fanli.vo.msg.CommonMsgItemVO;
@@ -278,33 +276,4 @@
return detail;
}
-
-
-
-
- /**
- * 棰嗗彇淇℃伅婵�娲婚個璇峰叧绯�
- *
- * @param threeSale
- * @param uid
- * @return
- */
- public static MsgInviteDetail receiveGift(Long uid, String beiZhu, MsgInviteContentDTO content) {
- if (content == null || uid == null)
- return null;
-
- MsgInviteDetail detail = new MsgInviteDetail();
- if (StringUtil.isNullOrEmpty(beiZhu))
- detail.setBeiZhu("鏃�");
- else
- detail.setBeiZhu(beiZhu);
-
- detail.setCreateTime(new Date());
- detail.setUpdateTime(new Date());
- detail.setDesc(new Gson().toJson(content));
- detail.setMsgType(MsgTypeInviteTypeEnum.receiveGift);
- detail.setRead(false);
- detail.setUser(new UserInfo(uid));
- return detail;
- }
}
--
Gitblit v1.8.0