From f99d8098b0aee17c09be5dfee8b4f72a6f4071b1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期日, 26 四月 2020 11:57:39 +0800
Subject: [PATCH] 同步老用户等级数据

---
 fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgOrderDetailFactory.java |   32 ++++++++++++++++++--------------
 1 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgOrderDetailFactory.java b/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgOrderDetailFactory.java
index 386a61b..dfabb77 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgOrderDetailFactory.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgOrderDetailFactory.java
@@ -44,15 +44,15 @@
 		MsgTypeOrderTypeEnum typeEnum = null;
 		String sourceName = Constant.getSourceName(source);
 		if (Constant.TYPE_REBATE == type) {
-			fanliName = "杩斿埄锛�";
+			fanliName = "棰勪及杩斿埄:";
 			sourceName += "-杩斿埄璁㈠崟";
 			typeEnum = MsgTypeOrderTypeEnum.fanli;
 		} else if (Constant.TYPE_SHAER == type) {
-			fanliName = "濂栭噾锛�";
+			fanliName = "棰勪及濂栭噾:";
 			sourceName += "-鍒嗕韩璁㈠崟";
 			typeEnum = MsgTypeOrderTypeEnum.share;
 		} else if (Constant.TYPE_INVITE == type) {
-			fanliName = "鏀剁泭锛�";
+			fanliName = "棰勪及鏀剁泭:";
 			sourceName += "-鍥㈤槦璁㈠崟";
 			typeEnum = MsgTypeOrderTypeEnum.invite;
 		}
@@ -70,17 +70,18 @@
 					new ClientTextStyleVO(orderId, ClientTextStyleVO.COLOR_CONTENT), true));
 		}
 
+		listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("涓嬪崟鏃堕棿", ClientTextStyleVO.COLOR_TITLE),
+				new ClientTextStyleVO(TimeUtil.formatDate(downTime), ClientTextStyleVO.COLOR_CONTENT)));
+		
 		List<ClientTextStyleVO> contentList = new ArrayList<>();
-		contentList
-				.add(new ClientTextStyleVO("涓嬪崟鏃堕棿锛�" + TimeUtil.formatDate(downTime), ClientTextStyleVO.COLOR_CONTENT));
-		contentList.add(new ClientTextStyleVO("-鍟嗗搧鏁伴噺锛氬叡", ClientTextStyleVO.COLOR_CONTENT));
+		contentList.add(new ClientTextStyleVO("鍏�", ClientTextStyleVO.COLOR_CONTENT));
 		contentList.add(new ClientTextStyleVO(goodsCount + "", ClientTextStyleVO.COLOR_HIGHLIGHT_CONTENT));
 		contentList.add(new ClientTextStyleVO("浠跺晢鍝�", ClientTextStyleVO.COLOR_CONTENT));
-		listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("璁㈠崟鐩稿叧", ClientTextStyleVO.COLOR_TITLE),
+		listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("鍟嗗搧鏁伴噺", ClientTextStyleVO.COLOR_TITLE),
 				contentList));
 
 		List<ClientTextStyleVO> contentList2 = new ArrayList<>();
-		contentList2.add(new ClientTextStyleVO("瀹炰粯娆撅細", ClientTextStyleVO.COLOR_CONTENT));
+		contentList2.add(new ClientTextStyleVO("瀹炰粯娆�:", ClientTextStyleVO.COLOR_CONTENT));
 		contentList2.add(new ClientTextStyleVO("楼" + filterMoney(payMoney), ClientTextStyleVO.COLOR_HIGHLIGHT_CONTENT));
 		contentList2.add(new ClientTextStyleVO("&" + fanliName, ClientTextStyleVO.COLOR_CONTENT));
 		contentList2.add(new ClientTextStyleVO("楼" + filterMoney(money), ClientTextStyleVO.COLOR_HIGHLIGHT_CONTENT));
@@ -135,10 +136,10 @@
 		String fanliName = "";
 		String sourceName = Constant.getSourceName(source);
 		if (Constant.TYPE_REBATE == type) {
-			fanliName = "杩斿埄锛�";
+			fanliName = "棰勪及杩斿埄:";
 			sourceName +=  "-杩斿埄璁㈠崟";
 		} else if (Constant.TYPE_SHAER == type) {
-			fanliName = "濂栭噾锛�";
+			fanliName = "棰勪及濂栭噾:";
 			sourceName +=  "-鍒嗕韩璁㈠崟";
 		}
 		
@@ -153,15 +154,17 @@
 		listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("璁㈠崟鍙�", ClientTextStyleVO.COLOR_TITLE),
 				new ClientTextStyleVO(orderId, ClientTextStyleVO.COLOR_CONTENT), true));
 		
+		listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("鎻愪氦鏃堕棿", ClientTextStyleVO.COLOR_TITLE),
+				new ClientTextStyleVO(TimeUtil.formatDate(submitTime), ClientTextStyleVO.COLOR_CONTENT)));
+		
 		List<ClientTextStyleVO> contentList = new ArrayList<>();
-		contentList.add(new ClientTextStyleVO("鎻愪氦鏃堕棿锛�" + TimeUtil.formatDate(submitTime), ClientTextStyleVO.COLOR_CONTENT));
-		contentList.add(new ClientTextStyleVO("-鍟嗗搧鏁伴噺锛氬叡", ClientTextStyleVO.COLOR_CONTENT));
+		contentList.add(new ClientTextStyleVO("鍏�", ClientTextStyleVO.COLOR_CONTENT));
 		contentList.add(new ClientTextStyleVO(goodsCount + "", ClientTextStyleVO.COLOR_HIGHLIGHT_CONTENT));
 		contentList.add(new ClientTextStyleVO("浠跺晢鍝�", ClientTextStyleVO.COLOR_CONTENT));
-		listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("璁㈠崟鐩稿叧", ClientTextStyleVO.COLOR_TITLE),contentList));
+		listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("鍟嗗搧鏁伴噺", ClientTextStyleVO.COLOR_TITLE),contentList));
 		
 		List<ClientTextStyleVO> contentList2 = new ArrayList<>();
-		contentList2.add(new ClientTextStyleVO("瀹炰粯娆撅細", ClientTextStyleVO.COLOR_CONTENT));
+		contentList2.add(new ClientTextStyleVO("瀹炰粯娆�:", ClientTextStyleVO.COLOR_CONTENT));
 		contentList2.add(new ClientTextStyleVO("楼" + filterMoney(payMoney), ClientTextStyleVO.COLOR_HIGHLIGHT_CONTENT));
 		contentList2.add(new ClientTextStyleVO("&" + fanliName, ClientTextStyleVO.COLOR_CONTENT));
 		contentList2.add(new ClientTextStyleVO("楼" + filterMoney(money), ClientTextStyleVO.COLOR_HIGHLIGHT_CONTENT));
@@ -172,6 +175,7 @@
 		
 		
 		MsgOrderDetail detail = new MsgOrderDetail();
+		detail.setOrderId(orderId);
 		detail.setBeiZhu(beiZhu);
 		detail.setCreateTime(new Date());
 		detail.setOrderType(source);

--
Gitblit v1.8.0