Subversion Repositories SmartDukaan

Rev

Rev 37102 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 37102 Rev 37648
Line 63... Line 63...
63
63
64 
	@Autowired
 64 
	@Autowired
65 
	private RetailerRegisteredAddressRepository retailerRegisteredAddressRepository;
 65 
	private RetailerRegisteredAddressRepository retailerRegisteredAddressRepository;
66
66
67 
	@Autowired
 67 
	@Autowired
68 
	private PrivateDealUserRepository privateDealUserRepository;
 - 
 
69
- 
 
70 
	@Autowired
 - 
 
71 
	private PrivateDealUserAddressMappingRepository privateDealUserAddressMappingRepository;
 - 
 
72
- 
 
73 
	@Autowired
 - 
 
74 
	private CounterRepository counterRepository;
 - 
 
75
- 
 
76 
	@Autowired
 - 
 
77 
	private ShopRepository shopRepository;
 68 
	private ShopRepository shopRepository;
78
69
79 
	@Autowired
 70 
	@Autowired
80 
	private ShopAddressRepository shopAddressRepository;
 71 
	private ShopAddressRepository shopAddressRepository;
81
72
Line 429... Line 420...
429 
					fofoPartnerPaymentOption.setFofoId(retailer.getId());
 420 
					fofoPartnerPaymentOption.setFofoId(retailer.getId());
430 
					fofoPartnerPaymentOption.setPaymentOptionId(paymentOption.getId());
 421 
					fofoPartnerPaymentOption.setPaymentOptionId(paymentOption.getId());
431 
					fofoPartnerPaymentOptionRepository.persist(fofoPartnerPaymentOption);
 422 
					fofoPartnerPaymentOptionRepository.persist(fofoPartnerPaymentOption);
432 
				}
 423 
				}
433
424
434 
				if(foundRetailer){
 425 
				if(!foundRetailer){
435 
					LOGGER.info("\n\n\n****retailer found\n\n\n");
 - 
 
436 
					PrivateDealUser privateDealUser = null;
 - 
 
437 
					try{
 - 
 
438 
						privateDealUser = privateDealUserRepository.selectById(saholicUser.getId());
 - 
 
439 
					}catch(ProfitMandiBusinessException profitMandiBusinessException){
 - 
 
440 
						LOGGER.error("PrivateDealUser not found : ", profitMandiBusinessException);
 - 
 
441 
					}
 - 
 
442
- 
 
443 
					 //= privateDealUserRepository.selectById(saholicUser.getId());
 - 
 
444 
					if(privateDealUser == null){
 - 
 
445 
						Integer counterId = this.createCounter(user.getEmailId(), map.get("gst"), user.getMobileNumber(), retailer.getName(), retailerAddress.getId());
 - 
 
446 
						this.createPrivateDealUser(saholicUser.getId(), counterId);
 - 
 
447 
					}else{
 - 
 
448 
						if(privateDealUser.getCounterId() == null){
 - 
 
449 
							Integer counterId = this.createCounter(user.getEmailId(), map.get("gst"), user.getMobileNumber(), retailer.getName(), retailerAddress.getId());
 - 
 
450 
							privateDealUser.setCounterId(counterId);
 - 
 
451 
							privateDealUserRepository.persist(privateDealUser);
 - 
 
452 
						}
 - 
 
453 
					}
 - 
 
454 
				}else{
 - 
 
455 
					LOGGER.info("retailer not found");
 426 
					LOGGER.info("retailer not found");
456 
					//gst number intergration with counter
 - 
 
457 
					Integer counterId = this.createCounter(user.getEmailId(), map.get("gst"), user.getMobileNumber(), retailer.getName(), retailerAddress.getId());
 - 
 
458 
					PrivateDealUser privateDealUser = null;
 - 
 
459 
					try{
 - 
 
460 
						privateDealUser = privateDealUserRepository.selectById(saholicUser.getId());
 - 
 
461 
					}catch(ProfitMandiBusinessException profitMandiBusinessException){
 - 
 
462 
						LOGGER.error("PrivateDealUser not found : ", profitMandiBusinessException);
 - 
 
463 
					}
 - 
 
464 
					/* //= privateDealUserRepository.selectById(saholicUser.getId());
 - 
 
465 
					if(privateDealUser == null){
 - 
 
466 
						int counterId = this.createCounter(user.getEmailId(), map.get("gst"), user.getMobileNumber(), retailer.getName(), retailerAddress.getId());
 - 
 
467 
						this.createPrivateDealUser(saholicUser.getId(), counterId);
 - 
 
468 
					}*/
 - 
 
469
- 
 
470
- 
 
471 
					if(privateDealUser != null){
 - 
 
472 
						//LOGGER.info("PrivateDealUser found with id [{}]", saholicUser.getId());
 - 
 
473 
						privateDealUser.setCounterId(counterId);
 - 
 
474 
						privateDealUserRepository.update(privateDealUser);
 - 
 
475 
					}else{
- 
 
476 
						LOGGER.info("PrivateDealUser not found with id [{}]", saholicUser.getId());
 - 
 
477 
						this.createPrivateDealUser(saholicUser.getId(), counterId);
 - 
 
478 
					}
 - 
 
479 
					PrivateDealUserAddressMapping privateDealUserAddressMapping = new PrivateDealUserAddressMapping();
 - 
 
480 
					privateDealUserAddressMapping.setUserId(retailer.getId());
 - 
 
481 
					privateDealUserAddressMapping.setAddressId(retailerAddress.getId());
 - 
 
482 
					privateDealUserAddressMappingRepository.persist(privateDealUserAddressMapping);
 - 
 
483
- 
 
484 
					saholicUser.setAddressId(retailerAddress.getId());
 427 
					saholicUser.setAddressId(retailerAddress.getId());
485 
					userUserRepository.persist(saholicUser);
 428 
					userUserRepository.persist(saholicUser);
486 
				}
 429 
				}
487 
			}
 430 
			}
488
431
489 
		}
 432 
		}
490
433
491
434
492 
	}
 435 
	}
493
436
494 
	private void createPrivateDealUser(int retailerId, int counterId){
 - 
 
495 
		PrivateDealUser privateDealUser = new PrivateDealUser();
 - 
 
496 
		privateDealUser.setActive(true);
 - 
 
497 
		privateDealUser.setId(retailerId);
 - 
 
498 
		privateDealUser.setCounterId(counterId);
 - 
 
499 
		privateDealUserRepository.persist(privateDealUser);
 - 
 
500 
	}
 - 
 
501
- 
 
502 
	private Integer createCounter(String emailId, String gstNumber, String mobileNumber, String name, int addressId){
 - 
 
503 
		if(gstNumber != null && !gstNumber.isEmpty()){
 - 
 
504 
			Counter counter = new Counter();
 - 
 
505 
			counter.setEmailId(emailId);
 - 
 
506 
			counter.setGstin(gstNumber);
 - 
 
507 
			counter.setMobileNumber(mobileNumber);
 - 
 
508 
			counter.setName(name);
 - 
 
509 
			counter.setAddressId(addressId);
 - 
 
510 
			counter.setCreatedOn(LocalDateTime.now());
 - 
 
511 
			counterRepository.persist(counter);
 - 
 
512 
			return counter.getId();
 - 
 
513 
		}else{
 - 
 
514 
			return null;
 - 
 
515 
		}
 - 
 
516 
	}
 - 
 
517
- 
 
518 
	public void migratePrivateDealToRetailer(){
 437 
	public void migratePrivateDealToRetailer(){
519
438
520 
	}
 439 
	}
521 
}
 440 
}