Subversion Repositories SmartDukaan

Rev

Rev 30547 | Rev 30549 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 30547 Rev 30548
Line 258... Line 258...
258
		UserInfo userInfo = (UserInfo) request.getAttribute("userInfo");
258
		UserInfo userInfo = (UserInfo) request.getAttribute("userInfo");
259
		LOGGER.info("userinfo1 {}", userInfo);
259
		LOGGER.info("userinfo1 {}", userInfo);
260
		User user = null;
260
		User user = null;
261
		if (userInfo.getUserId() > -1) {
261
		if (userInfo.getUserId() > -1) {
262
			user = userRepository.selectById(userInfo.getUserId());
262
			user = userRepository.selectById(userInfo.getUserId());
263
 
-
 
-
 
263
			LOGGER.info("userinfo7 {}", userInfo);
264
			String city = user.getCity();
264
			String city = user.getCity();
265
			if (!(userInfo.getEmail() == null || user.getEmailId().equalsIgnoreCase(userInfo.getEmail()))) {
265
			if (!(userInfo.getEmail() == null || user.getEmailId().equalsIgnoreCase(userInfo.getEmail()))) {
266
				String userName = null;
266
				String userName = null;
267
				LOGGER.info("userinfo2 {}", userInfo);
267
				LOGGER.info("userinfo2 {}", userInfo);
268
				if (user.getSecondryEmailId() != null && user.getSecondryEmailId().equals(userInfo.getEmail())) {
268
				if (user.getSecondryEmailId() != null && user.getSecondryEmailId().equals(userInfo.getEmail())) {
Line 293... Line 293...
293
				user = userRepository.selectByEmailId(userInfo.getEmail());
293
				user = userRepository.selectByEmailId(userInfo.getEmail());
294
			} catch (ProfitMandiBusinessException e1) {
294
			} catch (ProfitMandiBusinessException e1) {
295
			}
295
			}
296
			if (user == null) {
296
			if (user == null) {
297
				try {
297
				try {
-
 
298
					LOGGER.info("userinfo8 {}", userInfo);
298
					user = userRepository.selectBySecondryEmailId(userInfo.getEmail());
299
					user = userRepository.selectBySecondryEmailId(userInfo.getEmail());
299
				} catch (ProfitMandiBusinessException e1) {
300
				} catch (ProfitMandiBusinessException e1) {
300
					LOGGER.info("Uneregistered user", userInfo.getEmail());
301
					LOGGER.info("Uneregistered user", userInfo.getEmail());
301
				}
302
				}
302
			}
303
			}