From 8cb7ec4a35a38ae91d0eed17cde711e81d2b2bbf Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 14 五月 2019 11:37:49 +0800
Subject: [PATCH] 合并
---
fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserInfoService.java | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 54 insertions(+), 5 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserInfoService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserInfoService.java
index a6419fa..06e1671 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserInfoService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserInfoService.java
@@ -1,13 +1,17 @@
package com.yeshi.fanli.service.inter.user;
+import java.io.IOException;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
import java.util.Map;
-import com.yeshi.fanli.entity.admin.UserInfoAdmin;
+import org.springframework.web.multipart.MultipartFile;
+
import com.yeshi.fanli.entity.bus.user.InviteUser;
import com.yeshi.fanli.entity.bus.user.UserInfo;
+import com.yeshi.fanli.exception.user.UserInfoException;
+import com.yeshi.fanli.vo.user.UserInfoVO;
public interface UserInfoService {
/**
@@ -94,8 +98,6 @@
public BigDecimal getNewPeopleHB(Long id);
- public BigDecimal getMyHB(Long id);
-
/**
* 鏌ヨ鐢ㄦ埛淇℃伅 -- 鐢ㄦ埛绠＄悊鍒楄〃
* @param start
@@ -108,10 +110,10 @@
* @param orderMode
* @return
*/
- public List<UserInfoAdmin> query(long start, int count, String key, Integer userType,
+ public List<UserInfoVO> query(long start, int count, Integer userState, String key, Integer keyType, String userRank,
Integer days, String startTime, String endTime,Integer orderField, Integer orderMode);
- public long queryCount(String key, Integer userType, Integer days, String startTime,
+ public long queryCount(Integer userState, String key, Integer keyType, String userRank, Integer days, String startTime,
String endTime);
public double querySumMoney(String key, Integer userType, Integer days, String startTime, String endTime);
@@ -155,4 +157,51 @@
*/
public UserInfo getInfoByPhoneOrInviteCode(String phone, String inviteCode);
+ /**
+ * 鏍规嵁鐢佃瘽鍙风爜 鑾峰彇鏈夋晥鐢ㄦ埛
+ * @param phone
+ * @return
+ */
+ public UserInfo getEffectiveUserInfoByPhone(String phone);
+
+ /**
+ * 鑾峰彇鐢ㄦ埛淇℃伅
+ * @param uid
+ * @return
+ * @throws UserInfoException
+ */
+ public UserInfo getUserInfo(Long uid) throws UserInfoException;
+
+ /**
+ * 鏍规嵁寰俊鑾峰彇鏈夋晥鐢ㄦ埛
+ * @param unionId
+ * @return
+ */
+ public UserInfo getEffectiveUserInfoByWXUnionId(String unionId);
+
+
+ /**
+ * 鑾峰彇鐢ㄦ埛浣欓
+ * @param uid
+ * @return
+ */
+ public BigDecimal getBalance(Long uid);
+
+ /**
+ * 鏇存崲澶村儚
+ * @param file
+ * @param uid
+ * @throws UserInfoException
+ * @throws IOException
+ */
+ public void uploadPortrait(MultipartFile file, Long uid) throws UserInfoException, IOException;
+
+ /**
+ * 淇濆瓨澶村儚
+ * @param nickName
+ * @param uid
+ * @throws UserInfoException
+ */
+ public void saveUserInfo(String nickName, Long uid) throws UserInfoException;
+
}
--
Gitblit v1.8.0