From f7ed4e6bbe9be95d268481e66d70d90e70e07e12 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 28 一月 2019 19:45:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java | 44 +++++++++++++++++++++++++++++++++++++-------
1 files changed, 37 insertions(+), 7 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 1bfdb31..e325927 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
@@ -44,13 +44,16 @@
import com.yeshi.fanli.exception.UserAccountException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.hongbao.HongBaoService;
+import com.yeshi.fanli.service.inter.msg.UserAccountMsgNotificationService;
import com.yeshi.fanli.service.inter.user.SpreadUserImgService;
import com.yeshi.fanli.service.inter.user.UserAccountService;
+import com.yeshi.fanli.service.inter.user.UserExtraTaoBaoInfoService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.FileUtil;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.util.factory.AccountDetailsFactory;
+import com.yeshi.fanli.util.factory.msg.MsgAccountDetailFactory;
import com.yeshi.fanli.util.wx.WXLoginUtil;
import net.sf.json.JSONObject;
@@ -99,19 +102,26 @@
@Resource
private SpreadUserImgService spreadUserImgService;
+ @Resource
+ private UserAccountMsgNotificationService userAccountMsgNotificationService;
+
+ @Resource
+ private UserExtraTaoBaoInfoService userExtraTaoBaoInfoService;
+
@Transactional
@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);
- logInfo.put("tbUserInfo", tbUserInfo);
+ 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");
@@ -218,13 +228,17 @@
// 缁戝畾鍏崇郴
UserInfo updateUserInfo = new UserInfo(userInfo.getId());
- if (!StringUtil.isNullOrEmpty(lastUser.getPhone()))
+ if (!StringUtil.isNullOrEmpty(lastUser.getPhone())) {
updateUserInfo.setPhone(lastUser.getPhone());
-
+ userAccountMsgNotificationService.bindingSuccess(userInfo.getId(),
+ MsgAccountDetailFactory.TYPE_PHONE);
+ }
if (!StringUtil.isNullOrEmpty(lastUser.getOpenid())) {
updateUserInfo.setOpenid(lastUser.getOpenid());
updateUserInfo.setTbName(lastUser.getTbName());
updateUserInfo.setTbPic(lastUser.getTbPic());
+ userAccountMsgNotificationService.bindingSuccess(userInfo.getId(),
+ MsgAccountDetailFactory.TYPE_TB);
}
updateUserInfo.setLastLoginTime(System.currentTimeMillis());
userInfoMapper.updateByPrimaryKeySelective(updateUserInfo);
@@ -319,7 +333,8 @@
logInfo.put("appId", appId);
logInfo.put("code", code);
logInfo.put("phone", phone);
- logInfo.put("tbUserInfo", tbUserInfo);
+ if (tbUserInfo != null)
+ logInfo.put("tbUserInfo", tbUserInfo.getId());
logInfo.put("loginType", loginType);
LogHelper.lgoinInfo(logInfo.toString());
@@ -530,6 +545,7 @@
moneyRecordMapper.insertSelective(moneyRecord);
}
+ userAccountMsgNotificationService.connectSuccess(mainUser.getId(), lessUser.getId());
}
/**
@@ -655,6 +671,7 @@
UserInfo update = new UserInfo(user.getId());
update.setPhone(phone);
userInfoMapper.updateByPrimaryKeySelective(update);
+ userAccountMsgNotificationService.bindingSuccess(uid, MsgAccountDetailFactory.TYPE_PHONE);
}
@Override
@@ -675,6 +692,7 @@
UserInfo updateUserInfo = new UserInfo(uid);
updateUserInfo.setPhone("");
userInfoMapper.updateByPrimaryKeySelective(updateUserInfo);
+ userAccountMsgNotificationService.unBindingSuccess(uid, MsgAccountDetailFactory.TYPE_PHONE);
}
@Override
@@ -684,8 +702,12 @@
if (user == null)
throw new UserAccountException(4, "鐢ㄦ埛涓嶅瓨鍦�");
- if (!StringUtil.isNullOrEmpty(user.getOpenid()))
+ if (!StringUtil.isNullOrEmpty(user.getOpenid()) && !user.getOpenid().equalsIgnoreCase(tbOpenId))
throw new UserAccountException(5, "褰撳墠璐﹀彿宸茬粡缁戝畾浜嗘窐瀹濓紝璇峰厛瑙ｇ粦");
+
+ //缁戝畾鍚屼竴涓窐瀹濆彿
+ if (!StringUtil.isNullOrEmpty(user.getOpenid()) && user.getOpenid().equalsIgnoreCase(tbOpenId))
+ return;
UserInfo taoBaoUser = getUserInfoByTaoBaoOpenId(user.getAppId(), tbOpenId);
if (taoBaoUser != null)
@@ -700,6 +722,8 @@
update.setPortrait(tbPortrait);
}
userInfoMapper.updateByPrimaryKeySelective(update);
+
+ userAccountMsgNotificationService.bindingSuccess(uid, MsgAccountDetailFactory.TYPE_TB);
}
@Override
@@ -724,6 +748,10 @@
}
userInfoMapper.updateByPrimaryKeySelective(update);
+
+ userExtraTaoBaoInfoService.unBindUid(uid);
+
+ userAccountMsgNotificationService.unBindingSuccess(uid, MsgAccountDetailFactory.TYPE_TB);
}
@Override
@@ -756,6 +784,8 @@
updateUserInfo.setPortrait(Constant.systemCommonConfig.getDefaultPortrait());
}
userInfoMapper.updateByPrimaryKeySelective(updateUserInfo);
+
+ userAccountMsgNotificationService.changeBindingSuccess(uid, MsgAccountDetailFactory.TYPE_WX);
}
@Override
--
Gitblit v1.8.0