From 28cf328a098334b51a3e9d2d56f983fb8c862211 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 23 五月 2020 09:54:38 +0800
Subject: [PATCH] 足迹、收藏订单兼容新需求
---
fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgOtherDetailFactory.java | 59 ++++-------------------------------------------------------
1 files changed, 4 insertions(+), 55 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 45a9682..50619da 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
@@ -5,7 +5,6 @@
import java.util.List;
import com.google.gson.Gson;
-import com.yeshi.fanli.dto.msg.MsgOtherCouponContentDTO;
import com.yeshi.fanli.entity.bus.msg.MsgOtherDetail;
import com.yeshi.fanli.entity.bus.msg.MsgOtherDetail.MsgTypeOtherTypeEnum;
import com.yeshi.fanli.entity.bus.user.UserInfo;
@@ -15,55 +14,6 @@
import com.yeshi.fanli.vo.msg.CommonMsgItemVOFactory;
public class MsgOtherDetailFactory {
-
- /**
- * 鍒哥浉鍏充俊鎭殑閫氱煡
- *
- * @param uid
- * @param content
- * @param type
- * @param beiZhu
- * @return
- */
- public static MsgOtherDetail createCouponMsg(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;
- }
-
- /**
- * 鍒哥浉鍏充俊鎭殑閫氱煡
- *
- * @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;
- }
-
/**
@@ -106,7 +56,7 @@
List<ClientTextStyleVO> contentList2 = new ArrayList<>();
contentList2.add(new ClientTextStyleVO(TimeUtil.formatDateDot(startTime) + "-" + TimeUtil.formatDateDot(endTime) + "-浜�", ClientTextStyleVO.COLOR_CONTENT));
contentList2.add(new ClientTextStyleVO(days +"" ,ClientTextStyleVO.COLOR_HIGHLIGHT_CONTENT));
- contentList2.add(new ClientTextStyleVO("澶╄繃鏈�", ClientTextStyleVO.COLOR_CONTENT));
+ contentList2.add(new ClientTextStyleVO("澶╁悗杩囨湡", ClientTextStyleVO.COLOR_CONTENT));
listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("鏈夋晥鏈�", ClientTextStyleVO.COLOR_TITLE),contentList2));
listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("浣跨敤鑼冨洿", ClientTextStyleVO.COLOR_TITLE),
@@ -166,14 +116,13 @@
List<ClientTextStyleVO> contentList2 = new ArrayList<>();
contentList2.add(new ClientTextStyleVO(TimeUtil.formatDateDot(startTime) + "-" + TimeUtil.formatDateDot(endTime) + "-浜�", ClientTextStyleVO.COLOR_CONTENT));
contentList2.add(new ClientTextStyleVO(days +"" ,ClientTextStyleVO.COLOR_HIGHLIGHT_CONTENT));
- contentList2.add(new ClientTextStyleVO("澶╄繃鏈�", ClientTextStyleVO.COLOR_CONTENT));
+ contentList2.add(new ClientTextStyleVO("澶╁悗杩囨湡", ClientTextStyleVO.COLOR_CONTENT));
listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("鏈夋晥鏈�", ClientTextStyleVO.COLOR_TITLE),contentList2));
-
listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("浣跨敤鑼冨洿", ClientTextStyleVO.COLOR_TITLE),
- new ClientTextStyleVO("鍦╘"鎴戠殑-璁㈠崟涓璡"锛屽彲浣�5澶╁唴浜х敓鐨勮繑鍒╄鍗曞啀杩�", ClientTextStyleVO.COLOR_CONTENT)));
+ new ClientTextStyleVO("濂栧姳鍒稿彲鍦ㄣ�怽"鎴戠殑-绂忓埄涓績\"銆戣禒閫佷粬浜�", ClientTextStyleVO.COLOR_CONTENT)));
}
listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("澶囨敞", ClientTextStyleVO.COLOR_TITLE),
- new ClientTextStyleVO("濂栧姳鍒镐篃鍙湪銆怽"鎴戠殑-绂忓埄涓績\"銆戣禒閫佷粬浜�", ClientTextStyleVO.COLOR_CONTENT)));
+ new ClientTextStyleVO("鏃�", ClientTextStyleVO.COLOR_CONTENT)));
MsgOtherDetail detail = new MsgOtherDetail();
detail.setCreateTime(new Date());
--
Gitblit v1.8.0