From dd5b15229cb15459fa7c31ccea77dac28cbfafbd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 四月 2020 10:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/order/msg/UserOrderMsgNotificationService.java |   98 ++++++++-----------------------------------------
 1 files changed, 16 insertions(+), 82 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/msg/UserOrderMsgNotificationService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/msg/UserOrderMsgNotificationService.java
index bde8587..fa669e3 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/msg/UserOrderMsgNotificationService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/msg/UserOrderMsgNotificationService.java
@@ -22,19 +22,8 @@
 	 */
 
 	public void orderFanLiStatistic(Long uid, String orderId, int orderType, BigDecimal payMoney, BigDecimal money,
-			int goodsCount, int orderState);
+			int goodsCount, int orderState, Date downTime);
 
-	/**
-	 * 杩斿埄璁㈠崟鐘舵�佹敼鍙�
-	 * 
-	 * @param uid
-	 * @param orderId
-	 * @param payMoney
-	 * @param money
-	 * @param orderState
-	 */
-	public void orderFanLiStateChanged(Long uid, String orderId, int orderType, BigDecimal payMoney, BigDecimal money,
-			int orderState);
 
 	/**
 	 * 鍒嗕韩璁㈠崟缁熻
@@ -47,19 +36,9 @@
 	 * @param orderState
 	 */
 	public void orderShareStatistic(Long uid, String orderId, int orderType, BigDecimal payMoney, BigDecimal money,
-			int goodsCount, int orderState);
+			int goodsCount, int orderState, Date downTime);
 
-	/**
-	 * 鍒嗕韩璁㈠崟鐘舵�佹敼鍙�
-	 * 
-	 * @param uid
-	 * @param orderId
-	 * @param payMoney
-	 * @param money
-	 * @param orderState
-	 */
-	public void orderShareStateChanged(Long uid, String orderId, int orderType, BigDecimal payMoney, BigDecimal money,
-			int orderState);
+	
 
 	/**
 	 * 閭�璇疯鍗曠粺璁�
@@ -72,45 +51,25 @@
 	 * @param orderState
 	 */
 	public void orderInviteStatistic(Long uid, String orderId, int orderType, BigDecimal payMoney, BigDecimal money,
-			int goodsCount, int orderState);
+			int goodsCount, int orderState, Date downTime);
 
-	/**
-	 * 閭�璇疯鍗曠姸鎬佹敼鍙�
-	 * 
-	 * @param uid
-	 * @param orderId
-	 * @param payMoney
-	 * @param money
-	 * @param orderState
-	 */
-	public void orderInviteStateChanged(Long uid, String orderId, int orderType, BigDecimal payMoney, BigDecimal money,
-			int orderState);
 
-	public void orderShareFirstLevelStatistic(Long uid, String orderId, int orderType, BigDecimal payMoney,
-			BigDecimal money, int goodsCount, int orderState, String sourceUserName);
-
-	/**
-	 * 鍒嗕韩璁㈠崟鐘舵�佹敼鍙�
-	 * 
-	 * @param uid
-	 * @param orderId
-	 * @param payMoney
-	 * @param money
-	 * @param orderState
-	 */
-	public void orderShareFirstLevelStateChanged(Long uid, String orderId, int orderType, BigDecimal payMoney,
-			BigDecimal money, int orderState);
 
 	/**
 	 * 璁㈠崟鎵惧洖鎴愬姛
-	 * 
 	 * @param uid
-	 * @param orderId
-	 * @param payMoney
-	 * @param money
-	 * @param orderType
+	 * @param orderId 璁㈠崟鍙�
+	 * @param orderSource  璁㈠崟鏉ユ簮锛氭窐瀹濄�佷含涓溿�佸ぉ鐚�
+	 * @param type    璁㈠崟绫诲瀷锛氳嚜璐�佸垎浜�佸洟闃�
+	 * @param goodsCount 鍟嗗搧鏁伴噺
+	 * @param payMoney  浠樻閲戦
+	 * @param money     杩斿埄閲戦
+	 * @param submitTime  鎻愪氦鏃堕棿
+	 * @param beiZhu 澶囨敞淇℃伅 - 闈炲繀濉�
+	 * @return
 	 */
-	public void orderFoundSuccess(Long uid, String orderId, BigDecimal payMoney, int orderType, Date happendDate);
+	public void orderFoundSuccess(Long uid, String orderId, int orderSource, int type, BigDecimal payMoney,
+			BigDecimal money, int goodsCount, Date submitTime);
 
 	/**
 	 * 璁㈠崟鎵惧洖澶辫触
@@ -122,32 +81,7 @@
 	 * @param orderType
 	 *            1-娣樺疂
 	 */
-	public void orderFoundFail(Long uid, String orderId, BigDecimal payMoney, int orderType, Date happendDate);
+	public void orderFoundFail(Long uid, String orderId);
 
-	/**
-	 * 楗夸簡涔堣鍗曠粺璁�
-	 * 
-	 * @param uid
-	 * @param orderId
-	 * @param orderType
-	 * @param payMoney
-	 * @param money
-	 * @param orderState
-	 */
-	public void orderElmeStatistic(Long uid, String orderId, int orderType, BigDecimal payMoney, BigDecimal money,
-			int orderState);
-
-	/**
-	 * 楗夸簡涔堣鍗曠姸鎬佹敼鍙�
-	 * 
-	 * @param uid
-	 * @param orderId
-	 * @param orderType
-	 * @param payMoney
-	 * @param money
-	 * @param orderState
-	 */
-	public void orderElmeStateChanged(Long uid, String orderId, int orderType, BigDecimal payMoney, BigDecimal money,
-			int orderState);
 
 }

--
Gitblit v1.8.0