From 207dc8655711cddac2653e18b51e58a88dba2084 Mon Sep 17 00:00:00 2001
From: yj <Administrator@192>
Date: 星期五, 06 三月 2020 18:14:36 +0800
Subject: [PATCH] 发圈处理

---
 fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgOrderDetailFactory.java |   83 ++++++++++++++++++++++++++++++++++++-----
 1 files changed, 73 insertions(+), 10 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 86d48b2..ba502c9 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
@@ -22,9 +22,9 @@
 	 * @param beiZhu
 	 * @return
 	 */
-	public static MsgOrderDetail createFanLiOrder(Long uid, String orderId, int goodsCount, int orderState,
-			BigDecimal payMoney, BigDecimal money, int state, String beiZhu) {
-		if (payMoney == null || money == null || uid == null)
+	public static MsgOrderDetail createFanLiOrder(Long uid, String orderId, int orderType, int goodsCount,
+			int orderState, BigDecimal payMoney, BigDecimal money, String beiZhu) {
+		if (uid == null)
 			return null;
 		MsgOrderDetail detail = new MsgOrderDetail();
 		detail.setBeiZhu(beiZhu);
@@ -32,9 +32,10 @@
 		detail.setGoodsCount(goodsCount);
 		detail.setHongBaoMoney(money);
 		detail.setOrderId(orderId);
+		detail.setOrderType(orderType);
 		detail.setPayMoney(payMoney);
 		detail.setRead(false);
-		detail.setState(state);
+		detail.setState(orderState);
 		detail.setType(MsgTypeOrderTypeEnum.fanli);
 		detail.setUser(new UserInfo(uid));
 		return detail;
@@ -53,8 +54,8 @@
 	 * @param beiZhu
 	 * @return
 	 */
-	public static MsgOrderDetail createInviteOrder(Long uid, String orderId, int goodsCount, int orderState,
-			BigDecimal payMoney, BigDecimal money, int state, String beiZhu) {
+	public static MsgOrderDetail createInviteOrder(Long uid, String orderId, int orderType, int goodsCount,
+			int orderState, BigDecimal payMoney, BigDecimal money, String beiZhu) {
 		if (payMoney == null || money == null || uid == null)
 			return null;
 		MsgOrderDetail detail = new MsgOrderDetail();
@@ -63,9 +64,10 @@
 		detail.setGoodsCount(goodsCount);
 		detail.setHongBaoMoney(money);
 		detail.setOrderId(orderId);
+		detail.setOrderType(orderType);
 		detail.setPayMoney(payMoney);
 		detail.setRead(false);
-		detail.setState(state);
+		detail.setState(orderState);
 		detail.setType(MsgTypeOrderTypeEnum.invite);
 		detail.setUser(new UserInfo(uid));
 		return detail;
@@ -84,8 +86,8 @@
 	 * @param beiZhu
 	 * @return
 	 */
-	public static MsgOrderDetail createShareOrder(Long uid, String orderId, int goodsCount, int orderState,
-			BigDecimal payMoney, BigDecimal money, int state, String beiZhu) {
+	public static MsgOrderDetail createShareOrder(Long uid, String orderId, int orderType, int goodsCount,
+			int orderState, BigDecimal payMoney, BigDecimal money, String beiZhu) {
 		if (payMoney == null || money == null || uid == null)
 			return null;
 		MsgOrderDetail detail = new MsgOrderDetail();
@@ -94,12 +96,73 @@
 		detail.setGoodsCount(goodsCount);
 		detail.setHongBaoMoney(money);
 		detail.setOrderId(orderId);
+		detail.setOrderType(orderType);
 		detail.setPayMoney(payMoney);
 		detail.setRead(false);
-		detail.setState(state);
+		detail.setState(orderState);
 		detail.setType(MsgTypeOrderTypeEnum.share);
 		detail.setUser(new UserInfo(uid));
 		return detail;
 	}
 
+	/**
+	 * 璁㈠崟鎵惧洖
+	 * 
+	 * @param uid
+	 * @param orderId
+	 *            -璁㈠崟鍙�
+	 * @param isSuccess-鏄惁鎵惧洖鎴愬姛
+	 * @param payMoney
+	 * @param orderType
+	 *            1-娣樺疂璁㈠崟 3-鎷煎澶氳鍗� 4-浜笢璁㈠崟
+	 * @param beiZhu
+	 * @return
+	 */
+	public static MsgOrderDetail createFoundOrder(Long uid, String orderId, boolean isSuccess, BigDecimal payMoney,
+			int orderType, Date happendDate, String beiZhu) {
+		if (orderId == null || uid == null)
+			return null;
+		MsgOrderDetail detail = new MsgOrderDetail();
+		detail.setBeiZhu(beiZhu);
+		detail.setCreateTime(new Date());
+		detail.setOrderType(orderType);
+		detail.setPayMoney(payMoney);
+		detail.setRead(false);
+		detail.setState(isSuccess ? 1 : 0);
+		detail.setType(MsgTypeOrderTypeEnum.found);
+		detail.setUser(new UserInfo(uid));
+		detail.setHappendDate(happendDate);
+		return detail;
+	}
+	
+	/**
+	 * 楗夸簡涔堣鍗曟秷鎭�
+	 * @param uid
+	 * @param orderId
+	 * @param orderType
+	 * @param orderState
+	 * @param payMoney
+	 * @param money
+	 * @param beiZhu
+	 * @return
+	 */
+	public static MsgOrderDetail createElmeOrder(Long uid, String orderId, int orderType,
+			int orderState, BigDecimal payMoney, BigDecimal money, String beiZhu) {
+		if (uid == null)
+			return null;
+		MsgOrderDetail detail = new MsgOrderDetail();
+		detail.setBeiZhu(beiZhu);
+		detail.setCreateTime(new Date());
+		detail.setHongBaoMoney(money);
+		detail.setOrderId(orderId);
+		detail.setOrderType(orderType);
+		detail.setPayMoney(payMoney);
+		detail.setRead(false);
+		detail.setState(orderState);
+		detail.setType(MsgTypeOrderTypeEnum.elme);
+		detail.setUser(new UserInfo(uid));
+		return detail;
+	}
+
+
 }

--
Gitblit v1.8.0