Subversion Repositories SmartDukaan

Rev

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

Rev 23676 Rev 23677
Line 135... Line 135...
135
		List<RechargeProviderCreditWalletHistory> allCreditHistory = rechargeProviderCreditWalletHistoryRepository
135
		List<RechargeProviderCreditWalletHistory> allCreditHistory = rechargeProviderCreditWalletHistoryRepository
136
				.selectAll(0, 2000);
136
				.selectAll(0, 2000);
137
		List<RechargeProvider> rechargeProviders = rechargeProviderRepository.selectAll();
137
		List<RechargeProvider> rechargeProviders = rechargeProviderRepository.selectAll();
138
		rechargeProviders.stream().forEach(x -> x.setAmount(0));
138
		rechargeProviders.stream().forEach(x -> x.setAmount(0));
139
 
139
 
140
		Map<LocalDate, List<RechargeProviderCreditWalletHistory>> dateWiseProviderCreditsMap = allCreditHistory.stream()
-
 
141
				.collect(Collectors.groupingBy(x -> x.getCreateTimestamp().toLocalDate()));
-
 
142
 
140
 
143
		rechargeProviders.stream().forEach(x -> {
141
		rechargeProviders.stream().forEach(x -> {
-
 
142
			Map<LocalDate, List<RechargeProviderCreditWalletHistory>> dateWiseProviderCreditsMap = allCreditHistory.stream()
-
 
143
					.filter(z->z.getProviderId()==x.getId()).collect(Collectors.groupingBy(x1 -> x1.getCreateTimestamp().toLocalDate()));
144
			LocalDate endDate = LocalDate.now().plusDays(1);
144
			LocalDate endDate = LocalDate.now().plusDays(1);
145
			float previousDayClosing = 0;
145
			float previousDayClosing = 0;
146
			LocalDate date = LocalDate.of(2018, 4, 6);
146
			LocalDate date = LocalDate.of(2018, 4, 6);
147
			while (date.isBefore(endDate)) {
147
			while (date.isBefore(endDate)) {
148
				List<RechargeTransaction> dateWiseRechargeTransactions = rechargeTransactionRepository
148
				List<RechargeTransaction> dateWiseRechargeTransactions = rechargeTransactionRepository
149
						.selectAllBetweenTimestamp(Arrays.asList(RechargeStatus.values()), date.atStartOfDay(),
149
						.selectAllBetweenTimestamp(Arrays.asList(RechargeStatus.values()), date.atStartOfDay(),
150
								date.plusDays(1).atStartOfDay());
150
								date.plusDays(1).atStartOfDay());
151
				DailyRecharge dailyRecharge = null;
-
 
152
				try {
-
 
153
					dailyRecharge = dailyRechargeRepository.selectByProviderIdAndCreateDate(x.getId(), date);
-
 
154
				} catch(Exception e) {
-
 
155
					LOGGER.info("Could not find Recharge entry");
-
 
156
				}
-
 
157
				if (dailyRecharge == null) {
-
 
158
					dailyRecharge = new DailyRecharge();
-
 
159
					dailyRecharge.setCreateDate(date);
-
 
160
					dailyRecharge.setProviderId(x.getId());
-
 
161
				}
-
 
162
 
151
 
163
				List<RechargeTransaction> successfulTransactions = dateWiseRechargeTransactions.stream()
152
				List<RechargeTransaction> successfulTransactions = dateWiseRechargeTransactions.stream()
164
						.filter(y -> y.getStatus().equals(RechargeStatus.SUCCESS)).collect(Collectors.toList());
153
						.filter(y -> y.getStatus().equals(RechargeStatus.SUCCESS)).collect(Collectors.toList());
165
 
154
 
166
				float dailyAmount = 0;
155
				float dailyAmount = 0;
Line 180... Line 169...
180
							dailyWalletRecharge += rechargeProviderCreditWalletHistory.getAmount();
169
							dailyWalletRecharge += rechargeProviderCreditWalletHistory.getAmount();
181
						}
170
						}
182
					}
171
					}
183
				}
172
				}
184
				if (dailyAmount > 0 || dailyWalletRecharge > 0) {
173
				if (dailyAmount > 0 || dailyWalletRecharge > 0) {
-
 
174
					DailyRecharge dailyRecharge = null;
-
 
175
					try {
-
 
176
						dailyRecharge = dailyRechargeRepository.selectByProviderIdAndCreateDate(x.getId(), date);
-
 
177
					} catch(Exception e) {
-
 
178
						LOGGER.info("Could not find Recharge entry");
-
 
179
					}
-
 
180
					if (dailyRecharge == null) {
-
 
181
						dailyRecharge = new DailyRecharge();
-
 
182
						dailyRecharge.setCreateDate(date);
-
 
183
					}
185
					dailyRecharge.setOpeningBalance(previousDayClosing);
184
					dailyRecharge.setOpeningBalance(previousDayClosing);
186
					dailyRecharge.setProviderId(x.getId());
185
					dailyRecharge.setProviderId(x.getId());
187
					dailyRecharge.setWalletRechargeAmount(dailyWalletRecharge);
186
					dailyRecharge.setWalletRechargeAmount(dailyWalletRecharge);
188
					dailyRecharge.setTotalAmount(dailyAmount);
187
					dailyRecharge.setTotalAmount(dailyAmount);
189
					dailyRecharge.setTotalCommission(totalCommission);
188
					dailyRecharge.setTotalCommission(totalCommission);