From 24a8d17e007545f7426c48352109aa1a9c6587ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 06 五月 2020 12:02:09 +0800
Subject: [PATCH] IOS上线隐藏我的界面的banner与超级会员升级信息

---
 fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgMoneyDetailFactory.java |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgMoneyDetailFactory.java b/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgMoneyDetailFactory.java
index b3917eb..82bba94 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgMoneyDetailFactory.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgMoneyDetailFactory.java
@@ -29,7 +29,8 @@
 	 * @param beiZhu
 	 * @return
 	 */
-	public static MsgMoneyDetail createExtractMsg(String stateDesc, Long uid, Extract extract, String reason, String alipayNo) {
+	public static MsgMoneyDetail createExtractMsg(String stateDesc, Long uid, Extract extract, String reason, 
+			String alipayNo, String beizu) {
 		if (extract == null || uid == null)
 			return null;
 		
@@ -54,9 +55,8 @@
 			listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("鍘熷洜", ClientTextStyleVO.COLOR_TITLE),
 					new ClientTextStyleVO(reason, ClientTextStyleVO.COLOR_CONTENT)));
 		}
-		
 		listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("澶囨敞", ClientTextStyleVO.COLOR_TITLE),
-				new ClientTextStyleVO("濡傛湁鐤戦棶璇疯仈绯讳汉宸ュ鏈�", ClientTextStyleVO.COLOR_CONTENT)));
+				new ClientTextStyleVO(beizu, ClientTextStyleVO.COLOR_CONTENT)));
 		
 		MsgMoneyDetail detail = new MsgMoneyDetail();
 		detail.setBeiZhu(reason);
@@ -249,12 +249,19 @@
 	 * @param beiZhu
 	 * @return
 	 */
-	public static MsgMoneyDetail shareOrderReceivedMsg(BigDecimal money, BigDecimal balance, int source, Long uid) {
+	public static MsgMoneyDetail shareOrderReceivedMsg(BigDecimal money, BigDecimal balance, int source, Long uid, Date receivedDate) {
 		if (money == null || balance == null || uid == null)
 			return null;
 
 		String sourceName = Constant.getSourceName(source) + "-鍒嗕韩璁㈠崟";
 		List<CommonMsgItemVO> listMsg = new ArrayList<>();
+		
+		List<ClientTextStyleVO> contentList = new ArrayList<>();
+		contentList.add(new ClientTextStyleVO(TimeUtil.getYearOnlyYYYY(receivedDate)+ "骞�", ClientTextStyleVO.COLOR_CONTENT));
+		contentList.add(new ClientTextStyleVO(TimeUtil.getMonthOnlyMM(receivedDate), 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),
 				new ClientTextStyleVO(sourceName, ClientTextStyleVO.COLOR_CONTENT)));
 		
@@ -377,7 +384,7 @@
 		listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("缁撶畻鏈堝害", ClientTextStyleVO.COLOR_TITLE), contentList));
 		
 		listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("鍒拌处绫荤洰", ClientTextStyleVO.COLOR_TITLE),
-				new ClientTextStyleVO(teamName, ClientTextStyleVO.COLOR_CONTENT), true));
+				new ClientTextStyleVO(teamName, ClientTextStyleVO.COLOR_CONTENT)));
 		
 		List<ClientTextStyleVO> contentList2 = new ArrayList<>();
 		contentList2.add(new ClientTextStyleVO("楼" + money.setScale(2, BigDecimal.ROUND_DOWN), ClientTextStyleVO.COLOR_HIGHLIGHT_CONTENT));

--
Gitblit v1.8.0