Subversion Repositories SmartDukaan

Rev

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

Rev 30644 Rev 30645
Line 1817... Line 1817...
1817
			List<Integer> catalogIds = schemeItemRepository.selectBySchemeIds(new HashSet<>(Arrays.asList(scheme.getId()))).stream().map(x -> x.getCatalogId()).collect(Collectors.toList());
1817
			List<Integer> catalogIds = schemeItemRepository.selectBySchemeIds(new HashSet<>(Arrays.asList(scheme.getId()))).stream().map(x -> x.getCatalogId()).collect(Collectors.toList());
1818
			if (Arrays.asList(SchemeType.SPECIAL_SUPPORT, SchemeType.ACTIVATION, SchemeType.CATEGORY, SchemeType.INVESTMENT, SchemeType.ACTIVATION, SchemeType.SPECIAL_SUPPORT).contains(scheme.getType())) {
1818
			if (Arrays.asList(SchemeType.SPECIAL_SUPPORT, SchemeType.ACTIVATION, SchemeType.CATEGORY, SchemeType.INVESTMENT, SchemeType.ACTIVATION, SchemeType.SPECIAL_SUPPORT).contains(scheme.getType())) {
1819
				List<FofoOrder> fofoOrders = fofoOrderRepository.selectOrderByModelAndSaleBetween(catalogIds, scheme.getStartDateTime(), scheme.getEndDateTime());
1819
				List<FofoOrder> fofoOrders = fofoOrderRepository.selectOrderByModelAndSaleBetween(catalogIds, scheme.getStartDateTime(), scheme.getEndDateTime());
1820
				for (FofoOrder fofoOrder : fofoOrders) {
1820
				for (FofoOrder fofoOrder : fofoOrders) {
1821
					System.out.println("Processing fofoOrder --- " + fofoOrder.getInvoiceNumber());
1821
					System.out.println("Processing fofoOrder --- " + fofoOrder.getInvoiceNumber());
-
 
1822
					System.out.println("Processing fofoOrder --- " + fofoOrder.getInvoiceNumber());
1822
					schemeService.processSchemeOut(fofoOrder.getId(), fofoOrder.getFofoId());
1823
					schemeService.processSchemeOut(fofoOrder.getId(), fofoOrder.getFofoId());
1823
				}
1824
				}
1824
			} else if (Arrays.asList(SchemeType.IN).contains(scheme.getType())) {
1825
			} else if (Arrays.asList(SchemeType.IN).contains(scheme.getType())) {
1825
				List<Purchase> purchases = purchaseRepository.selectPurchaseByCatalogsAndSaleBetween(catalogIds, scheme.getStartDateTime(), scheme.getEndDateTime());
1826
				List<Purchase> purchases = purchaseRepository.selectPurchaseByCatalogsAndSaleBetween(catalogIds, scheme.getStartDateTime(), scheme.getEndDateTime());
1826
				for (Purchase purchase : purchases) {
1827
				for (Purchase purchase : purchases) {
-
 
1828
					System.out.println("Processing purchase --- " + purchase.getPurchaseReference());
1827
					schemeService.processSchemeIn(purchase.getId(), purchase.getFofoId());
1829
					schemeService.processSchemeIn(purchase.getId(), purchase.getFofoId());
1828
				}
1830
				}
1829
 
1831
 
1830
			}
1832
			}
1831
		}
1833
		}