Subversion Repositories SmartDukaan

Rev

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

Rev 22532 Rev 22608
Line 338... Line 338...
338 
					userRoleRepository.persist(fofoRole);
 338 
					userRoleRepository.persist(fofoRole);
339 
				}
 339 
				}
340
340
341 
				if(foundRetailer){
 341 
				if(foundRetailer){
342 
					LOGGER.info("\n\n\n****retailer found\n\n\n");
 342 
					LOGGER.info("\n\n\n****retailer found\n\n\n");
- 
 
 343 
					PrivateDealUser privateDealUser = null;
- 
 
 344 
					try{
343 
					PrivateDealUser privateDealUser = privateDealUserRepository.selectById(saholicUser.getId());
 345 
						privateDealUser = privateDealUserRepository.selectById(saholicUser.getId());
- 
 
 346 
					}catch(ProfitMandiBusinessException profitMandiBusinessException){
- 
 
 347 
						LOGGER.error("PrivateDealUser not found : ", profitMandiBusinessException);
- 
 
 348 
					}
- 
 
 349 
					 //= privateDealUserRepository.selectById(saholicUser.getId());
344 
					if(privateDealUser.getCounterId() == null){
 350 
					if(privateDealUser == null){
345 
						Integer counterId = this.createCounter(user.getEmailId(), map.get("gst"), user.getMobileNumber(), retailer.getName(), retailerAddress.getId());
 351 
						Integer counterId = this.createCounter(user.getEmailId(), map.get("gst"), user.getMobileNumber(), retailer.getName(), retailerAddress.getId());
- 
 
 352 
						this.createPrivateDealUser(saholicUser.getId(), counterId);
- 
 
 353 
					}else{
- 
 
 354 
						if(privateDealUser.getCounterId() == null){
- 
 
 355 
							Integer counterId = this.createCounter(user.getEmailId(), map.get("gst"), user.getMobileNumber(), retailer.getName(), retailerAddress.getId());
346 
						privateDealUser.setCounterId(counterId);
 356 
							privateDealUser.setCounterId(counterId);
347 
						privateDealUserRepository.persist(privateDealUser);
 357 
							privateDealUserRepository.persist(privateDealUser);
- 
 
 358 
						}
348 
					}
 359 
					}
349 
				}else{
 360 
				}else{
350 
					LOGGER.info("retailer not found");
 361 
					LOGGER.info("retailer not found");
351 
					//gst number intergration with counter
 362 
					//gst number intergration with counter
352 
					Integer counterId = this.createCounter(user.getEmailId(), map.get("gst"), user.getMobileNumber(), retailer.getName(), retailerAddress.getId());
 363 
					Integer counterId = this.createCounter(user.getEmailId(), map.get("gst"), user.getMobileNumber(), retailer.getName(), retailerAddress.getId());
- 
 
 364 
					PrivateDealUser privateDealUser = null;
- 
 
 365 
					try{
- 
 
 366 
						privateDealUser = privateDealUserRepository.selectById(saholicUser.getId());
- 
 
 367 
					}catch(ProfitMandiBusinessException profitMandiBusinessException){
- 
 
 368 
						LOGGER.error("PrivateDealUser not found : ", profitMandiBusinessException);
- 
 
 369 
					}
- 
 
 370 
					/* //= privateDealUserRepository.selectById(saholicUser.getId());
- 
 
 371 
					if(privateDealUser == null){
- 
 
 372 
						int counterId = this.createCounter(user.getEmailId(), map.get("gst"), user.getMobileNumber(), retailer.getName(), retailerAddress.getId());
- 
 
 373 
						this.createPrivateDealUser(saholicUser.getId(), counterId);
- 
 
 374 
					}*/
353
375
354
376
355 
						PrivateDealUser privateDealUser = privateDealUserRepository.selectById(saholicUser.getId());
 - 
 
356 
					if(privateDealUser != null){
 377 
					if(privateDealUser != null){
357 
						//LOGGER.info("PrivateDealUser found with id [{}]", saholicUser.getId());
 378 
						//LOGGER.info("PrivateDealUser found with id [{}]", saholicUser.getId());
358 
						privateDealUser.setCounterId(counterId);
 379 
						privateDealUser.setCounterId(counterId);
359 
						privateDealUserRepository.update(privateDealUser);
 380 
						privateDealUserRepository.update(privateDealUser);
360 
					}else{
381 
					}else{
361 
						LOGGER.info("PrivateDealUser not found with id [{}]", saholicUser.getId());
 382 
						LOGGER.info("PrivateDealUser not found with id [{}]", saholicUser.getId());
362 
						privateDealUser = new PrivateDealUser();
 - 
 
363 
						privateDealUser.setActive(true);
 - 
 
364 
						privateDealUser.setBulkShipmentAmountLimit(50000);
 - 
 
365 
						privateDealUser.setId(saholicUser.getId());
 - 
 
366 
						privateDealUser.setCounterId(counterId);
 383 
						this.createPrivateDealUser(saholicUser.getId(), counterId);
367 
						privateDealUserRepository.persist(privateDealUser);
 - 
 
368 
					}
 384 
					}
369 
					PrivateDealUserAddressMapping privateDealUserAddressMapping = new PrivateDealUserAddressMapping();
 385 
					PrivateDealUserAddressMapping privateDealUserAddressMapping = new PrivateDealUserAddressMapping();
370 
					PrivateDealUserAddressId privateDealUserAddressId = new PrivateDealUserAddressId();
 386 
					PrivateDealUserAddressId privateDealUserAddressId = new PrivateDealUserAddressId();
371 
					privateDealUserAddressId.setUserId(retailer.getId());
 387 
					privateDealUserAddressId.setUserId(retailer.getId());
372 
					privateDealUserAddressId.setAddressId(retailerAddress.getId());
 388 
					privateDealUserAddressId.setAddressId(retailerAddress.getId());
Line 381... Line 397...
381 
		}
 397 
		}
382
398
383
399
384 
	}
 400 
	}
385
401
- 
 
 402 
	private void createPrivateDealUser(int retailerId, int counterId){
- 
 
 403 
		PrivateDealUser privateDealUser = new PrivateDealUser();
- 
 
 404 
		privateDealUser.setActive(true);
- 
 
 405 
		privateDealUser.setBulkShipmentAmountLimit(50000);
- 
 
 406 
		privateDealUser.setId(retailerId);
- 
 
 407 
		privateDealUser.setCounterId(counterId);
- 
 
 408 
		privateDealUserRepository.persist(privateDealUser);
- 
 
 409 
	}
- 
 
 410
386 
	private Integer createCounter(String emailId, String gstNumber, String mobileNumber, String name, int addressId){
 411 
	private Integer createCounter(String emailId, String gstNumber, String mobileNumber, String name, int addressId){
387 
		if(gstNumber != null && !gstNumber.isEmpty()){
 412 
		if(gstNumber != null && !gstNumber.isEmpty()){
388 
			Counter counter = new Counter();
 413 
			Counter counter = new Counter();
389 
			counter.setEmailId(emailId);
 414 
			counter.setEmailId(emailId);
390 
			counter.setGstin(gstNumber);
 415 
			counter.setGstin(gstNumber);