| Line 629... |
Line 629... |
| 629 |
return "schemes";
|
629 |
return "schemes";
|
| 630 |
} else {
|
630 |
} else {
|
| 631 |
partnerType = partnerTypeChangeService.getTypeOnDate(loginDetails.getFofoId(), date);
|
631 |
partnerType = partnerTypeChangeService.getTypeOnDate(loginDetails.getFofoId(), date);
|
| 632 |
schemes = schemeService
|
632 |
schemes = schemeService
|
| 633 |
.selectSchemeByPartnerTypeFofoId(partnerType, date, searchModel, loginDetails.getFofoId(), offset, limit).stream()
|
633 |
.selectSchemeByPartnerTypeFofoId(partnerType, date, searchModel, loginDetails.getFofoId(), offset, limit).stream()
|
| 634 |
.filter(x -> (x.getId() != 411 && x.getId() != 612)).collect(Collectors.toList());
|
634 |
.filter(x -> (x.getId() != 411 && x.getId() != 612) || date1.isBefore(LocalDate.of(2021, 12, 1))).collect(Collectors.toList());
|
| 635 |
// Remove 411 and 612
|
635 |
// Remove 411 and 612
|
| 636 |
// this.setSchemeAmountModel(schemes);
|
636 |
// this.setSchemeAmountModel(schemes);
|
| 637 |
int nlc = this.getNlc(item, loginDetails.getFofoId(), schemes, tagListing);
|
637 |
int nlc = this.getNlc(item, loginDetails.getFofoId(), schemes, tagListing);
|
| 638 |
// For 7720(HR) remove investment
|
638 |
// For 7720(HR) remove investment
|
| 639 |
model.addAttribute("schemes", schemes);
|
639 |
model.addAttribute("schemes", schemes);
|
| Line 757... |
Line 757... |
| 757 |
}
|
757 |
}
|
| 758 |
|
758 |
|
| 759 |
}
|
759 |
}
|
| 760 |
|
760 |
|
| 761 |
private int getNlc(Item item, int fofoId, List<Scheme> schemes, TagListing tagListing) {
|
761 |
private int getNlc(Item item, int fofoId, List<Scheme> schemes, TagListing tagListing) {
|
| 762 |
if (item.getBrand().equals("Vivo") && fofoStoreRepository.getWarehousePartnerMap().get(7720).stream()
|
762 |
/*if (item.getBrand().equals("Vivo") && fofoStoreRepository.getWarehousePartnerMap().get(7720).stream()
|
| 763 |
.filter(x -> x.getId() == fofoId).count() > 0) {
|
763 |
.filter(x -> x.getId() == fofoId).count() > 0) {
|
| 764 |
schemes = schemes.stream().filter(x -> !x.getType().equals(SchemeType.INVESTMENT))
|
764 |
schemes = schemes.stream().filter(x -> !x.getType().equals(SchemeType.INVESTMENT))
|
| 765 |
.collect(Collectors.toList());
|
765 |
.collect(Collectors.toList());
|
| 766 |
}
|
766 |
}*/
|
| 767 |
float nlc = tagListing.getSellingPrice();
|
767 |
float nlc = tagListing.getSellingPrice();
|
| 768 |
for (Scheme scheme : schemes) {
|
768 |
for (Scheme scheme : schemes) {
|
| 769 |
if (scheme.getAmountType().equals(AmountType.PERCENTAGE)) {
|
769 |
if (scheme.getAmountType().equals(AmountType.PERCENTAGE)) {
|
| 770 |
if (tagListing != null) {
|
770 |
if (tagListing != null) {
|
| 771 |
float amount = tagListing.getSellingPrice() * scheme.getAmount() / 100;
|
771 |
float amount = tagListing.getSellingPrice() * scheme.getAmount() / 100;
|