Subversion Repositories SmartDukaan

Rev

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

Rev 25052 Rev 25054
Line 673... Line 673...
673
					e.printStackTrace();
673
					e.printStackTrace();
674
				}
674
				}
675
			}
675
			}
676
			taxableSellingPrice = dpForCalc / (1 + totalTaxRate / 100);
676
			taxableSellingPrice = dpForCalc / (1 + totalTaxRate / 100);
677
			amount = taxableSellingPrice * scheme.getAmount() / 100;
677
			amount = taxableSellingPrice * scheme.getAmount() / 100;
678
			System.out.println(String.format("%d\t%s\t%d\t%d\t%s\t%s\t%s\t%f\t%f\t%f", inventoryItem.getId(),
678
			System.out.println(String.format("%d\t%s\t%d\t%d\t%s\t%s\t%s\t%f\t%f\t%f\t%f", inventoryItem.getId(),
679
					inventoryItem.getSerialNumber(), inventoryItem.getItemId(), scheme.getId(), scheme.getName(),
679
					inventoryItem.getSerialNumber(), inventoryItem.getItemId(), scheme.getId(), scheme.getName(),
680
					scheme.getType(), scheme.getAmountType(), dpForCalc, taxableSellingPrice, amount));
680
					scheme.getType(), scheme.getAmountType(), dpForCalc, taxableSellingPrice, scheme.getAmount(),
-
 
681
					amount));
681
		} else {
682
		} else {
682
			/*
-
 
683
			 * List<SchemeInOut> sios = schemeInOutRepository.selectByInventoryItemIds(new
-
 
684
			 * HashSet<>(Arrays.asList(inventoryItem.getId()))); List<Integer> schemeIds =
-
 
685
			 * sios.stream().filter(x->x.getSchemeType().equals(SchemeType.IN)).map(x->x.
-
 
686
			 * getSchemeId()).collect(Collectors.toList()); List<Scheme> schemes =
-
 
687
			 * schemeRepository.selectBySchemeIds(schemeIds, 0, 0); if(schemes.
-
 
688
			 */
-
 
689
			amount = scheme.getAmount();
683
			amount = scheme.getAmount();
690
			System.out.println(String.format("%d\t%s\t%d\t%d\t%s\t%s\t%s\t%f\t%f\t%f", inventoryItem.getId(),
684
			System.out.println(String.format("%d\t%s\t%d\t%d\t%s\t%s\t%s\t%f\t%f\t%f\t%f", inventoryItem.getId(),
691
					inventoryItem.getSerialNumber(), inventoryItem.getItemId(), scheme.getId(), scheme.getName(),
685
					inventoryItem.getSerialNumber(), inventoryItem.getItemId(), scheme.getId(), scheme.getName(),
692
					scheme.getType(), scheme.getAmountType(), dpForCalc, taxableSellingPrice, amount));
686
					scheme.getType(), scheme.getAmountType(), dpForCalc, taxableSellingPrice, 0, amount));
693
		}
687
		}
694
 
688
 
695
		return amount;
689
		return amount;
696
	}
690
	}
697
 
691
 
Line 712... Line 706...
712
 
706
 
713
		float totalCashback = 0;
707
		float totalCashback = 0;
714
		int count = 0;
708
		int count = 0;
715
 
709
 
716
		Set<Scheme> allFixedSchemes = schemeRepository.selectActiveAll(SchemeType.OUT, fofoOrder.getCreateTimestamp())
710
		Set<Scheme> allFixedSchemes = schemeRepository.selectActiveAll(SchemeType.OUT, fofoOrder.getCreateTimestamp())
717
				.stream().filter(scheme -> scheme.getAmountType().equals(AmountType.FIXED))
711
				.stream().filter(scheme -> scheme.getAmountType().equals(AmountType.FIXED)).collect(Collectors.toSet());
718
				.collect(Collectors.toSet());
-
 
719
 
712
 
720
		for (InventoryItem inventoryItem : inventoryItems) {
713
		for (InventoryItem inventoryItem : inventoryItems) {
721
			int itemCashback = 0;
714
			int itemCashback = 0;
722
			Purchase purchase = purchaseRepository.selectByIdAndFofoId(inventoryItem.getPurchaseId(), retailerId);
715
			Purchase purchase = purchaseRepository.selectByIdAndFofoId(inventoryItem.getPurchaseId(), retailerId);
723
			Set<Integer> schemeIds = new HashSet<>(
716
			Set<Integer> schemeIds = new HashSet<>(
724
					schemeItemRepository.selectSchemeIdByItemId(inventoryItem.getItemId()));
717
					schemeItemRepository.selectSchemeIdByItemId(inventoryItem.getItemId()));
725
			Set<Scheme> schemes = schemeRepository.selectActiveAll(SchemeType.OUT, purchase.getCompleteTimestamp())
718
			Set<Scheme> schemes = schemeRepository.selectActiveAll(SchemeType.OUT, purchase.getCompleteTimestamp())
726
					.stream().filter(x->x.getAmountType().equals(AmountType.PERCENTAGE)).collect(Collectors.toSet());
719
					.stream().filter(x -> x.getAmountType().equals(AmountType.PERCENTAGE)).collect(Collectors.toSet());
727
			schemes.addAll(allFixedSchemes);
720
			schemes.addAll(allFixedSchemes);
728
			schemes = schemes.stream()
-
 
729
				.filter(x -> schemeIds.contains(x.getId()))
721
			schemes = schemes.stream().filter(x -> schemeIds.contains(x.getId())).collect(Collectors.toSet());
730
				.collect(Collectors.toSet());
-
 
731
			for (Scheme scheme : schemes) {
722
			for (Scheme scheme : schemes) {
732
				itemCashback += this.createSchemeInOut(scheme, inventoryItem);
723
				itemCashback += this.createSchemeInOut(scheme, inventoryItem);
733
			}
724
			}
734
			if (itemCashback > 0) {
725
			if (itemCashback > 0) {
735
				count++;
726
				count++;