From 036fc28606e5fcb2203cbc7c4736c99512a522f7 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 14 四月 2020 10:52:05 +0800
Subject: [PATCH] 订单统计测试中的相关代码的bug修改
---
fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgInviteDetailFactory.java | 35 ++---------------------------------
1 files changed, 2 insertions(+), 33 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 ff81ede..89f7316 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
@@ -5,11 +5,9 @@
import java.util.List;
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.UserInfo;
-import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.vo.msg.ClientTextStyleVO;
import com.yeshi.fanli.vo.msg.CommonMsgItemVO;
@@ -30,7 +28,7 @@
return null;
List<CommonMsgItemVO> listMsg = new ArrayList<>();
List<ClientTextStyleVO> contentList = new ArrayList<>();
- contentList.add(new ClientTextStyleVO("鎭枩浣狅紒鍥㈤槦澧炲姞鐩存帴绮変笣锛�", ClientTextStyleVO.COLOR_CONTENT));
+ contentList.add(new ClientTextStyleVO("鎭枩浣狅紒鍥㈤槦澧炲姞鐩存帴绮変笣:", ClientTextStyleVO.COLOR_CONTENT));
contentList.add(new ClientTextStyleVO("",ClientTextStyleVO.COLOR_CONTENT, portrait));
contentList.add(new ClientTextStyleVO("銆�" + nickName, ClientTextStyleVO.COLOR_CONTENT));
listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("鐩存帴绮変笣", ClientTextStyleVO.COLOR_TITLE),contentList));
@@ -62,7 +60,7 @@
return null;
List<CommonMsgItemVO> listMsg = new ArrayList<>();
List<ClientTextStyleVO> contentList = new ArrayList<>();
- contentList.add(new ClientTextStyleVO("鎭枩浣狅紒鍥㈤槦澧炲姞鐩存帴绮変笣锛�", ClientTextStyleVO.COLOR_CONTENT));
+ contentList.add(new ClientTextStyleVO("鎭枩浣狅紒鍥㈤槦澧炲姞鐩存帴绮変笣:", ClientTextStyleVO.COLOR_CONTENT));
contentList.add(new ClientTextStyleVO("",ClientTextStyleVO.COLOR_CONTENT, portrait));
contentList.add(new ClientTextStyleVO("銆�" + nickName, ClientTextStyleVO.COLOR_CONTENT));
listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("闂存帴绮変笣", ClientTextStyleVO.COLOR_TITLE),contentList));
@@ -278,33 +276,4 @@
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