From bd331a582851cffcce54316e677e23760de4f384 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 24 六月 2019 11:36:49 +0800
Subject: [PATCH] 冲突文件
---
fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgOtherDetailFactory.java | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgOtherDetailFactory.java b/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgOtherDetailFactory.java
index 5ad06de..e82da86 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgOtherDetailFactory.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgOtherDetailFactory.java
@@ -32,5 +32,29 @@
detail.setSourceId(userCouponId);
return detail;
}
+
+ /**
+ * 鍒哥浉鍏充俊鎭殑閫氱煡
+ *
+ * @param uid
+ * @param content
+ * @param type
+ * @param beiZhu
+ * @return
+ */
+ public static MsgOtherDetail createTaoLiJinMsg(Long uid, Long userCouponId, MsgOtherCouponContentDTO content,
+ MsgTypeOtherTypeEnum type, String beiZhu) {
+ if (uid == null)
+ return null;
+ MsgOtherDetail detail = new MsgOtherDetail();
+ detail.setBeiZhu(beiZhu);
+ detail.setCreateTime(new Date());
+ detail.setRead(false);
+ detail.setUser(new UserInfo(uid));
+ detail.setCoupnContent(content);
+ detail.setType(type);
+ detail.setSourceId(userCouponId);
+ return detail;
+ }
}
--
Gitblit v1.8.0