Subversion Repositories SmartDukaan

Rev

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

Rev 32482 Rev 37102
Line 446... Line 446...
446 
						this.createPrivateDealUser(saholicUser.getId(), counterId);
 446 
						this.createPrivateDealUser(saholicUser.getId(), counterId);
447 
					}else{
 447 
					}else{
448 
						if(privateDealUser.getCounterId() == null){
 448 
						if(privateDealUser.getCounterId() == null){
449 
							Integer counterId = this.createCounter(user.getEmailId(), map.get("gst"), user.getMobileNumber(), retailer.getName(), retailerAddress.getId());
 449 
							Integer counterId = this.createCounter(user.getEmailId(), map.get("gst"), user.getMobileNumber(), retailer.getName(), retailerAddress.getId());
450 
							privateDealUser.setCounterId(counterId);
 450 
							privateDealUser.setCounterId(counterId);
451 
							privateDealUser.setFofo(true);
 - 
 
452 
							privateDealUserRepository.persist(privateDealUser);
 451 
							privateDealUserRepository.persist(privateDealUser);
453 
						}
 452 
						}
454 
					}
 453 
					}
455 
				}else{
 454 
				}else{
456 
					LOGGER.info("retailer not found");
 455 
					LOGGER.info("retailer not found");
Line 470... Line 469...
470
469
471
470
472 
					if(privateDealUser != null){
 471 
					if(privateDealUser != null){
473 
						//LOGGER.info("PrivateDealUser found with id [{}]", saholicUser.getId());
 472 
						//LOGGER.info("PrivateDealUser found with id [{}]", saholicUser.getId());
474 
						privateDealUser.setCounterId(counterId);
 473 
						privateDealUser.setCounterId(counterId);
475 
						privateDealUser.setFofo(true);
 - 
 
476 
						privateDealUserRepository.update(privateDealUser);
 474 
						privateDealUserRepository.update(privateDealUser);
477 
					}else{
475 
					}else{
478 
						LOGGER.info("PrivateDealUser not found with id [{}]", saholicUser.getId());
 476 
						LOGGER.info("PrivateDealUser not found with id [{}]", saholicUser.getId());
479 
						this.createPrivateDealUser(saholicUser.getId(), counterId);
 477 
						this.createPrivateDealUser(saholicUser.getId(), counterId);
480 
					}
 478 
					}
Line 491... Line 489...
491 
		}
 489 
		}
492
490
493
491
494 
	}
 492 
	}
495
493
496 
	//Specifically set isFofo to true that has to be used by old system
 - 
 
497 
	private void createPrivateDealUser(int retailerId, int counterId){
 494 
	private void createPrivateDealUser(int retailerId, int counterId){
498 
		PrivateDealUser privateDealUser = new PrivateDealUser();
 495 
		PrivateDealUser privateDealUser = new PrivateDealUser();
499 
		privateDealUser.setActive(true);
 496 
		privateDealUser.setActive(true);
500 
		privateDealUser.setBulkShipmentAmountLimit(100000);
 - 
 
501 
		privateDealUser.setId(retailerId);
 497 
		privateDealUser.setId(retailerId);
502 
		privateDealUser.setCounterId(counterId);
 498 
		privateDealUser.setCounterId(counterId);
503 
		privateDealUser.setFofo(true);
 - 
 
504 
		privateDealUserRepository.persist(privateDealUser);
 499 
		privateDealUserRepository.persist(privateDealUser);
505 
	}
 500 
	}
506
501
507 
	private Integer createCounter(String emailId, String gstNumber, String mobileNumber, String name, int addressId){
 502 
	private Integer createCounter(String emailId, String gstNumber, String mobileNumber, String name, int addressId){
508 
		if(gstNumber != null && !gstNumber.isEmpty()){
 503 
		if(gstNumber != null && !gstNumber.isEmpty()){