From 26b5b1a6bbbb5ff64dc2ec73cf8b11f1aa61c1c5 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 14 五月 2019 11:03:25 +0800
Subject: [PATCH] Merge branch 'div_8'

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserInfoService.java |   30 ++++++++++++++++++++++++++++--
 1 files changed, 28 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 68f2420..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,9 +1,12 @@
 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 org.springframework.web.multipart.MultipartFile;
 
 import com.yeshi.fanli.entity.bus.user.InviteUser;
 import com.yeshi.fanli.entity.bus.user.UserInfo;
@@ -95,8 +98,6 @@
 
 	public BigDecimal getNewPeopleHB(Long id);
 
-	public BigDecimal getMyHB(Long id);
-
 	/**
 	 * 鏌ヨ鐢ㄦ埛淇℃伅  -- 鐢ㄦ埛绠$悊鍒楄〃
 	 * @param start
@@ -177,5 +178,30 @@
 	 * @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