Subversion Repositories SmartDukaan

Rev

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

Rev 30651 Rev 30655
Line 574... Line 574...
574 
		} else if (!isAdmin) {
 574 
		} else if (!isAdmin) {
575 
			date = LocalDate.now();
 575 
			date = LocalDate.now();
576 
		}
 576 
		}
577 
 
 577 
 
578 
		List<Scheme> schemes = null;
 578 
		List<Scheme> schemes = null;
579 
		List<SchemeInOut> schemeInOut = null;
 579 
		List<SchemeInOut> schemeInOuts = null;
580 
 
 580 
 
581 
		boolean fullAccess = this.getAccess(loginDetails.getEmailId());
 581 
		boolean fullAccess = this.getAccess(loginDetails.getEmailId());
582 
 
 582 
 
583 
		model.addAttribute("fullAccess", fullAccess);
 583 
		model.addAttribute("fullAccess", fullAccess);
584 
		model.addAttribute("searchImei", searchImei);
 584 
		model.addAttribute("searchImei", searchImei);
Line 668... Line 668...
668 
				//Offer payout
 668 
				//Offer payout
669 
				List<OfferPayout> offerPayouts = offerPayoutRepository.selectAllBySerialNumber(loginDetails.getFofoId(), searchImei);
 669 
				List<OfferPayout> offerPayouts = offerPayoutRepository.selectAllBySerialNumber(loginDetails.getFofoId(), searchImei);
670 
				Map<Integer, CreateOfferRequest> offerRequestMap = offerPayouts.stream().map(x -> offerService.getOffer(loginDetails.getFofoId(), (int) x.getOfferId())).collect(Collectors.toMap(x -> x.getId(), x -> x));
 670 
				Map<Integer, CreateOfferRequest> offerRequestMap = offerPayouts.stream().map(x -> offerService.getOffer(loginDetails.getFofoId(), (int) x.getOfferId())).collect(Collectors.toMap(x -> x.getId(), x -> x));
671 
 
 671 
 
672 
 
 672 
 
673 
				schemeInOut = schemeInOutRepository.selectByInventoryItemIds(new HashSet<>(Arrays.asList(inventoryItem.getId())));
 673 
				schemeInOuts = schemeInOutRepository.selectByInventoryItemIds(new HashSet<>(Arrays.asList(inventoryItem.getId())));
674 
 
 674 
 
675 
				if (!schemeInOut.isEmpty()) {
 675 
				if (!schemeInOuts.isEmpty()) {
- 
 
 676 
					netEarnings += schemeInOuts.stream().filter(x -> x.getStatus().equals(SchemePayoutStatus.CREDITED)).collect(Collectors.summingDouble(x -> x.getAmount()));
676 
					List<Integer> schemeIds = schemeInOut.stream().map(x -> x.getSchemeId()).collect(Collectors.toList());
 677 
					List<Integer> schemeIds = schemeInOuts.stream().map(x -> x.getSchemeId()).collect(Collectors.toList());
677 
 
 678 
 
678 
					schemes = schemeRepository.selectBySchemeIds(schemeIds);
 679 
					schemes = schemeRepository.selectBySchemeIds(schemeIds);
679 
					for (Scheme scheme : schemes) {
 680 
					for (Scheme scheme : schemes) {
680 
						if (scheme.getAmountType().equals(AmountType.PERCENTAGE)) {
 681 
						if (scheme.getAmountType().equals(AmountType.PERCENTAGE)) {
681 
							scheme.setAmountModel(scheme.getAmount() + "%");
 682 
							scheme.setAmountModel(scheme.getAmount() + "%");
Line 695... Line 696...
695 
						PriceDrop pd = priceDropRepository.selectById(priceDropId);
 696 
						PriceDrop pd = priceDropRepository.selectById(priceDropId);
696 
						priceDropIMEI.setPriceDrop(pd);
 697 
						priceDropIMEI.setPriceDrop(pd);
697 
					}
 698 
					}
698 
					model.addAttribute("priceDropImeis", priceDropImeis);
 699 
					model.addAttribute("priceDropImeis", priceDropImeis);
699 
				}
 700 
				}
- 
 
 701 
				netEarnings += offerPayouts.stream().collect(Collectors.summingDouble(x -> x.getAmount()));
700 
				model.addAttribute("offerPayouts", offerPayouts);
 702 
				model.addAttribute("offerPayouts", offerPayouts);
701 
				model.addAttribute("offerRequestMap", offerRequestMap);
 703 
				model.addAttribute("offerRequestMap", offerRequestMap);
702 
				model.addAttribute("inventoryItem", inventoryItem);
 704 
				model.addAttribute("inventoryItem", inventoryItem);
703 
				model.addAttribute("inventoryItem", inventoryItem);
 705 
				model.addAttribute("inventoryItem", inventoryItem);
704 
 
 706 
 
705 
			}
 707 
			}
706 
			model.addAttribute("netEarnings", netEarnings);
 708 
			model.addAttribute("netEarnings", netEarnings);
707 
			model.addAttribute("fofoId", loginDetails.getFofoId());
 709 
			model.addAttribute("fofoId", loginDetails.getFofoId());
708 
			model.addAttribute("schemeMap", schemeMap);
 710 
			model.addAttribute("schemeMap", schemeMap);
709 
			model.addAttribute("item", item);
 711 
			model.addAttribute("item", item);
710 
			model.addAttribute("schemeInOut", schemeInOut);
 712 
			model.addAttribute("schemeInOut", schemeInOuts);
711 
			return "schemes-partner";
 713 
			return "schemes-partner";
712 
		}
 714 
		}
713 
 
 715 
 
714 
		if (isAdmin) {
 716 
		if (isAdmin) {
715 
			schemes = schemeRepository.selectAll(0, 30);
 717 
			schemes = schemeRepository.selectAll(0, 30);