From 0a3e5a876724ac247b33632300701077098111eb Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 18 七月 2019 17:11:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/util/factory/msg/UserMsgVOFactory.java | 59 ++++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 36 insertions(+), 23 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/UserMsgVOFactory.java b/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/UserMsgVOFactory.java
index c8f9e23..96b3490 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/UserMsgVOFactory.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/UserMsgVOFactory.java
@@ -15,6 +15,7 @@
import com.yeshi.fanli.entity.bus.msg.MsgOrderDetail;
import com.yeshi.fanli.entity.bus.msg.MsgOrderDetail.MsgTypeOrderTypeEnum;
import com.yeshi.fanli.entity.bus.msg.MsgOtherDetail;
+import com.yeshi.fanli.entity.bus.msg.MsgAccountDetail.MsgTypeAccountTypeEnum;
import com.yeshi.fanli.entity.bus.msg.MsgOtherDetail.MsgTypeOtherTypeEnum;
import com.yeshi.fanli.entity.bus.user.BindingAccount;
import com.yeshi.fanli.entity.bus.user.Extract;
@@ -27,6 +28,7 @@
import com.yeshi.fanli.vo.msg.CommonMsgItemVO;
import com.yeshi.fanli.vo.msg.UserMsgVO;
+import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
public class UserMsgVOFactory {
@@ -79,7 +81,7 @@
} else {
contentList.add(new ClientTextStyleVO(msg.getOrderId(), COLOR_CONTENT));
- items.add(new CommonMsgItemVO(new ClientTextStyleVO("璁㈠崟鍙�", COLOR_TITLE), contentList,true));
+ items.add(new CommonMsgItemVO(new ClientTextStyleVO("璁㈠崟鍙�", COLOR_TITLE), contentList, true));
contentList = new ArrayList<>();
contentList.add(new ClientTextStyleVO("鍏�", COLOR_CONTENT));
@@ -385,13 +387,13 @@
return new UserMsgVO("http://img.flqapp.com/resource/msg/icon_msg_order_reward.png",
msg.getMsgType().getDesc(), msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(),
items);
- }else if (msg.getMsgType() == MsgTypeMoneyTypeEnum.systemEqualize ) {// 濂栧姳璁㈠崟
+ } else if (msg.getMsgType() == MsgTypeMoneyTypeEnum.systemEqualize) {// 濂栧姳璁㈠崟
contentList = new ArrayList<>();
contentList.add(new ClientTextStyleVO("楼" + filterMoney(msg.getMoney()) + "", COLOR_HIGHLIGHT_CONTENT));
items.add(new CommonMsgItemVO(new ClientTextStyleVO("琛ラ綈閲戦", COLOR_TITLE), contentList));
-
+
contentList = new ArrayList<>();
- contentList.add(new ClientTextStyleVO(msg.getOrderId()+ "", COLOR_CONTENT));
+ contentList.add(new ClientTextStyleVO(msg.getOrderId() + "", COLOR_CONTENT));
items.add(new CommonMsgItemVO(new ClientTextStyleVO("琛ラ綈鍘熷洜", COLOR_TITLE), contentList));
contentList = new ArrayList<>();
@@ -421,7 +423,7 @@
List<CommonMsgItemVO> items = new ArrayList<>();
List<ClientTextStyleVO> contentList = new ArrayList<>();
- contentList.add(new ClientTextStyleVO(msg.getType().getDesc() + "", COLOR_CONTENT));
+ contentList.add(new ClientTextStyleVO(msg.getTitle() + "", COLOR_CONTENT));
items.add(new CommonMsgItemVO(new ClientTextStyleVO("浜嬮」", COLOR_TITLE), contentList));
// 鐘舵�佷慨鏀�
@@ -430,24 +432,36 @@
int fromIndex = 0;
int toIndex = 0;
String stateDesc = msg.getContent();
- while (stateDesc.indexOf("<highlight>") > -1) {
- fromIndex = stateDesc.indexOf("<highlight>");
- toIndex = stateDesc.indexOf("</highlight>");
- String content1 = stateDesc.substring(0, fromIndex);
- String content2 = stateDesc.substring(fromIndex + "<highlight>".length(), toIndex);
- stateDesc = stateDesc.substring(toIndex + "</highlight>".length(), stateDesc.length());
+ if (msg.getType() == MsgTypeAccountTypeEnum.taoBaoAuthFail) {// 娣樺疂鎺堟潈澶辫触
+ JSONArray array = JSONArray.fromObject(stateDesc);
+ for (int i = 0; i < array.size(); i++) {
+ String name = array.optJSONObject(i).optString("name");
+ String content = array.optJSONObject(i).optString("content");
+ contentList = new ArrayList<>();
+ contentList.add(new ClientTextStyleVO(content, i > 0 ? COLOR_HIGHLIGHT_CONTENT : COLOR_CONTENT));
+ items.add(new CommonMsgItemVO(new ClientTextStyleVO(name, COLOR_TITLE), contentList));
+ }
- if (!StringUtil.isNullOrEmpty(content1)) {
- contentList.add(new ClientTextStyleVO(content1, COLOR_CONTENT));
+ } else {
+ while (stateDesc.indexOf("<highlight>") > -1) {
+ fromIndex = stateDesc.indexOf("<highlight>");
+ toIndex = stateDesc.indexOf("</highlight>");
+ String content1 = stateDesc.substring(0, fromIndex);
+ String content2 = stateDesc.substring(fromIndex + "<highlight>".length(), toIndex);
+ stateDesc = stateDesc.substring(toIndex + "</highlight>".length(), stateDesc.length());
+
+ if (!StringUtil.isNullOrEmpty(content1)) {
+ contentList.add(new ClientTextStyleVO(content1, COLOR_CONTENT));
+ }
+ if (!StringUtil.isNullOrEmpty(content2)) {
+ contentList.add(new ClientTextStyleVO(content2, COLOR_HIGHLIGHT_CONTENT));
+ }
}
- if (!StringUtil.isNullOrEmpty(content2)) {
- contentList.add(new ClientTextStyleVO(content2, COLOR_HIGHLIGHT_CONTENT));
+ if (!StringUtil.isNullOrEmpty(stateDesc)) {
+ contentList.add(new ClientTextStyleVO(stateDesc, COLOR_CONTENT));
}
+ items.add(new CommonMsgItemVO(new ClientTextStyleVO("鐘舵��", COLOR_TITLE), contentList));
}
- if (!StringUtil.isNullOrEmpty(stateDesc)) {
- contentList.add(new ClientTextStyleVO(stateDesc, COLOR_CONTENT));
- }
- items.add(new CommonMsgItemVO(new ClientTextStyleVO("鐘舵��", COLOR_TITLE), contentList));
contentList = new ArrayList<>();
contentList.add(new ClientTextStyleVO(StringUtil.isNullOrEmpty(msg.getBeiZhu()) ? "鏃�" : msg.getBeiZhu() + "",
@@ -587,7 +601,7 @@
contentList.add(new ClientTextStyleVO(dto.getSource() + "", COLOR_CONTENT));
items.add(new CommonMsgItemVO(new ClientTextStyleVO("鏉ユ簮", COLOR_TITLE), contentList));
}
-
+
if (!StringUtil.isNullOrEmpty(dto.getTimeDesc())) {
contentList = new ArrayList<>();
contentList.add(new ClientTextStyleVO(dto.getTimeDesc() + "", COLOR_CONTENT));
@@ -601,19 +615,18 @@
items.add(new CommonMsgItemVO(new ClientTextStyleVO("闈㈤", COLOR_TITLE), contentList));
}
-
if (!StringUtil.isNullOrEmpty(dto.getReason())) {
contentList = new ArrayList<>();
contentList.add(new ClientTextStyleVO(dto.getReason() + "", COLOR_CONTENT));
items.add(new CommonMsgItemVO(new ClientTextStyleVO("鍘熷洜", COLOR_TITLE), contentList));
}
-
+
if (!StringUtil.isNullOrEmpty(dto.getResult())) {
contentList = new ArrayList<>();
contentList.add(new ClientTextStyleVO(dto.getResult() + "", COLOR_CONTENT));
items.add(new CommonMsgItemVO(new ClientTextStyleVO("缁撴灉", COLOR_TITLE), contentList));
}
-
+
contentList = new ArrayList<>();
contentList.add(new ClientTextStyleVO(StringUtil.isNullOrEmpty(msg.getBeiZhu()) ? "鏃�" : msg.getBeiZhu(),
COLOR_CONTENT));
--
Gitblit v1.8.0