Subversion Repositories SmartDukaan

Rev

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

Rev 23473 Rev 23487
Line 334... Line 334...
334 
		user.setEmailId(updateRetailerRequest.getUserEmailId());
 334 
		user.setEmailId(updateRetailerRequest.getUserEmailId());
335 
		user.setUsername(updateRetailerRequest.getUserEmailId());
 335 
		user.setUsername(updateRetailerRequest.getUserEmailId());
336 
		return user;
 336 
		return user;
337 
	}
 337 
	}
338
338
339
- 
 
340
- 
 
341 
	private int createSaholicUser(User user, String retailerName){
 339 
	private int createSaholicUser(User user, String retailerName){
342 
		com.spice.profitmandi.dao.entity.user.User saholicUser = null;
 340 
		com.spice.profitmandi.dao.entity.user.User saholicUser = null;
343 
		try {
 341 
		try {
344 
			saholicUser = userUserRepository.selectByEmailId(user.getEmailId());
 342 
			saholicUser = userUserRepository.selectByEmailId(user.getEmailId());
345 
		}catch (ProfitMandiBusinessException e) {
 343 
		}catch (ProfitMandiBusinessException e) {
Line 376... Line 374...
376 
			int saholicUserId = this.createSaholicUser(user, updateRetailerRequest.getName());
 374 
			int saholicUserId = this.createSaholicUser(user, updateRetailerRequest.getName());
377 
			retailer = new Retailer();
 375 
			retailer = new Retailer();
378 
			retailer.setId(saholicUserId);
 376 
			retailer.setId(saholicUserId);
379 
		}
 377 
		}
380 
		retailer.setActive(updateRetailerRequest.isActive());
 378 
		retailer.setActive(updateRetailerRequest.isActive());
381 
		this.createRole(user.getId(), RoleType.RETAILER);
 379 
		//this.createRole(user.getId(), RoleType.RETAILER);
382 
		retailer.setName(updateRetailerRequest.getName());
 380 
		retailer.setName(updateRetailerRequest.getName());
383 
		retailer.setNumber(updateRetailerRequest.getNumber());
 381 
		retailer.setNumber(updateRetailerRequest.getNumber());
384 
		if(updateRetailerRequest.getNumber() == null || updateRetailerRequest.getNumber().isEmpty()){
 382 
		if(updateRetailerRequest.getNumber() == null || updateRetailerRequest.getNumber().isEmpty()){
385 
			retailer.setType(RetailerType.UNREGISTERED_SHOP);
 383 
			retailer.setType(RetailerType.UNREGISTERED_SHOP);
386 
		}else{
 384 
		}else{
Line 473... Line 471...
473 
		}else{
 471 
		}else{
474 
			return null;
 472 
			return null;
475 
		}
 473 
		}
476 
	}
 474 
	}
477
475
478 
	private void createRole(int userId, RoleType roleType){
 - 
 
479 
		if(!userRoleRepository.isExistByUserIdAndType(userId, roleType)){
 - 
 
480 
			UserRole userRole = new UserRole();
 - 
 
481 
			userRole.setUserId(userId);
 - 
 
482 
			userRole.setRoleType(roleType);
 - 
 
483 
			try{
 - 
 
484 
				userRoleRepository.persist(userRole);
 - 
 
485 
			}catch(ProfitMandiBusinessException profitMandiBusinessException){
 - 
 
486 
				LOGGER.error("Retailer role is already exist with userId {}", userId);
 - 
 
487 
			}
 - 
 
488 
		}else{
 - 
 
489 
			LOGGER.error("Retailer role not found with userId {}", userId);
 - 
 
490 
		}
 - 
 
491
- 
 
492 
	}
 - 
 
493
- 
 
494 
	private Address updateRetailerAddress(Address address, CustomAddress customAddress, int retailerId) throws ProfitMandiBusinessException{
 476 
	private Address updateRetailerAddress(Address address, CustomAddress customAddress, int retailerId) throws ProfitMandiBusinessException{
495 
		if(address == null){
 477 
		if(address == null){
496 
			address = new Address();
 478 
			address = new Address();
497 
			address.setRetaierId(retailerId);
 479 
			address.setRetaierId(retailerId);
498 
			this.updateAddress(address, customAddress);
 480 
			this.updateAddress(address, customAddress);