From 4cb15e222cd7d099d533ccbeb7f9a8cd99bf180c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 25 十二月 2018 16:35:18 +0800
Subject: [PATCH] 替换原来老的资金详情

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java |   43 ++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java
index c437e29..80d62ee 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java
@@ -52,6 +52,9 @@
 import com.yeshi.fanli.util.TimeUtil;
 import com.yeshi.fanli.util.factory.AccountDetailsFactory;
 import com.yeshi.fanli.util.wx.WXLoginUtil;
+
+import net.sf.json.JSONObject;
+
 import org.yeshi.utils.JsonUtil;
 import org.yeshi.utils.tencentcloud.COSManager;
 
@@ -100,6 +103,16 @@
 	@Override
 	public LoginResult login(HttpServletRequest request, Boolean first, String appId, String code, String phone,
 			UserInfo tbUserInfo, boolean wxinstall, int loginType) throws UserAccountException {
+
+		JSONObject logInfo = new JSONObject();
+		logInfo.put("appId", appId);
+		logInfo.put("code", code);
+		logInfo.put("phone", phone);
+		if (tbUserInfo != null)
+			logInfo.put("tbUserInfo", tbUserInfo.getId());
+		logInfo.put("loginType", loginType);
+		LogHelper.lgoinInfo(logInfo.toString());
+
 		HttpSession session = request.getSession();
 		if (first != null && first == true)
 			session.removeAttribute("LAST_LOGIN_USER");
@@ -303,6 +316,15 @@
 	@Override
 	public LoginResult loginNoInstallWX(String appId, String code, String phone, UserInfo tbUserInfo, int loginType)
 			throws UserAccountException {
+		JSONObject logInfo = new JSONObject();
+		logInfo.put("appId", appId);
+		logInfo.put("code", code);
+		logInfo.put("phone", phone);
+		if (tbUserInfo != null)
+			logInfo.put("tbUserInfo", tbUserInfo.getId());
+		logInfo.put("loginType", loginType);
+		LogHelper.lgoinInfo(logInfo.toString());
+
 		UserInfo userInfo = null;
 		WeiXinUser weiXinUser = null;
 		switch (loginType) {
@@ -519,7 +541,12 @@
 	 * @param unionId
 	 * @return
 	 */
-	public UserInfo getUserInfoByWXUnionId(String appId, String unionId) {
+	public UserInfo getUserInfoByWXUnionId(String appId, String unionId) throws UserAccountException {
+		if (StringUtil.isNullOrEmpty(appId))
+			throw new UserAccountException(1, "appId涓虹┖");
+		if (StringUtil.isNullOrEmpty(unionId))
+			throw new UserAccountException(2, "unionId涓虹┖");
+
 		return userInfoMapper.getUserInfoByAppIdAndWXUnionId(appId, unionId);
 	}
 
@@ -530,8 +557,11 @@
 	 * @param openId
 	 * @return
 	 */
-	public UserInfo getUserInfoByTaoBaoOpenId(String appId, String openId) {
-
+	public UserInfo getUserInfoByTaoBaoOpenId(String appId, String openId) throws UserAccountException {
+		if (StringUtil.isNullOrEmpty(appId))
+			throw new UserAccountException(1, "appId涓虹┖");
+		if (StringUtil.isNullOrEmpty(openId))
+			throw new UserAccountException(2, "openId涓虹┖");
 		return userInfoMapper.getUserInfoByAppIdAndTaoBaoOpenId(appId, openId);
 	}
 
@@ -542,8 +572,11 @@
 	 * @param phone
 	 * @return
 	 */
-	public UserInfo getUserInfoByPhone(String appId, String phone) {
-
+	public UserInfo getUserInfoByPhone(String appId, String phone) throws UserAccountException {
+		if (StringUtil.isNullOrEmpty(appId))
+			throw new UserAccountException(1, "appId涓虹┖");
+		if (StringUtil.isNullOrEmpty(phone))
+			throw new UserAccountException(2, "phone涓虹┖");
 		return userInfoMapper.getUserInfoByAppIdAndPhone(appId, phone);
 	}
 

--
Gitblit v1.8.0