From d960fdbfe07a65cb80ccb764bfb15ce78ebfd84a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 10 四月 2020 18:21:04 +0800
Subject: [PATCH] 消息修改
---
fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgInviteDetailFactory.java | 36 +++++++++++++++++++-----------------
1 files changed, 19 insertions(+), 17 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 bfc6dae..6557a24 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
@@ -1,6 +1,8 @@
package com.yeshi.fanli.util.factory.msg;
+import java.util.ArrayList;
import java.util.Date;
+import java.util.List;
import com.google.gson.Gson;
import com.yeshi.fanli.dto.msg.MsgInviteContentDTO;
@@ -9,6 +11,9 @@
import com.yeshi.fanli.entity.bus.user.ThreeSale;
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.vo.msg.ClientTextStyleVO;
+import com.yeshi.fanli.vo.msg.CommonMsgItemVO;
+import com.yeshi.fanli.vo.msg.CommonMsgItemVOFactory;
public class MsgInviteDetailFactory {
@@ -23,13 +28,17 @@
if (threeSale == null || uid == null)
return null;
+
+
+
+
MsgInviteDetail detail = new MsgInviteDetail();
if (StringUtil.isNullOrEmpty(beiZhu))
detail.setBeiZhu("鏃�");
else
detail.setBeiZhu(beiZhu);
detail.setCreateTime(new Date());
- detail.setDesc("鎭枩浣狅紝鎴愬姛閭�璇蜂竴涓槦鍛�");
+ detail.setDesc("鎭枩浣狅紝鎴愬姛閭�璇蜂竴涓矇涓�");
detail.setInviteUser(threeSale);
detail.setMsgType(MsgTypeInviteTypeEnum.invite);
detail.setRead(false);
@@ -44,25 +53,18 @@
* @param uid
* @return
*/
- public static MsgInviteDetail createInviteSuccess2_0_2(Long uid, ThreeSale threeSale) {
+ public static MsgInviteDetail createInviteSuccess2_1(Long uid, ThreeSale threeSale) {
if (threeSale == null || uid == null)
return null;
-
- MsgInviteContentDTO content = new MsgInviteContentDTO();
- content.setMode("蹇呰鏉′欢+閫夋嫨鏉′欢锛堜笁閫変竴锛� ");
- content.setCode("闃熷憳缁戝畾鐢佃瘽鍙风爜+鎺堟潈娣樺疂 ");
- content.setState("鎴愬姛閭�璇蜂竴涓槦鍛橈紝闃熷憳鐔熺粌浣跨敤App杩樺彲鑾峰緱绾㈠寘 ");
- content.setInviter("1.浜х敓绱鈮�200閲戝竵/2.浠绘剰璁㈠崟/3.鎴愬姛閭�璇蜂竴涓槦鍛�");
-
MsgInviteDetail detail = new MsgInviteDetail();
- detail.setBeiZhu("婊¤冻鑾峰緱绾㈠寘鏉′欢鍚庣郴缁熷皢鑷姩涓嬪彂鍒扳�滄垜鐨�-绾㈠寘鈥濅腑");
- detail.setInviteUser(threeSale);
- detail.setCreateTime(new Date());
- detail.setUpdateTime(new Date());
- detail.setDesc(new Gson().toJson(content));
- detail.setMsgType(MsgTypeInviteTypeEnum.inviteNew);
detail.setRead(false);
detail.setUser(new UserInfo(uid));
+ detail.setInviteUser(threeSale);
+ detail.setMsgType(MsgTypeInviteTypeEnum.inviteSucceed);
+ detail.setDesc("绮変笣锛堝ソ鍙嬶級鐔熺粌浣跨敤App鍙幏寰楃孩鍖�");
+ detail.setBeiZhu("婊¤冻鑾峰緱绾㈠寘鏉′欢鍚庣郴缁熷皢鑷姩涓嬪彂鍒扳�滄垜鐨�-绾㈠寘鈥濅腑");
+ detail.setCreateTime(new Date());
+ detail.setUpdateTime(new Date());
return detail;
}
@@ -83,7 +85,7 @@
else
detail.setBeiZhu(beiZhu);
detail.setCreateTime(new Date());
- detail.setDesc("鎭枩浣狅紝鏈夋柊闃熷憳鍔犲叆浣犵殑闃熷垪锛岃嫢瀵规柟60澶╁唴鏈縺娲诲皢浼氫笌浣犺劚绂婚個璇峰叧绯�");
+ detail.setDesc("鎭枩浣狅紝鏈夋柊绮変笣鍔犲叆浣犵殑闃熷垪锛岃嫢瀵规柟60澶╁唴鏈縺娲诲皢浼氫笌浣犺劚绂婚個璇峰叧绯�");
detail.setInviteUser(threeSale);
detail.setMsgType(MsgTypeInviteTypeEnum.invite);
detail.setRead(false);
@@ -111,7 +113,7 @@
else
detail.setBeiZhu(beiZhu);
detail.setCreateTime(new Date());
- detail.setDesc("鎶辨瓑锛岃闃熷憳鍥�60澶╁唴鏈縺娲伙紝宸茶劚绂讳簡浣犵殑闃熷垪锛屽彲浠ヨ瘯鐫�閲嶆柊閭�璇�");
+ detail.setDesc("鎶辨瓑锛岃绮変笣鍥�60澶╁唴鏈縺娲伙紝宸茶劚绂讳簡浣犵殑闃熷垪锛屽彲浠ヨ瘯鐫�閲嶆柊閭�璇�");
detail.setInviteUser(threeSale);
detail.setMsgType(MsgTypeInviteTypeEnum.invite);
detail.setRead(false);
--
Gitblit v1.8.0