From ee1d39f11b9483b64a88029f1755a6e7166fea15 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期日, 26 四月 2020 16:49:21 +0800
Subject: [PATCH] 等级显示问题
---
fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgAccountDetailFactory.java | 154 ++++-----------------------------------------------
1 files changed, 13 insertions(+), 141 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgAccountDetailFactory.java b/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgAccountDetailFactory.java
index 5081430..a9aaeba 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgAccountDetailFactory.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgAccountDetailFactory.java
@@ -8,14 +8,10 @@
import com.yeshi.fanli.entity.bus.msg.MsgAccountDetail;
import com.yeshi.fanli.entity.bus.msg.MsgAccountDetail.MsgTypeAccountTypeEnum;
import com.yeshi.fanli.entity.bus.user.UserInfo;
-import com.yeshi.fanli.util.Constant;
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;
-
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
public class MsgAccountDetailFactory {
public final static int TYPE_WX = 1;// 寰俊
@@ -122,7 +118,7 @@
List<CommonMsgItemVO> listMsg = new ArrayList<>();
listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("缁戝畾璇︽儏", ClientTextStyleVO.COLOR_TITLE),
- new ClientTextStyleVO("鎭枩浣狅紒" + info +"-"+ way, ClientTextStyleVO.COLOR_CONTENT)));
+ new ClientTextStyleVO("寰堟姳姝夛紒" + info +"-"+ way, ClientTextStyleVO.COLOR_CONTENT)));
listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("缁戝畾璐﹀彿", ClientTextStyleVO.COLOR_TITLE),
new ClientTextStyleVO(typeName, ClientTextStyleVO.COLOR_CONTENT)));
if (!StringUtil.isNullOrEmpty(reason)) {
@@ -159,7 +155,7 @@
new ClientTextStyleVO("閭�璇风爜淇敼", ClientTextStyleVO.COLOR_CONTENT)));
List<ClientTextStyleVO> contentList2 = new ArrayList<>();
- contentList2.add(new ClientTextStyleVO(String.format("浣犲師閭�璇风爜:%s宸茬粡鎴愬姛淇敼涓烘柊閭�璇风爜:", oldCode), ClientTextStyleVO.COLOR_CONTENT));
+ contentList2.add(new ClientTextStyleVO(String.format("浣犲師閭�璇风爜:%s 宸茬粡鎴愬姛淇敼涓烘柊閭�璇风爜:", oldCode), ClientTextStyleVO.COLOR_CONTENT));
contentList2.add(new ClientTextStyleVO(newCode, ClientTextStyleVO.COLOR_HIGHLIGHT_CONTENT));
listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("淇敼璇︽儏", ClientTextStyleVO.COLOR_TITLE),contentList2));
@@ -181,134 +177,15 @@
return detail;
}
+
+
- /**
- * 璐﹀彿瑙ｇ粦鎴愬姛
- *
- * @param uid
- * @param type
- * @return
- */
- public static MsgAccountDetail createUnBindingAccount(Long uid, int type) {
- String msg = "";
- if (type == TYPE_PHONE) {
- msg = "<highlight>鎵嬫満鍙疯В缁戞垚鍔�</highlight>";
- } else if (type == TYPE_TB) {
- msg = "<highlight>娣樺疂瑙ｇ粦鎴愬姛</highlight>";
- } else if (type == TYPE_WX) {
- msg = "<highlight>寰俊瑙ｇ粦鎴愬姛</highlight>";
- }
- if (StringUtil.isNullOrEmpty(msg))
- return null;
- MsgAccountDetail detail = new MsgAccountDetail();
- detail.setBeiZhu("鏃�");
- detail.setContent(msg);
- detail.setTitle("瑙ｇ粦璐﹀彿");
- detail.setType(MsgTypeAccountTypeEnum.cancelBinding);
- detail.setUser(new UserInfo(uid));
- detail.setCreateTime(new Date());
- detail.setRead(false);
- return detail;
- }
- /**
- * 璐﹀彿鏇存崲鎴愬姛
- *
- * @param uid
- * @param type
- * @return
- */
- public static MsgAccountDetail createChangeBindingAccount(Long uid, int type) {
- String msg = "";
- if (type == TYPE_PHONE) {
- msg = "<highlight>鎵嬫満鍙锋洿鎹㈢粦瀹氭垚鍔�</highlight>";
- } else if (type == TYPE_TB) {
- msg = "<highlight>娣樺疂鏇存崲缁戝畾鎴愬姛</highlight>";
- } else if (type == TYPE_WX) {
- msg = "<highlight>寰俊鏇存崲缁戝畾鎴愬姛</highlight>";
- }
- if (StringUtil.isNullOrEmpty(msg))
- return null;
- MsgAccountDetail detail = new MsgAccountDetail();
- detail.setBeiZhu("鏃�");
- detail.setContent(msg);
- detail.setTitle("鏇存崲缁戝畾璐﹀彿");
- detail.setType(MsgTypeAccountTypeEnum.bingdingChange);
- detail.setUser(new UserInfo(uid));
- detail.setCreateTime(new Date());
- detail.setRead(false);
- return detail;
- }
- /**
- * 璐﹀彿鎵撻��
- *
- * @param mainUid
- * @param lessUid
- * @return
- */
- public static MsgAccountDetail createConnectAccount(Long mainUid, Long lessUid) {
- if (mainUid == null || lessUid == null)
- return null;
- String msg = String.format("鎭枩浣犺处鍙峰悎骞舵垚鍔燂紝鐢扁��<highlight>%s</highlight>鈥濆悎骞跺埌鈥�<highlight>%s</highlight>鈥�", lessUid + "",
- mainUid + "");
- MsgAccountDetail detail = new MsgAccountDetail();
- detail.setBeiZhu("鏃�");
- detail.setContent(msg);
- detail.setTitle("璐﹀彿鍚堝苟");
- detail.setType(MsgTypeAccountTypeEnum.connect);
- detail.setUser(new UserInfo(mainUid));
- detail.setCreateTime(new Date());
- detail.setRead(false);
- return detail;
- }
- // 璐﹀彿绛夌骇
- public static MsgAccountDetail createUserRank(Long uid, String orderType, int orderCount, String rankName) {
- if (uid == null || rankName == null)
- return null;
+
- String msg = String.format(
- "鎭枩浣狅紝涓婃湀<highlight>%s</highlight>璁㈠崟杈惧埌<highlight>%s</highlight>鍗曪紝宸蹭负浣犲崌绾т负<highlight>%s</highlight>鐢ㄦ埛锛屽皢浼氳幏寰楀搴旂殑绂忓埄鍜岀壒鏉冦��",
- orderType, orderCount + "", rankName);
- MsgAccountDetail detail = new MsgAccountDetail();
- detail.setBeiZhu("鏃�");
- detail.setContent(msg);
- detail.setTitle("璐﹀彿绛夌骇");
- detail.setType(MsgTypeAccountTypeEnum.level);
- detail.setUser(new UserInfo(uid));
- detail.setCreateTime(new Date());
- detail.setRead(false);
- return detail;
- }
-
- // 娣樺疂鎺堟潈澶辫触
- public static MsgAccountDetail createTaoBaoAuthFail(Long uid, String taoBaoNickName, String reason) {
- if (uid == null || reason == null)
- return null;
-
- JSONArray msg = new JSONArray();
- JSONObject item = new JSONObject();
- item.put("name", "璐﹀彿");
- item.put("content", String.format("娣樺疂鏄电О[%s]", taoBaoNickName));
- msg.add(item);
-
- item = new JSONObject();
- item.put("name", "鍘熷洜");
- item.put("content", reason);
- msg.add(item);
-
- MsgAccountDetail detail = new MsgAccountDetail();
- detail.setBeiZhu("鏃�");
- detail.setContent(msg.toString());
- detail.setTitle("娣樺疂璐﹀彿鎺堟潈澶辫触");
- detail.setType(MsgTypeAccountTypeEnum.taoBaoAuthFail);
- detail.setUser(new UserInfo(uid));
- detail.setCreateTime(new Date());
- detail.setRead(false);
- return detail;
- }
-
+
/**
* 鏅�氫細鍛樸�侀珮绾т細鍛樿嚜鍔ㄦ彁鍗�
@@ -323,25 +200,21 @@
* @return
*/
public static MsgAccountDetail vipPreUpgrade(Long uid, String originalName, String upName, int days, long targetNum1,
- Long targetNum2, Integer type, String beizu) {
+ Long targetNum2) {
if (uid == null || originalName == null || upName == null)
return null;
List<CommonMsgItemVO> listMsg = new ArrayList<>();
List<ClientTextStyleVO> contentList = new ArrayList<>();
contentList.add(new ClientTextStyleVO("鎭枩浣狅紒鏈夋晥", ClientTextStyleVO.COLOR_CONTENT));
- if (type == null) {
+ if (targetNum2 == null) {
contentList.add(new ClientTextStyleVO("鐩存帴绮変笣宸茶揪", ClientTextStyleVO.COLOR_CONTENT));
contentList.add(new ClientTextStyleVO(targetNum1+"", ClientTextStyleVO.COLOR_HIGHLIGHT_CONTENT));
contentList.add(new ClientTextStyleVO("浜猴紝鏈夋晥闂存帴绮変笣宸茶揪", ClientTextStyleVO.COLOR_CONTENT));
contentList.add(new ClientTextStyleVO(targetNum2+"", ClientTextStyleVO.COLOR_HIGHLIGHT_CONTENT));
contentList.add(new ClientTextStyleVO("浜�", ClientTextStyleVO.COLOR_CONTENT));
- } else if (type == Constant.TYPE_REBATE) {
- contentList.add(new ClientTextStyleVO("杩斿埄璁㈠崟宸茶揪", ClientTextStyleVO.COLOR_CONTENT));
- contentList.add(new ClientTextStyleVO(targetNum1+"", ClientTextStyleVO.COLOR_HIGHLIGHT_CONTENT));
- contentList.add(new ClientTextStyleVO("绗�", ClientTextStyleVO.COLOR_CONTENT));
- } else if (type == Constant.TYPE_SHAER) {
- contentList.add(new ClientTextStyleVO("鍒嗕韩璁㈠崟宸茶揪", ClientTextStyleVO.COLOR_CONTENT));
+ } else {
+ contentList.add(new ClientTextStyleVO("杩斿埄+鍒嗕韩璁㈠崟宸茶揪", ClientTextStyleVO.COLOR_CONTENT));
contentList.add(new ClientTextStyleVO(targetNum1+"", ClientTextStyleVO.COLOR_HIGHLIGHT_CONTENT));
contentList.add(new ClientTextStyleVO("绗�", ClientTextStyleVO.COLOR_CONTENT));
}
@@ -361,10 +234,9 @@
new ClientTextStyleVO("浠庢敹鍒版湰娑堟伅璧凤紝浣犲皢鑾峰緱璇ヨ处鎴风瓑绾у搴旂殑鍏ㄩ儴鏉冪泭", ClientTextStyleVO.COLOR_CONTENT)));
listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("澶囨敞", ClientTextStyleVO.COLOR_TITLE),
- new ClientTextStyleVO(StringUtil.isNullOrEmpty(beizu)?"鏃�":beizu, ClientTextStyleVO.COLOR_CONTENT)));
+ new ClientTextStyleVO("鏃�", ClientTextStyleVO.COLOR_CONTENT)));
MsgAccountDetail detail = new MsgAccountDetail();
- detail.setBeiZhu(beizu);
detail.setTitle("绛夌骇鎴愰暱");
detail.setType(MsgTypeAccountTypeEnum.vipPgrade);
detail.setUser(new UserInfo(uid));
@@ -480,7 +352,7 @@
listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("閭�绾﹀師鍥�", ClientTextStyleVO.COLOR_TITLE),
new ClientTextStyleVO("灏婃暚鐨�"+ nickname+"锛屼綘宸茬鍚堟垚闀夸负涓�鍚嶈祫娣卞甯堢殑鏉′欢锛屽笇鏈涗綘鑳藉姞鍏ユ澘鏍楀揩鐪佽繍钀ュ洟闃燂紝涓庢垜浠叡鍒涜緣鐓�", ClientTextStyleVO.COLOR_CONTENT)));
listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("涓撳睘瀹㈡湇", ClientTextStyleVO.COLOR_TITLE),
- new ClientTextStyleVO(kefuName + "-寰俊鍙凤細" +kefuWX, ClientTextStyleVO.COLOR_CONTENT)));
+ new ClientTextStyleVO(kefuName + "-寰俊鍙�:" +kefuWX, ClientTextStyleVO.COLOR_CONTENT)));
listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("瀵瑰簲鏉冪泭", ClientTextStyleVO.COLOR_TITLE),
new ClientTextStyleVO("濡傛灉浣犳帴鍙楅個绾︼紝浣犲皢鑾峰緱璇ヨ处鎴风瓑绾у搴旂殑鍏ㄩ儴鏉冪泭聽", ClientTextStyleVO.COLOR_CONTENT)));
listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("澶囨敞", ClientTextStyleVO.COLOR_TITLE),
@@ -523,7 +395,7 @@
listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("閭�绾﹀師鍥�", ClientTextStyleVO.COLOR_TITLE),
new ClientTextStyleVO("浠庢敹鍒版湰娑堟伅璧凤紝浣犲皢鑾峰緱璇ヨ处鎴风瓑绾у搴旂殑鍏ㄩ儴鏉冪泭", ClientTextStyleVO.COLOR_CONTENT)));
listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("涓撳睘瀹㈡湇", ClientTextStyleVO.COLOR_TITLE),
- new ClientTextStyleVO(kefuName + "-寰俊鍙凤細" +kefuWX, ClientTextStyleVO.COLOR_CONTENT)));
+ new ClientTextStyleVO(kefuName + "-寰俊鍙�:" +kefuWX, ClientTextStyleVO.COLOR_CONTENT)));
listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("澶囨敞", ClientTextStyleVO.COLOR_TITLE),
new ClientTextStyleVO("涓庝綘鍏卞垱杈夌厡", ClientTextStyleVO.COLOR_CONTENT)));
--
Gitblit v1.8.0