From f32cc15f60bf3b5c47267ee256a0deb3bdd01eec Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 23 四月 2020 14:09:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/user/vip/UserVIPPreInfoService.java |   18 ++----------------
 1 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/vip/UserVIPPreInfoService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/vip/UserVIPPreInfoService.java
index 1d4cd3f..c780e80 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/vip/UserVIPPreInfoService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/vip/UserVIPPreInfoService.java
@@ -63,27 +63,13 @@
 	public UserVIPPreInfo getVipByProcess(Long uid, int process);
 
 	
-	/**
-	 * 鍗囩骇鎻愰啋涓婄骇
-	 * @param uid
-	 * @param rankName
-	 * @param item
-	 * @param time
-	 * @param divorced
-	 */
-	public void remindBoss(Long uid, String rankName, String item, Date time, boolean divorced);
 
 	/**
-	 * 鑷喘璁㈠崟鍒拌处 婊¤冻鍗囩骇楠岃瘉
+	 * 鑷喘+ 鍒嗕韩璁㈠崟鍒拌处 婊¤冻鍗囩骇楠岃瘉
 	 * @param uid
 	 */
-	public void upgradeVipByFanLiOrder(Long uid);
+	public void upgradeVipByMyOrder(Long uid);
 
-	/**
-	 * 鍒嗕韩璁㈠崟鍒拌处 -婊¤冻鍗囩骇楠岃瘉
-	 * @param uid
-	 */
-	public void upgradeVipByShareOrder(Long uid);
 
 	/**
 	 * 绮変笣瀹屾垚鏀惰揣-楠岃瘉鐩存帴-闂存帴绮変笣

--
Gitblit v1.8.0