From 148af6b2f57be264c84d0991237fbd7ddea491a4 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 04 十一月 2019 09:55:55 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgInviteDetailFactory.java | 29 +++++++++++++++++++++++++++++
1 files changed, 29 insertions(+), 0 deletions(-)
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 b8e5dd8..f35c8e7 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
@@ -2,6 +2,8 @@
import java.util.Date;
+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.ThreeSale;
@@ -85,4 +87,31 @@
detail.setUser(new UserInfo(uid));
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