Subversion Repositories SmartDukaan

Rev

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

Rev 29011 Rev 29878
Line 218... Line 218...
218 
				String userName = null;
 218 
				String userName = null;
219 
				if (user.getSecondryEmailId() != null && user.getSecondryEmailId().equals(userInfo.getEmail())) {
 219 
				if (user.getSecondryEmailId() != null && user.getSecondryEmailId().equals(userInfo.getEmail())) {
220 
					userName = user.getFirstName() + " " + user.getLastName();
 220 
					userName = user.getFirstName() + " " + user.getLastName();
221 
				} else {
 221 
				} else {
222 
					AuthUser authUser = authRepository.selectByGmailId(userInfo.getEmail());
 222 
					AuthUser authUser = authRepository.selectByGmailId(userInfo.getEmail());
223 
					if(authUser==null || !authUser.isActive()) {
 223 
					if (authUser == null || !authUser.isActive()) {
224 
						responseMap.put(ProfitMandiConstants.USER_STATUS, UserStatus.NOT_REGISTERED.getValue());
 224 
						responseMap.put(ProfitMandiConstants.USER_STATUS, UserStatus.NOT_REGISTERED.getValue());
225 
						responseMap.put(ProfitMandiConstants.EMAIL_ID, userInfo.getEmail());
 225 
						responseMap.put(ProfitMandiConstants.EMAIL_ID, userInfo.getEmail());
226 
						return responseSender.ok(responseMap);
 226 
						return responseSender.ok(responseMap);
227 
					}
 227 
					}
228 
					userName = authUser.getName();
 228 
					userName = authUser.getName();
Line 309... Line 309...
309 
	FofoStoreRepository fofoStoreRepository;
 309 
	FofoStoreRepository fofoStoreRepository;
310 
	@Autowired
 310 
	@Autowired
311 
	PartnerOnBoardingPanelRepository partnerOnBoardingPanelRepository;
 311 
	PartnerOnBoardingPanelRepository partnerOnBoardingPanelRepository;
312 
	@Autowired
 312 
	@Autowired
313 
	StoreTimelineTatService storeTimelineTatService;
 313 
	StoreTimelineTatService storeTimelineTatService;
- 
 
 314 
 
314 
	private boolean getTimeLineStatus(int fofoId) throws ProfitMandiBusinessException {
 315 
	private boolean getTimeLineStatus(int fofoId) throws ProfitMandiBusinessException {
315 
		FofoStore fs = fofoStoreRepository.selectByRetailerId(fofoId);
 316 
		FofoStore fs = fofoStoreRepository.selectByRetailerId(fofoId);
316 
		PartnerOnBoardingPanel partnerOnBoardingPanel = partnerOnBoardingPanelRepository.selectByCode(fs.getCode());
 317 
		PartnerOnBoardingPanel partnerOnBoardingPanel = partnerOnBoardingPanelRepository.selectByCode(fs.getCode());
317 
		boolean status = true;
 318 
		boolean status = true;
318 
		if (partnerOnBoardingPanel != null) {
 319 
		if (partnerOnBoardingPanel != null) {
Line 536... Line 537...
536 
		final String uri = "http://192.168.158.89/mobileappsettings?t=" + timestamp + "&imeinumber=" + imeinumber;
 537 
		final String uri = "http://192.168.158.89/mobileappsettings?t=" + timestamp + "&imeinumber=" + imeinumber;
537 
		final String BASIC_AUTH = "Basic " + Base64.getEncoder().encodeToString("dtr:dtr18Feb2015".getBytes());
 538 
		final String BASIC_AUTH = "Basic " + Base64.getEncoder().encodeToString("dtr:dtr18Feb2015".getBytes());
538 
		Map<String, String> headers = new HashMap<>();
 539 
		Map<String, String> headers = new HashMap<>();
539 
		Map<String, String> params = new HashMap<>();
 540 
		Map<String, String> params = new HashMap<>();
540 
		headers.put("Authorization", BASIC_AUTH);
 541 
		headers.put("Authorization", BASIC_AUTH);
541 
		if(timestamp==0) {
 542 
		if (timestamp == 0) {
542 
			return responseSender.ok(OrderController.APP_SETTINGS);
 543 
			return responseSender.ok(OrderController.APP_SETTINGS);
543 
		} else {
 544 
		} else {
544 
			return responseSender.ok(OrderController.APP_SETTINGS_BLANK);
 545 
			return responseSender.ok(OrderController.APP_SETTINGS_BLANK);
545 
		}
 546 
		}
546 
	}
 547 
	}
Line 761... Line 762...
761 
 
 762 
 
762 
			long approvedRefferal = previousMonthapprovedRefferalbeforeSixteen.size()
 763 
			long approvedRefferal = previousMonthapprovedRefferalbeforeSixteen.size()
763 
					+ previousMonthtransferredRefferalbeforeSixteen.size() + preCurrMonthapproved.size()
 764 
					+ previousMonthtransferredRefferalbeforeSixteen.size() + preCurrMonthapproved.size()
764 
					+ preCurrMonthtransferred.size();
 765 
					+ preCurrMonthtransferred.size();
765 
			rfm = new RefferalEarningModel();
 766 
			rfm = new RefferalEarningModel();
766 
			rfm.setActualEarning(approvedRefferal * 2000);
 767 
			rfm.setActualEarning(approvedRefferal * 5000);
767 
 
 768 
 
768 
			rfm.setYearMonth(YearMonth.now().minusMonths(1));
 769 
			rfm.setYearMonth(YearMonth.now().minusMonths(1));
769 
			rfm.setPendingRefferal(0);
 770 
			rfm.setPendingRefferal(0);
770 
			rfm.setApprovedRefferal(approvedRefferal);
 771 
			rfm.setApprovedRefferal(approvedRefferal);
771 
			refferAmountModel.add(rfm);
 772 
			refferAmountModel.add(rfm);
Line 814... Line 815...
814 
		rfm.setYearMonth(yearMonth);
 815 
		rfm.setYearMonth(yearMonth);
815 
		rfm.setPendingRefferal(pendingRefferalValue);
 816 
		rfm.setPendingRefferal(pendingRefferalValue);
816 
		rfm.setApprovedRefferal(confirmedRefferalValue);
 817 
		rfm.setApprovedRefferal(confirmedRefferalValue);
817 
		long estimateRefferalValue = pendingRefferalValue + confirmedRefferalValue;
 818 
		long estimateRefferalValue = pendingRefferalValue + confirmedRefferalValue;
818 
 
 819 
 
819 
		rfm.setMaximumEarning(estimateRefferalValue * 2000);
 820 
		rfm.setMaximumEarning(estimateRefferalValue * 5000);
820 
 
 821 
 
821 
		rfm.setMinimumEarning(confirmedRefferalValue * 2000);
 822 
		rfm.setMinimumEarning(confirmedRefferalValue * 5000);
822 
 
 823 
 
823 
		return rfm;
 824 
		return rfm;
824 
	}
 825 
	}
825 
 
 826 
 
826 
	@RequestMapping(value = "/user/partnerTarget", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
 827 
	@RequestMapping(value = "/user/partnerTarget", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)