Subversion Repositories SmartDukaan

Rev

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

Rev 24783 Rev 24785
Line 64... Line 64...
64 
					.collect(Collectors.groupingBy(x -> x.getTimestamp().toLocalDate(), Collectors.toList()));
 64 
					.collect(Collectors.groupingBy(x -> x.getTimestamp().toLocalDate(), Collectors.toList()));
65 
			for (Map.Entry<LocalDate, List<UserWalletHistory>> entry : dateWiseWalletHistory.entrySet()) {
 65 
			for (Map.Entry<LocalDate, List<UserWalletHistory>> entry : dateWiseWalletHistory.entrySet()) {
66 
				LocalDate dateToReconcile = entry.getKey();
 66 
				LocalDate dateToReconcile = entry.getKey();
67 
				List<UserWalletHistory> history = entry.getValue();
 67 
				List<UserWalletHistory> history = entry.getValue();
68 
				List<?> reconciliation = reconcileOrdersAndWallet(uw.getUserId(), retailerNameMap.get(partnerId), dateToReconcile,history);
 68 
				List<?> reconciliation = reconcileOrdersAndWallet(uw.getUserId(), retailerNameMap.get(partnerId), dateToReconcile,history);
69 
				reconciled = reconciled || (boolean)reconciliation.remove(0);
 69 
				reconciled = reconciled || Boolean.TRUE.equals(reconciliation.remove(0));
70 
				rows.add(reconciliation);
 70 
				rows.add(reconciliation);
71 
			}
 71 
			}
72 
		}
 72 
		}
73 
		ByteArrayOutputStream baos = FileUtil.getCSVByteStream(Arrays.asList("Store Code", "Date",
 73 
		ByteArrayOutputStream baos = FileUtil.getCSVByteStream(Arrays.asList("Store Code", "Date",
74 
				"Wallet amount consumed", "Ordered Total", "Cancelled Total", "Refunded Total"), rows);
 74 
				"Wallet amount consumed", "Ordered Total", "Cancelled Total", "Refunded Total"), rows);