Subversion Repositories SmartDukaan

Rev

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

Rev 31300 Rev 31301
Line 2223... Line 2223...
2223
		}
2223
		}
2224
 
2224
 
2225
		model.addAttribute("yearMonth", list);
2225
		model.addAttribute("yearMonth", list);
2226
 
2226
 
2227
		List<PartnerMonthlySaleModel> partnerMonthlySaleModels = fofoOrderItemRepository
2227
		List<PartnerMonthlySaleModel> partnerMonthlySaleModels = fofoOrderItemRepository
2228
				.selectPartnerMonthlySale(fofoIds, LocalDateTime.now().minusMonths(12));
2228
				.selectPartnerMonthlySale(fofoIds, LocalDateTime.now().minusMonths(12).withDayOfMonth(1));
2229
		DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("MM-yyyy");
2229
		DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("MM-yyyy");
2230
		Map<Integer, Map<YearMonth, Double>> partnerMonthSaleMap = new HashMap<>();
2230
		Map<Integer, Map<YearMonth, Double>> partnerMonthSaleMap = new HashMap<>();
2231
		if (!partnerMonthlySaleModels.isEmpty()) {
2231
		if (!partnerMonthlySaleModels.isEmpty()) {
2232
 
2232
 
2233
			partnerMonthSaleMap = partnerMonthlySaleModels.stream()
2233
			partnerMonthSaleMap = partnerMonthlySaleModels.stream()
Line 2263... Line 2263...
2263
 
2263
 
2264
		orderStatus.add(SUBMITTED_FOR_PROCESSING);
2264
		orderStatus.add(SUBMITTED_FOR_PROCESSING);
2265
		orderStatus.add(BILLED);
2265
		orderStatus.add(BILLED);
2266
		orderStatus.add(SHIPPED_FROM_WH);
2266
		orderStatus.add(SHIPPED_FROM_WH);
2267
		orderStatus.add(DELIVERY_SUCCESS);
2267
		orderStatus.add(DELIVERY_SUCCESS);
2268
		List<Order> orders = orderRepository.selectOrders(fofoIds, orderStatus, LocalDateTime.now().minusMonths(12));
2268
		List<Order> orders = orderRepository.selectOrders(fofoIds, orderStatus,
-
 
2269
				LocalDateTime.now().minusMonths(12).withDayOfMonth(1), LocalDateTime.now().plusDays(1));
2269
 
2270
 
2270
		Map<Integer, Map<YearMonth, Double>> partnerMonthPurchaseMap = orders.stream()
2271
		Map<Integer, Map<YearMonth, Double>> partnerMonthPurchaseMap = orders.stream()
2271
				.collect(Collectors.groupingBy(x -> x.getRetailerId(),
2272
				.collect(Collectors.groupingBy(x -> x.getRetailerId(),
2272
						Collectors.groupingBy(x -> YearMonth.from(x.getCreateTimestamp()),
2273
						Collectors.groupingBy(x -> YearMonth.from(x.getCreateTimestamp()),
2273
								Collectors.summingDouble(x -> x.getTotalAmount()))));
2274
								Collectors.summingDouble(x -> x.getTotalAmount()))));