From d0b7f936a3ae253efc67be35c349a647fec94594 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 05 八月 2019 10:52:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgMoneyDetailFactory.java |   35 +++++++++++++++++++++--------------
 1 files changed, 21 insertions(+), 14 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 d4a5e47..0aace0a 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
@@ -118,8 +118,8 @@
 	 * @param beiZhu
 	 * @return
 	 */
-	public static MsgMoneyDetail createFailiMsg(BigDecimal money, BigDecimal balance, String orderId, int goodsCount,
-			Long uid, String beiZhu) {
+	public static MsgMoneyDetail createFailiMsg(BigDecimal money, BigDecimal balance, String orderId, int orderType,
+			int goodsCount, Long uid, String beiZhu) {
 		if (money == null || balance == null || orderId == null || uid == null)
 			return null;
 
@@ -131,6 +131,7 @@
 		detail.setMoney(money);
 		detail.setMsgType(MsgTypeMoneyTypeEnum.fanli);
 		detail.setOrderId(orderId);
+		detail.setOrderType(orderType);
 		detail.setRead(false);
 		detail.setUser(new UserInfo(uid));
 
@@ -147,8 +148,8 @@
 	 * @param beiZhu
 	 * @return
 	 */
-	public static MsgMoneyDetail createFailiWeiQuanMsg(Long uid, String orderId, BigDecimal money, BigDecimal balance,
-			String beiZhu) {
+	public static MsgMoneyDetail createFailiWeiQuanMsg(Long uid, String orderId, int orderType, BigDecimal money,
+			BigDecimal balance, String beiZhu) {
 		if (money == null || orderId == null || money == null || uid == null)
 			return null;
 
@@ -159,6 +160,7 @@
 		detail.setMoney(money);
 		detail.setMsgType(MsgTypeMoneyTypeEnum.fanliWeiQuan);
 		detail.setOrderId(orderId);
+		detail.setOrderType(orderType);
 		detail.setRead(false);
 		detail.setUser(new UserInfo(uid));
 
@@ -176,8 +178,8 @@
 	 * @param beiZhu
 	 * @return
 	 */
-	public static MsgMoneyDetail createInviteMsg(BigDecimal money, BigDecimal balance, int orderCount, int goodsCount,
-			Long uid, String beiZhu) {
+	public static MsgMoneyDetail createInviteMsg(BigDecimal money, BigDecimal balance, int orderType, int orderCount,
+			int goodsCount, Long uid, String beiZhu) {
 		if (money == null || balance == null || uid == null)
 			return null;
 
@@ -191,6 +193,7 @@
 		detail.setOrderCount(orderCount);
 		detail.setRead(false);
 		detail.setUser(new UserInfo(uid));
+		detail.setOrderType(orderType);
 
 		return detail;
 	}
@@ -205,8 +208,8 @@
 	 * @param beiZhu
 	 * @return
 	 */
-	public static MsgMoneyDetail createInviteWeiQuanMsg(Long uid, String orderId, BigDecimal money, BigDecimal balance,
-			String beiZhu) {
+	public static MsgMoneyDetail createInviteWeiQuanMsg(Long uid, String orderId, int orderType, BigDecimal money,
+			BigDecimal balance, String beiZhu) {
 		if (money == null || orderId == null || money == null || uid == null)
 			return null;
 
@@ -219,6 +222,7 @@
 		detail.setOrderId(orderId);
 		detail.setRead(false);
 		detail.setUser(new UserInfo(uid));
+		detail.setOrderType(orderType);
 
 		return detail;
 	}
@@ -234,8 +238,8 @@
 	 * @param beiZhu
 	 * @return
 	 */
-	public static MsgMoneyDetail createShareMsg(BigDecimal money, BigDecimal balance, int orderCount, int goodsCount,
-			Long uid, String beiZhu) {
+	public static MsgMoneyDetail createShareMsg(BigDecimal money, BigDecimal balance, int orderType, int orderCount,
+			int goodsCount, Long uid, String beiZhu) {
 		if (money == null || balance == null || uid == null)
 			return null;
 
@@ -244,6 +248,7 @@
 		detail.setBeiZhu(beiZhu);
 		detail.setCreateTime(new Date());
 		detail.setGoodsCount(goodsCount);
+		detail.setOrderType(orderType);
 		detail.setMoney(money);
 		detail.setMsgType(MsgTypeMoneyTypeEnum.share);
 		detail.setOrderCount(orderCount);
@@ -263,8 +268,8 @@
 	 * @param beiZhu
 	 * @return
 	 */
-	public static MsgMoneyDetail createShareWeiQuanMsg(Long uid, String orderId, BigDecimal money, BigDecimal balance,
-			String beiZhu) {
+	public static MsgMoneyDetail createShareWeiQuanMsg(Long uid, String orderId,int orderType, BigDecimal money, 
+			BigDecimal balance, String beiZhu) {
 		if (money == null || orderId == null || money == null || uid == null)
 			return null;
 		MsgMoneyDetail detail = new MsgMoneyDetail();
@@ -276,11 +281,12 @@
 		detail.setOrderId(orderId);
 		detail.setRead(false);
 		detail.setUser(new UserInfo(uid));
+		detail.setOrderType(orderType);
 		return detail;
 	}
 
-	public static MsgMoneyDetail createOrderRewardMsg(Long uid, String orderId, BigDecimal money, BigDecimal balance,
-			String beiZhu) {
+	public static MsgMoneyDetail createOrderRewardMsg(Long uid, String orderId, int orderType, BigDecimal money,
+			BigDecimal balance, String beiZhu) {
 		if (money == null || orderId == null || money == null || uid == null)
 			return null;
 
@@ -292,6 +298,7 @@
 		detail.setMsgType(MsgTypeMoneyTypeEnum.orderReward);
 		detail.setOrderId(orderId);
 		detail.setRead(false);
+		detail.setOrderType(orderType);
 		detail.setUser(new UserInfo(uid));
 		return detail;
 	}

--
Gitblit v1.8.0