From 349fe3ad7dc7295729f5ef98aabd7c3c68a90ce6 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 27 六月 2019 17:49:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgOtherDetailFactory.java | 40 +++++++++++++++++++++++++++++++---------
1 files changed, 31 insertions(+), 9 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 a4d8747..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
@@ -10,20 +10,16 @@
public class MsgOtherDetailFactory {
/**
- * 杩斿埄璁㈠崟
+ * 鍒哥浉鍏充俊鎭殑閫氱煡
*
* @param uid
- * @param orderId
- * @param goodsCount
- * @param orderState
- * @param payMoney
- * @param money
- * @param state
+ * @param content
+ * @param type
* @param beiZhu
* @return
*/
- public static MsgOtherDetail createFanLiOrder(Long uid, MsgOtherCouponContentDTO content, MsgTypeOtherTypeEnum type,
- String beiZhu) {
+ public static MsgOtherDetail createCouponMsg(Long uid, Long userCouponId, MsgOtherCouponContentDTO content,
+ MsgTypeOtherTypeEnum type, String beiZhu) {
if (uid == null)
return null;
MsgOtherDetail detail = new MsgOtherDetail();
@@ -32,6 +28,32 @@
detail.setRead(false);
detail.setUser(new UserInfo(uid));
detail.setCoupnContent(content);
+ detail.setType(type);
+ 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