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/service/inter/order/msg/UserOrderMsgNotificationService.java |   92 ++++++++++++++++-----------------------------
 1 files changed, 33 insertions(+), 59 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 98f8be8..ac4a127 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
@@ -21,19 +21,9 @@
 	 * @param orderState
 	 */
 
-	public void orderFanLiStatistic(Long uid, String orderId,int orderType, BigDecimal payMoney, BigDecimal money, int goodsCount,
-			int orderState);
+	public void orderFanLiStatistic(Long uid, String orderId, int orderType, BigDecimal payMoney, BigDecimal money,
+			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);
 
 	/**
 	 * 鍒嗕韩璁㈠崟缁熻
@@ -45,19 +35,10 @@
 	 * @param goodsCount
 	 * @param orderState
 	 */
-	public void orderShareStatistic(Long uid, String orderId,int orderType, BigDecimal payMoney, BigDecimal money, int goodsCount,
-			int orderState);
+	public void orderShareStatistic(Long uid, String orderId, int orderType, BigDecimal payMoney, BigDecimal money,
+			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);
+	
 
 	/**
 	 * 閭�璇疯鍗曠粺璁�
@@ -66,49 +47,30 @@
 	 * @param orderId
 	 * @param payMoney
 	 * @param money
+	 * @param subsidy 琛ヨ创
 	 * @param goodsCount
 	 * @param orderState
 	 */
-	public void orderInviteStatistic(Long uid, String orderId,int orderType, BigDecimal payMoney, BigDecimal money, int goodsCount,
-			int orderState);
+	public void orderInviteStatistic(Long uid, String orderId, int orderType, BigDecimal payMoney, BigDecimal money,
+			BigDecimal subsidy, 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);
 
 	/**
 	 * 璁㈠崟鎵惧洖澶辫触
@@ -117,8 +79,20 @@
 	 * @param orderId
 	 * @param payMoney
 	 * @param goodsCount
-	 * @param orderType 1-娣樺疂
+	 * @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 orderSource
+	 * @param type
+	 */
+	public void orderInvalidToBusinessRunning(Long uid, String orderId, int orderSource, int type);
+
 
 }

--
Gitblit v1.8.0