Subversion Repositories SmartDukaan

Rev

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

Rev 30642 Rev 30643
Line 1816... Line 1816...
1816
		for (Scheme scheme : schemes) {
1816
		for (Scheme scheme : schemes) {
1817
			if (Arrays.asList(SchemeType.SPECIAL_SUPPORT, SchemeType.ACTIVATION, SchemeType.CATEGORY, SchemeType.INVESTMENT, SchemeType.ACTIVATION, SchemeType.SPECIAL_SUPPORT).contains(scheme.getType())) {
1817
			if (Arrays.asList(SchemeType.SPECIAL_SUPPORT, SchemeType.ACTIVATION, SchemeType.CATEGORY, SchemeType.INVESTMENT, SchemeType.ACTIVATION, SchemeType.SPECIAL_SUPPORT).contains(scheme.getType())) {
1818
				List<Integer> catalogIds = schemeItemRepository.selectBySchemeIds(new HashSet<>(Arrays.asList(scheme.getId()))).stream().map(x -> x.getCatalogId()).collect(Collectors.toList());
1818
				List<Integer> catalogIds = schemeItemRepository.selectBySchemeIds(new HashSet<>(Arrays.asList(scheme.getId()))).stream().map(x -> x.getCatalogId()).collect(Collectors.toList());
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
					schemeService.processSchemeOut(fofoOrder.getId(), fofoOrder.getFofoId());
1822
					schemeService.processSchemeOut(fofoOrder.getId(), fofoOrder.getFofoId());
1822
				}
1823
				}
1823
			}
1824
			}
1824
			/*else if (Arrays.asList(SchemeType.IN).contains(scheme.getType())) {
1825
			/*else if (Arrays.asList(SchemeType.IN).contains(scheme.getType())) {
1825
				List<FofoOrder> fofoOrders = fofoOrderRepository.selectOrderByModelAndSaleBetween(catalogIds, scheme.getStartDateTime(), scheme.getEndDateTime());
1826
				List<FofoOrder> fofoOrders = fofoOrderRepository.selectOrderByModelAndSaleBetween(catalogIds, scheme.getStartDateTime(), scheme.getEndDateTime());