| Line 493... |
Line 493... |
| 493 |
schemeInOut.setAmount(amountToCredit);
|
493 |
schemeInOut.setAmount(amountToCredit);
|
| 494 |
if(scheme.getType().equals(SchemeType.ACTIVATION)) {
|
494 |
if(scheme.getType().equals(SchemeType.ACTIVATION)) {
|
| 495 |
schemeInOut.setStatus(SchemePayoutStatus.PENDING);
|
495 |
schemeInOut.setStatus(SchemePayoutStatus.PENDING);
|
| 496 |
schemeInOut.setStatusDescription("Activation pending for IMEI#" + inventoryItem.getSerialNumber());
|
496 |
schemeInOut.setStatusDescription("Activation pending for IMEI#" + inventoryItem.getSerialNumber());
|
| 497 |
return 0;
|
497 |
return 0;
|
| - |
|
498 |
} else if(scheme.getType().equals(SchemeType.INVESTMENT)) {
|
| - |
|
499 |
schemeInOut.setStatus(SchemePayoutStatus.PENDING);
|
| - |
|
500 |
schemeInOut.setStatusDescription("Subject to investment days maintained");
|
| - |
|
501 |
return 0;
|
| 498 |
} else {
|
502 |
} else {
|
| 499 |
schemeInOut.setStatus(SchemePayoutStatus.CREDITED);
|
503 |
schemeInOut.setStatus(SchemePayoutStatus.CREDITED);
|
| 500 |
schemeInOut.setStatusDescription("Credited for sale of IMEI#" + inventoryItem.getSerialNumber());
|
504 |
schemeInOut.setStatusDescription("Credited for sale of IMEI#" + inventoryItem.getSerialNumber());
|
| 501 |
schemeInOut.setCreditTimestamp(LocalDateTime.now());
|
505 |
schemeInOut.setCreditTimestamp(LocalDateTime.now());
|
| 502 |
}
|
506 |
}
|
| Line 578... |
Line 582... |
| 578 |
int count = 0;
|
582 |
int count = 0;
|
| 579 |
|
583 |
|
| 580 |
List<Scheme> allActiveSchemes = schemeRepository
|
584 |
List<Scheme> allActiveSchemes = schemeRepository
|
| 581 |
.selectActiveAll(SchemeType.OUT, partnerType, fofoOrder.getCreateTimestamp(), false);
|
585 |
.selectActiveAll(SchemeType.OUT, partnerType, fofoOrder.getCreateTimestamp(), false);
|
| 582 |
allActiveSchemes.addAll(schemeRepository.selectActiveAll(SchemeType.ACTIVATION, partnerType, fofoOrder.getCreateTimestamp(), false));
|
586 |
allActiveSchemes.addAll(schemeRepository.selectActiveAll(SchemeType.ACTIVATION, partnerType, fofoOrder.getCreateTimestamp(), false));
|
| - |
|
587 |
allActiveSchemes.addAll(schemeRepository.selectActiveAll(SchemeType.INVESTMENT, partnerType, fofoOrder.getCreateTimestamp(), false));
|
| 583 |
|
588 |
|
| 584 |
for (InventoryItem inventoryItem : inventoryItems) {
|
589 |
for (InventoryItem inventoryItem : inventoryItems) {
|
| 585 |
float itemCashback = 0;
|
590 |
float itemCashback = 0;
|
| 586 |
Purchase purchase = purchaseRepository.selectByIdAndFofoId(inventoryItem.getPurchaseId(), retailerId);
|
591 |
Purchase purchase = purchaseRepository.selectByIdAndFofoId(inventoryItem.getPurchaseId(), retailerId);
|
| 587 |
Set<Integer> schemeIds = new HashSet<>(
|
592 |
Set<Integer> schemeIds = new HashSet<>(
|