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/vip/UserVIPPreInfoService.java |   47 ++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 38 insertions(+), 9 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 c780e80..1b8ce94 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
@@ -1,6 +1,7 @@
 package com.yeshi.fanli.service.inter.user.vip;
 
 import java.util.Date;
+import java.util.List;
 
 import com.yeshi.fanli.entity.bus.user.vip.UserVIPPreInfo;
 import com.yeshi.fanli.exception.user.vip.UserVIPInfoException;
@@ -29,16 +30,15 @@
 	 * @return
 	 */
 	public UserVIPPreInfo getLatestProcessInfo(Long uid);
-	
+
 	/**
 	 * 鑾峰彇鏌愪釜鏃堕棿鐨勮繘搴�
 	 * 
 	 * @param uid
 	 * @return
 	 */
-	public UserVIPPreInfo getProcessInfo(Long uid,Date time);
+	public UserVIPPreInfo getProcessInfo(Long uid, Date time);
 
-	
 	/**
 	 * 鏍规嵁鐢ㄦ埛ID涓庢楠ゆ煡璇�
 	 * @Title: selectByUidAndProcess
@@ -49,10 +49,9 @@
 	 * UserVIPPreInfo 杩斿洖绫诲瀷
 	 * @throws
 	 */
-	
-	public UserVIPPreInfo selectByUidAndProcess(Long uid,int process);
 
-	
+	public UserVIPPreInfo selectByUidAndProcess(Long uid, int process);
+
 	/**
 	 * 鏌ヨ杩涘害鏍规嵁涓嶅悓闃舵
 	 * @param uid
@@ -62,19 +61,49 @@
 	 */
 	public UserVIPPreInfo getVipByProcess(Long uid, int process);
 
-	
-
 	/**
 	 * 鑷喘+ 鍒嗕韩璁㈠崟鍒拌处 婊¤冻鍗囩骇楠岃瘉
 	 * @param uid
 	 */
 	public void upgradeVipByMyOrder(Long uid);
 
+	/**
+	 * 楠岃瘉鑷韩鏄惁婊¤冻vip鏉′欢
+	 * @param uid  
+	 */
+	public void upgradeVipByTeamNum(Long uid);
 
 	/**
 	 * 绮変笣瀹屾垚鏀惰揣-楠岃瘉鐩存帴-闂存帴绮変笣
 	 * @param uid 绮変笣id
 	 */
-	public void upgradeVipByTeamNum(Long uid);
+	public void upgradeBossVipByTeamNum(Long uid);
+
+	/**
+	 * 鏍规嵁涓婚敭鍒犻櫎
+	 * @Title: deleteByPrimaryKey
+	 * @Description: 
+	 * @param id 
+	 * void 杩斿洖绫诲瀷
+	 * @throws
+	 */
+	public void deleteByPrimaryKey(Long id);
+
+	/**
+	 * 鏍规嵁鏃堕棿涓庤繃绋嬫煡璇�
+	 * @Title: listByProcess
+	 * @Description: 
+	 * @param process
+	 * @param minTime
+	 * @param maxTime
+	 * @param page
+	 * @param pageSize
+	 * @return 
+	 * List<UserVIPPreInfo> 杩斿洖绫诲瀷
+	 * @throws
+	 */
+	public List<UserVIPPreInfo> listByProcess(int process, Date minTime, Date maxTime, int page, int pageSize);
+	
+	public long countByProcess(int process, Date minTime, Date maxTime);
 
 }

--
Gitblit v1.8.0