Subversion Repositories SmartDukaan

Rev

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

Rev 31397 Rev 31518
Line 2092... Line 2092...
2092
				ProfitMandiConstants.TICKET_CATEGORY_RBM, ProfitMandiConstants.TICKET_CATEGORY_SALES,
2092
				ProfitMandiConstants.TICKET_CATEGORY_RBM, ProfitMandiConstants.TICKET_CATEGORY_SALES,
2093
				ProfitMandiConstants.TICKET_CATEGORY_MARKETING, ProfitMandiConstants.TICKET_CATEGORY_ACCOUNTS,
2093
				ProfitMandiConstants.TICKET_CATEGORY_MARKETING, ProfitMandiConstants.TICKET_CATEGORY_ACCOUNTS,
2094
				ProfitMandiConstants.TICKET_CATEGORY_BUSINESSINTELLIGENT,
2094
				ProfitMandiConstants.TICKET_CATEGORY_BUSINESSINTELLIGENT,
2095
				ProfitMandiConstants.TICKET_CATEGORY_TECHNOLOGY);
2095
				ProfitMandiConstants.TICKET_CATEGORY_TECHNOLOGY);
2096
 
2096
 
2097
		Map<String, Set<Integer>> storeGuyMap = csService.getAuthUserPartnerIdMappingByCategoryIds(categoryIds);
2097
		Map<String, Set<Integer>> storeGuyMap = csService.getAuthUserPartnerIdMappingByCategoryIds(categoryIds, false);
2098
 
2098
 
2099
		for (Entry<String, Set<Integer>> storeGuyEntry : storeGuyMap.entrySet()) {
2099
		for (Entry<String, Set<Integer>> storeGuyEntry : storeGuyMap.entrySet()) {
2100
			String email = storeGuyEntry.getKey();
2100
			String email = storeGuyEntry.getKey();
2101
			Set<Integer> fofoIds = storeGuyEntry.getValue();
2101
			Set<Integer> fofoIds = storeGuyEntry.getValue();
2102
			LOGGER.info("fofoIds {}", fofoIds);
2102
			LOGGER.info("fofoIds {}", fofoIds);
Line 3548... Line 3548...
3548
		for (FofoPayment fofoPayment : fofoPayments) {
3548
		for (FofoPayment fofoPayment : fofoPayments) {
3549
			ccAvenuePaymentService.updatePayment(fofoPayment);
3549
			ccAvenuePaymentService.updatePayment(fofoPayment);
3550
		}
3550
		}
3551
	}
3551
	}
3552
 
3552
 
-
 
3553
	/*public void getCCAvenuePendingOrderStatus(int pendingOrderId) {
-
 
3554
		PendingOrder pendingOrder = pendingOrderRepository.selectById(pendingOrderId);
-
 
3555
		ccAvenuePaymentService.getPaymentStatusMap(pendingOrder);
-
 
3556
	}*/
-
 
3557
 
3553
	private void calculateInterest(Loan loan, Map<LoanReferenceType, Double> loanStatusAmount, int loanStatementId)
3558
	private void calculateInterest(Loan loan, Map<LoanReferenceType, Double> loanStatusAmount, int loanStatementId)
3554
			throws ProfitMandiBusinessException {
3559
			throws ProfitMandiBusinessException {
3555
		LoanStatement loanStatement = loanStatementRepository.selectById(loanStatementId);
3560
		LoanStatement loanStatement = loanStatementRepository.selectById(loanStatementId);
3556
 
3561
 
3557
		if (loanStatement.getLoanId() == loan.getId()) {
3562
		if (loanStatement.getLoanId() == loan.getId()) {
Line 3918... Line 3923...
3918
				ProfitMandiConstants.TICKET_CATEGORY_RBM, ProfitMandiConstants.TICKET_CATEGORY_SALES,
3923
				ProfitMandiConstants.TICKET_CATEGORY_RBM, ProfitMandiConstants.TICKET_CATEGORY_SALES,
3919
				ProfitMandiConstants.TICKET_CATEGORY_ACCOUNTS,
3924
				ProfitMandiConstants.TICKET_CATEGORY_ACCOUNTS,
3920
				ProfitMandiConstants.TICKET_CATEGORY_BUSINESSINTELLIGENT);
3925
				ProfitMandiConstants.TICKET_CATEGORY_BUSINESSINTELLIGENT);
3921
 
3926
 
3922
		for (Map.Entry<String, Set<Integer>> storeGuyEntry : csService
3927
		for (Map.Entry<String, Set<Integer>> storeGuyEntry : csService
3923
				.getAuthUserPartnerIdMappingByCategoryIds(categoryIds).entrySet()) {
3928
				.getAuthUserPartnerIdMappingByCategoryIds(categoryIds, false).entrySet()) {
3924
			List<Loan> filteredRows = new ArrayList<>();
3929
			List<Loan> filteredRows = new ArrayList<>();
3925
			for (Loan loan : defaultLoans) {
3930
			for (Loan loan : defaultLoans) {
3926
 
3931
 
3927
				if (storeGuyEntry.getValue().contains(loan.getFofoId())) {
3932
				if (storeGuyEntry.getValue().contains(loan.getFofoId())) {
3928
 
3933
 
Line 4065... Line 4070...
4065
				ProfitMandiConstants.TICKET_CATEGORY_RBM, ProfitMandiConstants.TICKET_CATEGORY_SALES,
4070
				ProfitMandiConstants.TICKET_CATEGORY_RBM, ProfitMandiConstants.TICKET_CATEGORY_SALES,
4066
				ProfitMandiConstants.TICKET_CATEGORY_ACCOUNTS,
4071
				ProfitMandiConstants.TICKET_CATEGORY_ACCOUNTS,
4067
				ProfitMandiConstants.TICKET_CATEGORY_BUSINESSINTELLIGENT);
4072
				ProfitMandiConstants.TICKET_CATEGORY_BUSINESSINTELLIGENT);
4068
 
4073
 
4069
		for (Map.Entry<String, Set<Integer>> storeGuyEntry : csService
4074
		for (Map.Entry<String, Set<Integer>> storeGuyEntry : csService
4070
				.getAuthUserPartnerIdMappingByCategoryIds(categoryIds).entrySet()) {
4075
				.getAuthUserPartnerIdMappingByCategoryIds(categoryIds, false).entrySet()) {
4071
			List<Loan> filteredRows = new ArrayList<>();
4076
			List<Loan> filteredRows = new ArrayList<>();
4072
			for (Loan loan : dueDateCrossLoans) {
4077
			for (Loan loan : dueDateCrossLoans) {
4073
 
4078
 
4074
				if (storeGuyEntry.getValue().contains(loan.getFofoId())) {
4079
				if (storeGuyEntry.getValue().contains(loan.getFofoId())) {
4075
 
4080
 
Line 4554... Line 4559...
4554
		List<Integer> categoryIds = Arrays.asList(ProfitMandiConstants.TICKET_CATEGORY_CATEGORY,
4559
		List<Integer> categoryIds = Arrays.asList(ProfitMandiConstants.TICKET_CATEGORY_CATEGORY,
4555
				ProfitMandiConstants.TICKET_CATEGORY_RBM, ProfitMandiConstants.TICKET_CATEGORY_SALES,
4560
				ProfitMandiConstants.TICKET_CATEGORY_RBM, ProfitMandiConstants.TICKET_CATEGORY_SALES,
4556
				ProfitMandiConstants.TICKET_CATEGORY_MARKETING, ProfitMandiConstants.TICKET_CATEGORY_ACCOUNTS,
4561
				ProfitMandiConstants.TICKET_CATEGORY_MARKETING, ProfitMandiConstants.TICKET_CATEGORY_ACCOUNTS,
4557
				ProfitMandiConstants.TICKET_CATEGORY_BUSINESSINTELLIGENT);
4562
				ProfitMandiConstants.TICKET_CATEGORY_BUSINESSINTELLIGENT);
4558
 
4563
 
4559
		Map<String, Set<Integer>> storeGuyMap = csService.getAuthUserPartnerIdMappingByCategoryIds(categoryIds);
4564
		Map<String, Set<Integer>> storeGuyMap = csService.getAuthUserPartnerIdMappingByCategoryIds(categoryIds, false);
4560
 
4565
 
4561
		List<MonthlyTarget> monthlyTargets = monthlyTargetRepository.selectByDate(YearMonth.now());
4566
		List<MonthlyTarget> monthlyTargets = monthlyTargetRepository.selectByDate(YearMonth.now());
4562
 
4567
 
4563
		Map<Integer, CustomRetailer> customeRetailerMap = retailerService.getAllFofoRetailers();
4568
		Map<Integer, CustomRetailer> customeRetailerMap = retailerService.getAllFofoRetailers();
4564
 
4569