From 91d0826fffcc79d5869b15fffe4392399d23f0b1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期日, 26 四月 2020 17:39:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgAccountDetailFactory.java | 29 ++++++++++-------------------
1 files changed, 10 insertions(+), 19 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 4f0768b..d1acaad 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));
@@ -203,26 +199,22 @@
* @param beizu
* @return
*/
- public static MsgAccountDetail vipPreUpgrade(Long uid, String originalName, String upName, int days, long targetNum1,
- Long targetNum2, Integer type, String beizu) {
+ public static MsgAccountDetail vipPreUpgrade(Long uid, String originalName, String upName, int days, long targetNum1,
+ Long targetNum2, boolean teamPass) {
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 (teamPass) {
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));
}
@@ -242,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));
@@ -361,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),
@@ -404,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