From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/user/msg/UserAccountMsgNotificationService.java |   49 ++++++++++++++++++++++++++++---------------------
 1 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/msg/UserAccountMsgNotificationService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/msg/UserAccountMsgNotificationService.java
index 691fb3a..dd1700d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/msg/UserAccountMsgNotificationService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/msg/UserAccountMsgNotificationService.java
@@ -33,25 +33,6 @@
 	public void changeBindingSuccess(Long uid, int type);
 
 	/**
-	 * 璐﹀彿鍚堝苟鎴愬姛
-	 * 
-	 * @param uid
-	 * @param lessUid
-	 */
-	public void connectSuccess(Long uid, Long lessUid);
-
-	/**
-	 * 鐢ㄦ埛绛夌骇鍙樺寲
-	 * 
-	 * @param uid
-	 * @param orderType
-	 *            -璁㈠崟绫诲瀷锛堥個璇疯鍗�/杩斿埄璁㈠崟/鍒嗕韩璁㈠崟锛�
-	 * @param orderCount
-	 * @param rankName
-	 */
-	public void userRank(Long uid, String orderType, int orderCount, String rankName);
-
-	/**
 	 * 娣樺疂鎺堟潈澶辫触
 	 * 
 	 * @param uid
@@ -68,10 +49,10 @@
 	 * @param days
 	 * @param targetNum1
 	 * @param targetNum2
-	 * @param type
+	 * @param teamPass true閫氳繃闃熷憳楠岃瘉鍗囩骇
 	 */
 	public void vipPreUpgrade(Long uid, String originalName, String upName, int days, long targetNum1, Long targetNum2,
-			Integer type);
+			boolean teamPass);
 
 	/**
 	 * 瓒呯骇浼氬憳鍗囩骇鎴愬姛
@@ -115,4 +96,30 @@
 	 */
 	public void createChangeInviteCode(Long uid, String oldCode, String newCode);
 
+	/**
+	 * 浜哄伐鍗囩骇浼氬憳閫氳繃
+	 * @Title: artificialVipUpgradePass
+	 * @Description: 
+	 * @param uid
+	 * @param originalName
+	 * @param upName
+	 * @param days 
+	 * void 杩斿洖绫诲瀷
+	 * @throws
+	 */
+	public void artificialVipUpgradePass(Long uid, String originalName, String upName, int days);
+
+	/**
+	 * 浜哄伐鍗囩骇浼氬憳鎷掔粷
+	 * @Title: artificialVipUpgradeReject
+	 * @Description: 
+	 * @param uid
+	 * @param originalName
+	 * @param upName
+	 * @param reson 
+	 * void 杩斿洖绫诲瀷
+	 * @throws
+	 */
+	public void artificialVipUpgradeReject(Long uid, String originalName, String upName, String reson);
+
 }

--
Gitblit v1.8.0