From 9a24f2802a3d6fe3e82c05e52f2880d65ad04dcf Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 29 四月 2019 08:59:47 +0800
Subject: [PATCH] Merge branch 'div_develop' into master_develop
---
fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserInfoService.java | 33 +++++++++++++++++++++++++++++++--
1 files changed, 31 insertions(+), 2 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 16d8d50..2d3fa17 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
@@ -7,6 +7,7 @@
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 +95,6 @@
public BigDecimal getNewPeopleHB(Long id);
- public BigDecimal getMyHB(Long id);
-
/**
* 鏌ヨ鐢ㄦ埛淇℃伅 -- 鐢ㄦ埛绠＄悊鍒楄〃
* @param start
@@ -155,4 +154,34 @@
*/
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);
+
}
--
Gitblit v1.8.0