Subversion Repositories SmartDukaan

Rev

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

Rev 26112 Rev 26125
Line 810... Line 810...
810
			CustomRetailer customRetailer = new CustomRetailer();
810
			CustomRetailer customRetailer = new CustomRetailer();
811
			customRetailer.setEmail(user.getEmailId());
811
			customRetailer.setEmail(user.getEmailId());
812
			customRetailer.setBusinessName(address.getName());
812
			customRetailer.setBusinessName(address.getName());
813
			customRetailer.setMobileNumber(address.getPhoneNumber());
813
			customRetailer.setMobileNumber(address.getPhoneNumber());
814
			try {
814
			try {
-
 
815
				customRetailer.setCode(fofoStoreRepository.selectByRetailerId(address.getRetaierId()).getCode());
-
 
816
			} catch (Exception e) {
-
 
817
				continue;
-
 
818
			}
-
 
819
			try {
815
				customRetailer.setCartId(user.getActiveCartId());
820
				customRetailer.setCartId(user.getActiveCartId());
816
				PrivateDealUser pdu = privateDealUserRepository.selectById(address.getRetaierId());
821
				PrivateDealUser pdu = privateDealUserRepository.selectById(address.getRetaierId());
817
				Counter counter = counterRepository.selectById(pdu.getCounterId());
822
				Counter counter = counterRepository.selectById(pdu.getCounterId());
818
				customRetailer.setGstNumber(counter.getGstin());
823
				customRetailer.setGstNumber(counter.getGstin());
819
			} catch (Exception e) {
824
			} catch (Exception e) {
Line 863... Line 868...
863
		address1.setState(address.getState());
868
		address1.setState(address.getState());
864
		address1.setLine1(address.getLine1());
869
		address1.setLine1(address.getLine1());
865
		address1.setLine2(address.getLine2());
870
		address1.setLine2(address.getLine2());
866
		address1.setPinCode(address.getPinCode());
871
		address1.setPinCode(address.getPinCode());
867
		address1.setName(address.getName());
872
		address1.setName(address.getName());
868
		customRetailer.setDisplayName(address.getName() + " - "+ address.getCity());
873
		customRetailer.setDisplayName(address.getName() + " - " + address.getCity());
869
		customRetailer.setAddress(address1);
874
		customRetailer.setAddress(address1);
870
		customRetailer.setPartnerId(address.getRetaierId());
875
		customRetailer.setPartnerId(address.getRetaierId());
871
		customRetailer.setCode(store.getCode());
876
		customRetailer.setCode(store.getCode());
872
		customRetailer.setWarehouseId(store.getWarehouseId());
877
		customRetailer.setWarehouseId(store.getWarehouseId());
873
		customRetailersMap.put(address.getRetaierId(), customRetailer);
878
		customRetailersMap.put(address.getRetaierId(), customRetailer);
874
		return customRetailer;
879
		return customRetailer;
875
 
880
 
876
	}
881
	}
877
	
882
 
878
	@Override
883
	@Override
879
	public Map<Integer, CustomRetailer> getFofoRetailerUserId(List<Integer> fofoIds) throws ProfitMandiBusinessException {
884
	public Map<Integer, CustomRetailer> getFofoRetailerUserId(List<Integer> fofoIds)
-
 
885
			throws ProfitMandiBusinessException {
880
		List<com.spice.profitmandi.dao.entity.user.User> saholicUsers = userUserRepository.selectByIds(fofoIds);
886
		List<com.spice.profitmandi.dao.entity.user.User> saholicUsers = userUserRepository.selectByIds(fofoIds);
881
		Map<Integer, com.spice.profitmandi.dao.entity.user.User> userAddressMap = saholicUsers.stream()
887
		Map<Integer, com.spice.profitmandi.dao.entity.user.User> userAddressMap = saholicUsers.stream()
882
				.filter(x -> x.getAddressId() != null).collect(Collectors.toMap(x -> x.getAddressId(), x -> x));
888
				.filter(x -> x.getAddressId() != null).collect(Collectors.toMap(x -> x.getAddressId(), x -> x));
883
		List<Address> addresses = addressRepository.selectByIds(new ArrayList<>(userAddressMap.keySet()));
889
		List<Address> addresses = addressRepository.selectByIds(new ArrayList<>(userAddressMap.keySet()));
884
		Map<Integer, CustomRetailer> customRetailersMap = new HashMap<>();
890
		Map<Integer, CustomRetailer> customRetailersMap = new HashMap<>();
Line 886... Line 892...
886
			com.spice.profitmandi.dao.entity.user.User user = userAddressMap.get(address.getId());
892
			com.spice.profitmandi.dao.entity.user.User user = userAddressMap.get(address.getId());
887
			CustomRetailer customRetailer = new CustomRetailer();
893
			CustomRetailer customRetailer = new CustomRetailer();
888
			customRetailer.setEmail(user.getEmailId());
894
			customRetailer.setEmail(user.getEmailId());
889
			customRetailer.setBusinessName(address.getName());
895
			customRetailer.setBusinessName(address.getName());
890
			customRetailer.setMobileNumber(address.getPhoneNumber());
896
			customRetailer.setMobileNumber(address.getPhoneNumber());
891
		
897
 
892
				int userId = userAccountRepository.selectUserIdByRetailerId(user.getId());
898
			int userId = userAccountRepository.selectUserIdByRetailerId(user.getId());
893
			
899
 
894
			try {
900
			try {
895
				customRetailer.setCartId(user.getActiveCartId());
901
				customRetailer.setCartId(user.getActiveCartId());
896
				PrivateDealUser pdu = privateDealUserRepository.selectById(address.getRetaierId());
902
				PrivateDealUser pdu = privateDealUserRepository.selectById(address.getRetaierId());
897
				Counter counter = counterRepository.selectById(pdu.getCounterId());
903
				Counter counter = counterRepository.selectById(pdu.getCounterId());
898
				customRetailer.setGstNumber(counter.getGstin());
904
				customRetailer.setGstNumber(counter.getGstin());