From c3f10da9aa6f4d8fecccc1c9574567ee0766ab48 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 28 十二月 2019 10:09:00 +0800
Subject: [PATCH] 学院

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java |   13 +++++++------
 1 files changed, 7 insertions(+), 6 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 63f9ea9..f04b8c3 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
@@ -122,7 +122,7 @@
 	@Resource
 	private UserInfoModifyRecordService userInfoModifyRecordService;
 
-	@Transactional
+	@Transactional(rollbackFor=Exception.class)
 	@Override
 	public LoginResult login(HttpServletRequest request, AcceptData acceptData, Boolean first, String appId,
 			String code, String phone, UserInfo tbUserInfo, boolean wxinstall, int loginType)
@@ -380,7 +380,7 @@
 		}
 	}
 
-	@Transactional
+	@Transactional(rollbackFor=Exception.class)
 	@Override
 	public LoginResult loginNoInstallWX(AcceptData acceptData, String appId, String code, String phone,
 			UserInfo tbUserInfo, int loginType) throws UserAccountException {
@@ -503,7 +503,7 @@
 		connectUsers(mainUser, lessUser);
 	}
 
-	@Transactional
+	@Transactional(rollbackFor=Exception.class)
 	@Override
 	public void connectUsers(UserInfo mainUser, UserInfo lessUser) throws UserAccountException {
 		mainUser = userInfoMapper.selectByPrimaryKeyForUpdate(mainUser.getId());
@@ -670,6 +670,7 @@
 		userInfoMapper.updateByPrimaryKeySelective(userInfo);
 	}
 
+	@Transactional(rollbackFor=Exception.class)
 	@Override
 	public void register(UserInfo userInfo) throws UserAccountException {
 		if (!StringUtil.isNullOrEmpty(userInfo.getPhone())) {
@@ -974,7 +975,7 @@
 		return user.getPortrait();
 	}
 
-	@Transactional
+	@Transactional(rollbackFor=Exception.class)
 	@Override
 	public UserInfo loginPhone(HttpServletRequest request, int loginType, String vcode, String phone, String appId)
 			throws UserAccountException {
@@ -1074,7 +1075,7 @@
 		throw new UserAccountException(10, "璇风◢鍚庡啀璇�");
 	}
 
-	@Transactional
+	@Transactional(rollbackFor=Exception.class)
 	@Override
 	public UserInfo loginWinXin(HttpServletRequest request, AcceptData acceptData, int loginType, String code,
 			String appId) throws UserAccountException {
@@ -1179,7 +1180,7 @@
 		throw new UserAccountException(10, "璇风◢鍚庡啀璇�");
 	}
 
-	@Transactional
+	@Transactional(rollbackFor=Exception.class)
 	@Override
 	public UserInfo loginWeiXinNew(HttpServletRequest request, AcceptData acceptData, int loginType, String wxCode,
 			String appId) throws UserAccountException {

--
Gitblit v1.8.0