From ee5c8055b1c0dd7c67a9025a76b10bd287c93d9a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 15 四月 2020 09:52:27 +0800
Subject: [PATCH] 资金明细增加团队分红
---
fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgOrderDetailFactory.java | 42 +++++++++++++++++++++---------------------
1 files changed, 21 insertions(+), 21 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 48b2cd3..506acea 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
@@ -14,18 +14,12 @@
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TimeUtil;
+import com.yeshi.fanli.util.account.UserUtil;
import com.yeshi.fanli.vo.msg.ClientTextStyleVO;
import com.yeshi.fanli.vo.msg.CommonMsgItemVO;
import com.yeshi.fanli.vo.msg.CommonMsgItemVOFactory;
public class MsgOrderDetailFactory {
-
-
-
-
-
-
-
/**
* 鍒涘缓璁㈠崟琚粺璁℃秷鎭�
@@ -50,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;
}
@@ -67,21 +61,26 @@
List<CommonMsgItemVO> listMsg = new ArrayList<>();
listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("璁㈠崟璇︽儏", ClientTextStyleVO.COLOR_TITLE),
new ClientTextStyleVO(sourceName, ClientTextStyleVO.COLOR_CONTENT)));
- // 璁㈠崟鍙峰彲鐐瑰嚮
- listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("璁㈠崟鍙�", ClientTextStyleVO.COLOR_TITLE),
- new ClientTextStyleVO(orderId, ClientTextStyleVO.COLOR_CONTENT), true));
+
+ if (Constant.TYPE_INVITE == type) {
+ listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("璁㈠崟鍙�", ClientTextStyleVO.COLOR_TITLE),
+ new ClientTextStyleVO(UserUtil.filterOrderId(orderId), ClientTextStyleVO.COLOR_CONTENT), true));
+ } else {
+ listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("璁㈠崟鍙�", ClientTextStyleVO.COLOR_TITLE),
+ new ClientTextStyleVO(orderId, ClientTextStyleVO.COLOR_CONTENT), true));
+ }
List<ClientTextStyleVO> contentList = new ArrayList<>();
contentList
- .add(new ClientTextStyleVO("涓嬪崟鏃堕棿锛�" + TimeUtil.formatDate(downTime), ClientTextStyleVO.COLOR_CONTENT));
- contentList.add(new ClientTextStyleVO("-鍟嗗搧鏁伴噺锛氬叡", ClientTextStyleVO.COLOR_CONTENT));
+ .add(new ClientTextStyleVO("涓嬪崟鏃堕棿:" + TimeUtil.formatDate(downTime), 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));
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));
@@ -136,10 +135,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 += "-鍒嗕韩璁㈠崟";
}
@@ -155,14 +154,14 @@
new ClientTextStyleVO(orderId, ClientTextStyleVO.COLOR_CONTENT), true));
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("鎻愪氦鏃堕棿:" + TimeUtil.formatDate(submitTime), 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));
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));
@@ -173,6 +172,7 @@
MsgOrderDetail detail = new MsgOrderDetail();
+ detail.setOrderId(orderId);
detail.setBeiZhu(beiZhu);
detail.setCreateTime(new Date());
detail.setOrderType(source);
--
Gitblit v1.8.0