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/UserCustomSettingsService.java |   39 ++++++++++++++++++++++++++++++---------
 1 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserCustomSettingsService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserCustomSettingsService.java
index 955c3d1..8c5b01a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserCustomSettingsService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserCustomSettingsService.java
@@ -9,34 +9,37 @@
 public interface UserCustomSettingsService {
 
 	/**
-	 *  鏇存柊鍚勯」璁剧疆鐘舵��
+	 * 鏇存柊鍚勯」璁剧疆鐘舵��
+	 * 
 	 * @param uid
 	 * @param typeNum
 	 * @param state
 	 * @throws UserCustomSettingsException
 	 */
-	public void saveModuleState(Long uid, Integer typeNum, Integer state) throws UserCustomSettingsException;
+	public void saveModuleState(Long uid, String type, Integer state) throws UserCustomSettingsException;
 
-	
 	/**
-	 *  鑾峰彇鎴戠殑鎵�鏈夎嚜瀹氫箟璁剧疆
+	 * 鑾峰彇鎴戠殑鎵�鏈夎嚜瀹氫箟璁剧疆
+	 * 
 	 * @param uid
 	 * @return
 	 */
 	public List<UserCustomSettings> getSettingsByUid(Long uid) throws UserCustomSettingsException;
 
-	
 	/**
-	 *  鑾峰彇璁剧疆淇℃伅
-	 * @param uid 鐢ㄦ埛id
-	 * @param type 绫诲瀷
+	 * 鑾峰彇璁剧疆淇℃伅
+	 * 
+	 * @param uid
+	 *            鐢ㄦ埛id
+	 * @param type
+	 *            绫诲瀷
 	 * @return
 	 */
 	public UserCustomSettings getSettingsByUidAndType(Long uid, String type) throws UserCustomSettingsException;
 
-	
 	/**
 	 * 璁剧疆鍒楄〃
+	 * 
 	 * @param uid
 	 * @return
 	 * @throws UserCustomSettingsException
@@ -45,6 +48,7 @@
 
 	/**
 	 * 鎺ㄩ�佹椂鍒ゆ柇鏄惁璁剧疆鍏嶆墦鎵版帹閫�
+	 * 
 	 * @param uid
 	 * @return
 	 */
@@ -52,9 +56,26 @@
 
 	/**
 	 * 鏌ヨ璁剧疆鍏嶆墦鎵扮敤鎴�
+	 * 
 	 * @return
 	 */
 	public List<Long> getCancelNoticeUsers();
 
+	/**
+	 * 閫氳繃鐢ㄦ埛锛岀被鍨嬶紝鐘舵�佹绱㈡暟鎹�
+	 * 
+	 * @param uidList
+	 * @param type
+	 * @param state
+	 * @return
+	 */
+	public List<UserCustomSettings> listByUidListAndTypeAndState(List<Long> uidList, String type, Integer state);
+
+	/**
+	 * 鏄惁瀵瑰鏄剧ず鎵嬫満鍙�
+	 * @param uid
+	 * @return
+	 */
+	public boolean validateDisplayPhoneByUid(Long uid);
 
 }

--
Gitblit v1.8.0