| Line 302... |
Line 302... |
| 302 |
for (Map.Entry<LocalDate, List<UserWalletHistory>> entry : dateWiseWalletHistory.entrySet()) {
|
302 |
for (Map.Entry<LocalDate, List<UserWalletHistory>> entry : dateWiseWalletHistory.entrySet()) {
|
| 303 |
LocalDate dateToReconcile = entry.getKey();
|
303 |
LocalDate dateToReconcile = entry.getKey();
|
| 304 |
List<UserWalletHistory> history = entry.getValue();
|
304 |
List<UserWalletHistory> history = entry.getValue();
|
| 305 |
rows.add(reconcileOrdersAndWallet(uw.getUserId(), dateToReconcile, history));
|
305 |
rows.add(reconcileOrdersAndWallet(uw.getUserId(), dateToReconcile, history));
|
| 306 |
}
|
306 |
}
|
| 307 |
ByteArrayOutputStream baos = FileUtil.getCSVByteStream(Arrays.asList("Date", "Wallet amount",
|
307 |
ByteArrayOutputStream baos = FileUtil.getCSVByteStream(
|
| 308 |
"Ordered Total", "Cancelled Total", "Refunded Total"), rows);
|
308 |
Arrays.asList("Date", "Wallet amount", "Ordered Total", "Cancelled Total", "Refunded Total"), rows);
|
| 309 |
|
309 |
|
| 310 |
Utils.sendMailWithAttachment(mailSender, new String[] { "amit.gupta@shop2020.in" }, new String[] {}, "Test",
|
310 |
Utils.sendMailWithAttachment(mailSender, new String[] { "amit.gupta@shop2020.in" }, new String[] {}, "Test",
|
| 311 |
"test", "File.csv", new ByteArrayResource(baos.toByteArray()));
|
311 |
"test", "File.csv", new ByteArrayResource(baos.toByteArray()));
|
| 312 |
}
|
312 |
}
|
| 313 |
|
313 |
|
| Line 322... |
Line 322... |
| 322 |
float returnedAmount = 0;
|
322 |
float returnedAmount = 0;
|
| 323 |
float totalDeductedAmount = 0;
|
323 |
float totalDeductedAmount = 0;
|
| 324 |
for (int transactionId : transactionsOnThatDate.keySet()) {
|
324 |
for (int transactionId : transactionsOnThatDate.keySet()) {
|
| 325 |
List<Order> orders = orderRepository.selectAllByTransactionId(transactionId);
|
325 |
List<Order> orders = orderRepository.selectAllByTransactionId(transactionId);
|
| 326 |
for (Order o : orders) {
|
326 |
for (Order o : orders) {
|
| 327 |
if (o.getRefundTimestamp() == null && o.getCreateTimestamp().toLocalDate().equals(localDate)) {
|
327 |
if (o.getCreateTimestamp().toLocalDate().equals(localDate)) {
|
| 328 |
if (Arrays.asList(OrderStatus.PAYMENT_PENDING, OrderStatus.PAYMENT_FAILED)
|
328 |
if (Arrays.asList(OrderStatus.PAYMENT_PENDING, OrderStatus.PAYMENT_FAILED)
|
| 329 |
.contains(o.getStatus())) {
|
329 |
.contains(o.getStatus())) {
|
| 330 |
cancelledAmount += o.getWalletAmount();
|
330 |
cancelledAmount += o.getWalletAmount();
|
| 331 |
}
|
331 |
} else if (o.getRefundTimestamp() != null
|
| 332 |
} else if (o.getRefundTimestamp().toLocalDate().equals(localDate)) {
|
332 |
&& o.getRefundTimestamp().toLocalDate().equals(localDate)) {
|
| 333 |
ReturnOrder returnedOrder = returnOrderRepository.selectByOrderId(o.getId());
|
333 |
ReturnOrder returnedOrder = returnOrderRepository.selectByOrderId(o.getId());
|
| 334 |
if(returnedOrder==null) {
|
334 |
if (returnedOrder == null) {
|
| 335 |
cancelledAmount += o.getWalletAmount();
|
335 |
cancelledAmount += o.getWalletAmount();
|
| 336 |
} else {
|
336 |
} else {
|
| 337 |
returnedAmount += returnedOrder.getTotalPrice();
|
337 |
returnedAmount += returnedOrder.getTotalPrice();
|
| 338 |
}
|
338 |
}
|
| - |
|
339 |
totalDeductedAmount += o.getWalletAmount();
|
| - |
|
340 |
}
|
| - |
|
341 |
} else if (o.getRefundTimestamp() != null && o.getRefundTimestamp().toLocalDate().equals(localDate)) {
|
| - |
|
342 |
ReturnOrder returnedOrder = returnOrderRepository.selectByOrderId(o.getId());
|
| - |
|
343 |
if (returnedOrder == null) {
|
| - |
|
344 |
cancelledAmount += o.getWalletAmount();
|
| - |
|
345 |
} else {
|
| - |
|
346 |
returnedAmount += returnedOrder.getTotalPrice();
|
| - |
|
347 |
}
|
| 339 |
}
|
348 |
}
|
| - |
|
349 |
totalWalletConsumed -= transactionsOnThatDate.get(transactionId);
|
| 340 |
}
|
350 |
}
|
| 341 |
totalWalletConsumed -= transactionsOnThatDate.get(transactionId);
|
- |
|
| - |
|
351 |
|
| 342 |
}
|
352 |
}
|
| 343 |
|
353 |
|
| 344 |
return Arrays.asList(localDate, totalWalletConsumed, totalDeductedAmount, cancelledAmount, returnedAmount);
|
354 |
return Arrays.asList(localDate, totalWalletConsumed, totalDeductedAmount, cancelledAmount, returnedAmount);
|
| 345 |
|
355 |
|
| 346 |
}
|
356 |
}
|