From 160c9b86a3dd9cf9823759ba2fa7acdfea40b6d9 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 四月 2020 09:57:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgAccountDetailFactory.java | 127 +-----------------------------------------
1 files changed, 4 insertions(+), 123 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..4f0768b 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
@@ -181,134 +181,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;
- }
-
+
/**
* 鏅�氫細鍛樸�侀珮绾т細鍛樿嚜鍔ㄦ彁鍗�
--
Gitblit v1.8.0