From ad9fbd2c18f280ef9bba47f28353d367cf2d94e8 Mon Sep 17 00:00:00 2001 From: yujian <yujian> Date: 星期二, 14 五月 2019 11:28:03 +0800 Subject: [PATCH] Merge branch 'div_12' --- fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgOtherDetailFactory.java | 16 +++++++--------- 1 files changed, 7 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..5ad06de 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,8 @@ detail.setRead(false); detail.setUser(new UserInfo(uid)); detail.setCoupnContent(content); + detail.setType(type); + detail.setSourceId(userCouponId); return detail; } -- Gitblit v1.8.0