Subversion Repositories SmartDukaan

Rev

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

Rev 23303 Rev 23329
Line 32... Line 32...
32
import com.spice.profitmandi.dao.entity.dtr.UserRole;
32
import com.spice.profitmandi.dao.entity.dtr.UserRole;
33
import com.spice.profitmandi.dao.entity.user.Address;
33
import com.spice.profitmandi.dao.entity.user.Address;
34
import com.spice.profitmandi.dao.entity.user.Cart;
34
import com.spice.profitmandi.dao.entity.user.Cart;
35
import com.spice.profitmandi.dao.entity.user.Counter;
35
import com.spice.profitmandi.dao.entity.user.Counter;
36
import com.spice.profitmandi.dao.entity.user.PrivateDealUser;
36
import com.spice.profitmandi.dao.entity.user.PrivateDealUser;
37
import com.spice.profitmandi.dao.entity.user.PrivateDealUserAddressId;
-
 
38
import com.spice.profitmandi.dao.entity.user.PrivateDealUserAddressMapping;
37
import com.spice.profitmandi.dao.entity.user.PrivateDealUserAddressMapping;
39
import com.spice.profitmandi.dao.enumuration.dtr.AccountType;
38
import com.spice.profitmandi.dao.enumuration.dtr.AccountType;
40
import com.spice.profitmandi.dao.enumuration.dtr.RetailerType;
39
import com.spice.profitmandi.dao.enumuration.dtr.RetailerType;
41
import com.spice.profitmandi.dao.enumuration.dtr.RoleType;
40
import com.spice.profitmandi.dao.enumuration.dtr.RoleType;
42
import com.spice.profitmandi.dao.repository.dtr.DocumentRepository;
41
import com.spice.profitmandi.dao.repository.dtr.DocumentRepository;
Line 256... Line 255...
256
				try{
255
				try{
257
					user = userRepository.selectByEmailId(map.get("registeredEmail1"));
256
					user = userRepository.selectByEmailId(map.get("registeredEmail1"));
258
				}catch(ProfitMandiBusinessException profitMandiBusinessException){
257
				}catch(ProfitMandiBusinessException profitMandiBusinessException){
259
				}
258
				}
260
				if(user == null){
259
				if(user == null){
-
 
260
					user = userRepository.selectBySecondryEmailId(map.get("registeredEmail1"));
-
 
261
				}
-
 
262
				if(user == null){
261
					user = new User();
263
					user = new User();
262
					user.setFirstName("");
264
					user.setFirstName("");
263
					user.setLastName("");
265
					user.setLastName("");
264
					user.setCity(map.containsKey("city") ? map.get("city") : "");
266
					user.setCity(map.containsKey("city") ? map.get("city") : "");
265
					user.setPinCode(Integer.valueOf(map.containsKey("pincode") ? map.get("pincode") : ""));
267
					user.setPinCode(Integer.valueOf(map.containsKey("pincode") ? map.get("pincode") : ""));
Line 454... Line 456...
454
					}else{	
456
					}else{	
455
						LOGGER.info("PrivateDealUser not found with id [{}]", saholicUser.getId());
457
						LOGGER.info("PrivateDealUser not found with id [{}]", saholicUser.getId());
456
						this.createPrivateDealUser(saholicUser.getId(), counterId);
458
						this.createPrivateDealUser(saholicUser.getId(), counterId);
457
					}
459
					}
458
					PrivateDealUserAddressMapping privateDealUserAddressMapping = new PrivateDealUserAddressMapping();
460
					PrivateDealUserAddressMapping privateDealUserAddressMapping = new PrivateDealUserAddressMapping();
459
					PrivateDealUserAddressId privateDealUserAddressId = new PrivateDealUserAddressId();
-
 
460
					privateDealUserAddressId.setUserId(retailer.getId());
461
					privateDealUserAddressMapping.setUserId(retailer.getId());
461
					privateDealUserAddressId.setAddressId(retailerAddress.getId());
462
					privateDealUserAddressMapping.setAddressId(retailerAddress.getId());
462
					privateDealUserAddressMapping.setId(privateDealUserAddressId);
-
 
463
					privateDealUserAddressMappingRepository.persist(privateDealUserAddressMapping);
463
					privateDealUserAddressMappingRepository.persist(privateDealUserAddressMapping);
464
					
464
					
465
					saholicUser.setAddressId(retailerAddress.getId());
465
					saholicUser.setAddressId(retailerAddress.getId());
466
					userUserRepository.persist(saholicUser);
466
					userUserRepository.persist(saholicUser);
467
				}
467
				}