| Line 225... |
Line 225... |
| 225 |
float schemeInAmountRolledBack = 0;
|
225 |
float schemeInAmountRolledBack = 0;
|
| 226 |
for (int transactionId : transactionsOnThatDate.keySet()) {
|
226 |
for (int transactionId : transactionsOnThatDate.keySet()) {
|
| 227 |
List<InventoryItem> inventoryItems = inventoryRepository.selectByPurchaseId(transactionId).stream()
|
227 |
List<InventoryItem> inventoryItems = inventoryRepository.selectByPurchaseId(transactionId).stream()
|
| 228 |
.filter(x -> x.getSerialNumber() != null).collect(Collectors.toList());
|
228 |
.filter(x -> x.getSerialNumber() != null).collect(Collectors.toList());
|
| 229 |
Set<Integer> inventoryItemIds = inventoryItems.stream().map(x -> x.getId()).collect(Collectors.toSet());
|
229 |
Set<Integer> inventoryItemIds = inventoryItems.stream().map(x -> x.getId()).collect(Collectors.toSet());
|
| - |
|
230 |
if(inventoryItemIds.size() == 0) {
|
| - |
|
231 |
continue;
|
| - |
|
232 |
}
|
| 230 |
List<SchemeInOut> sios = schemeInOutRepository.selectByInventoryItemIds(new HashSet<>(inventoryItemIds))
|
233 |
List<SchemeInOut> sios = schemeInOutRepository.selectByInventoryItemIds(new HashSet<>(inventoryItemIds))
|
| 231 |
.stream().filter(x -> schemeIds.contains(x.getSchemeId())).collect(Collectors.toList());
|
234 |
.stream().filter(x -> schemeIds.contains(x.getSchemeId())).collect(Collectors.toList());
|
| 232 |
totalSchemeInWalletCredited += transactionsOnThatDate.get(transactionId);
|
235 |
totalSchemeInWalletCredited += transactionsOnThatDate.get(transactionId);
|
| 233 |
for (SchemeInOut sio : sios) {
|
236 |
for (SchemeInOut sio : sios) {
|
| 234 |
if (sio.getCreateTimestamp().toLocalDate().equals(localDate)) {
|
237 |
if (sio.getCreateTimestamp().toLocalDate().equals(localDate)) {
|
| Line 281... |
Line 284... |
| 281 |
|
284 |
|
| 282 |
public void reconcileExpiredFixedSchemes() throws Exception {
|
285 |
public void reconcileExpiredFixedSchemes() throws Exception {
|
| 283 |
List<Scheme> allSchemes = schemeRepository.selectAll();
|
286 |
List<Scheme> allSchemes = schemeRepository.selectAll();
|
| 284 |
// .stream().filter(x ->
|
287 |
// .stream().filter(x ->
|
| 285 |
// x.getAmountType().equals(AmountType.FIXED)).collect(Collectors.toList());
|
288 |
// x.getAmountType().equals(AmountType.FIXED)).collect(Collectors.toList());
|
| 286 |
|
- |
|
| - |
|
289 |
allSchemes = allSchemes.stream().filter(x->x.getEndDateTime().isAfter(LocalDate.of(2019, 3, 31).atStartOfDay())).collect(Collectors.toList());
|
| 287 |
System.out.println("InventoryId\tSerialNumber\tItem Id\tScheme Id\tScheme Name\tScheme Type\tAmount Type\tScheme Amount\tAmount Paid\tReference\tTransaction Time\tScheme Start\tScheme End\tScheme Expiry");
|
290 |
System.out.println("InventoryId\tSerialNumber\tItem Id\tScheme Id\tScheme Name\tScheme Type\tAmount Type\tScheme Amount\tAmount Paid\tReference\tTransaction Time\tScheme Start\tScheme End\tScheme Expiry");
|
| 288 |
for (Scheme scheme : allSchemes) {
|
291 |
for (Scheme scheme : allSchemes) {
|
| 289 |
if (scheme.getExpireTimestamp() != null) {
|
292 |
if (scheme.getExpireTimestamp() != null) {
|
| 290 |
if (scheme.getExpireTimestamp().isBefore(scheme.getEndDateTime())) {
|
293 |
if (scheme.getExpireTimestamp().isBefore(scheme.getEndDateTime())) {
|
| 291 |
List<SchemeInOut> inOuts = schemeInOutRepository
|
294 |
List<SchemeInOut> inOuts = schemeInOutRepository
|