Subversion Repositories SmartDukaan

Rev

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

Rev 30386 Rev 30463
Line 595... Line 595...
595
		priceCircular = priceCircular.stream().filter(Utils.distinctByKey(PriceCircularItemModel::getCatalogId)).collect(Collectors.toList());
595
		priceCircular = priceCircular.stream().filter(Utils.distinctByKey(PriceCircularItemModel::getCatalogId)).collect(Collectors.toList());
596
 
596
 
597
 
597
 
598
		for (PriceCircularItemModel pc : priceCircular) {
598
		for (PriceCircularItemModel pc : priceCircular) {
599
 
599
 
-
 
600
			if (pc.getSpecialSupport() > 0) {
-
 
601
				pc.setSpecialSupport(Math.round(schemeService.getSpecialSupportAmount(pc.getSpecialSupport(), partnerType, LocalDate.now(), pc.getCatalogId())));
-
 
602
			}
-
 
603
 
600
			Long totalScheme = pc.getBasePayout() + pc.getCashDiscount() + pc.getUpfrontMargin()
604
			Long totalScheme = pc.getBasePayout() + pc.getCashDiscount() + pc.getUpfrontMargin()
601
					+ pc.getTertiaryPayout() + pc.getHygienePayout() + pc.getCategoryPayout() + pc.getInvestmentPayout()
605
					+ pc.getTertiaryPayout() + pc.getHygienePayout() + pc.getCategoryPayout() + pc.getInvestmentPayout()
602
					+ pc.getModelSpecfic();
606
					+ pc.getSpecialSupport() + pc.getModelSpecfic();
603
			pc.setTotalScheme(totalScheme);
607
			pc.setTotalScheme(totalScheme);
604
			long netprice = pc.getSellingPrice() - pc.getTotalScheme();
608
			long netprice = pc.getSellingPrice() - pc.getTotalScheme();
605
			pc.setNetPrice(netprice);
609
			pc.setNetPrice(netprice);
606
			int mopdpdiff = pc.getMop() - pc.getSellingPrice();
610
			int mopdpdiff = pc.getMop() - pc.getSellingPrice();
607
			pc.setMopdp(mopdpdiff);
611
			pc.setMopdp(mopdpdiff);