Subversion Repositories SmartDukaan

Rev

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

Rev 31212 Rev 31213
Line 89... Line 89...
89 
		else {
 89 
		else {
90 
			hygieneData = hygieneDataRepository.selectByDisposedTimestamp();
 90 
			hygieneData = hygieneDataRepository.selectByDisposedTimestamp();
91 
		}
 91 
		}
92 
 
 92 
 
93 
		LOGGER.info("hygineeDate {}", hygieneData);
 93 
		LOGGER.info("hygineeDate {}", hygieneData);
94 
		List<Integer> orderIds = hygieneData.stream().map(x -> x.getOrderId()).collect(Collectors.toList());
 - 
 
95 
		Map<Integer, FofoOrder> fofoOrdersMap = this.getfofoOrderByOrderId(orderIds);
 - 
 
96 
		Set<Integer> fofoIds = fofoOrdersMap.values().stream().map(x -> x.getFofoId()).collect(Collectors.toSet());
 - 
 
97 
		Map<Integer, CustomerAddress> customerAddress = this.getCustomerAddressByFofoOrder(fofoOrdersMap.values());
 - 
 
98 
		Map<Integer, CustomRetailer> customRetailerMap = retailerService.getAllFofoRetailers();
 - 
 
99 
 
 - 
 
100 
		Map<Integer, CustomRetailer> partnerAddressMap = fofoIds.stream().map(x -> customRetailerMap.get(x))
 - 
 
101 
				.filter(x -> x != null).collect(Collectors.toList()).stream()
 - 
 
102 
				.collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
 - 
 
103 
 
 - 
 
104 
		List<HygieneData> filteredHygieneData = new ArrayList<>();
 - 
 
105 
		if (!hygieneData.isEmpty()) {
 94 
		if (!hygieneData.isEmpty()) {
- 
 
 95 
			List<Integer> orderIds = hygieneData.stream().map(x -> x.getOrderId()).collect(Collectors.toList());
- 
 
 96 
			Map<Integer, FofoOrder> fofoOrdersMap = this.getfofoOrderByOrderId(orderIds);
- 
 
 97 
			Set<Integer> fofoIds = fofoOrdersMap.values().stream().map(x -> x.getFofoId()).collect(Collectors.toSet());
- 
 
 98 
			Map<Integer, CustomerAddress> customerAddress = this.getCustomerAddressByFofoOrder(fofoOrdersMap.values());
- 
 
 99 
			Map<Integer, CustomRetailer> customRetailerMap = retailerService.getAllFofoRetailers();
- 
 
 100 
 
- 
 
 101 
			Map<Integer, CustomRetailer> partnerAddressMap = fofoIds.stream().map(x -> customRetailerMap.get(x))
- 
 
 102 
					.filter(x -> x != null).collect(Collectors.toList()).stream()
- 
 
 103 
					.collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
- 
 
 104 
 
- 
 
 105 
			List<HygieneData> filteredHygieneData = new ArrayList<>();
- 
 
 106 
			if (!hygieneData.isEmpty()) {
106 
			List<Integer> filteredOrderIds = fofoOrdersMap.values().stream().map(x -> x.getId())
 107 
				List<Integer> filteredOrderIds = fofoOrdersMap.values().stream().map(x -> x.getId())
107 
					.collect(Collectors.toList());
 108 
						.collect(Collectors.toList());
108 
 
 109 
 
109 
			filteredHygieneData.addAll(hygieneData.stream().filter(x -> filteredOrderIds.contains(x.getOrderId()))
 110 
				filteredHygieneData.addAll(hygieneData.stream().filter(x -> filteredOrderIds.contains(x.getOrderId()))
110 
					.collect(Collectors.toList()));
 111 
						.collect(Collectors.toList()));
- 
 
 112 
 
- 
 
 113 
			}
- 
 
 114 
			model.addAttribute("hygieneData", filteredHygieneData).addAttribute("fofoOrder", fofoOrdersMap)
- 
 
 115 
					.addAttribute("partnerAddress", partnerAddressMap).addAttribute("customerAddress", customerAddress);
111 
 
 116 
 
- 
 
 117 
		} else {
- 
 
 118 
			model.addAttribute("hygieneData", hygieneData);
112 
		}
 119 
		}
113 
 
 120 
 
114 
		model.addAttribute("hygieneData", filteredHygieneData).addAttribute("fofoOrder", fofoOrdersMap)
 - 
 
115 
				.addAttribute("partnerAddress", partnerAddressMap).addAttribute("customerAddress", customerAddress);
 - 
 
116 
 
 - 
 
117 
		return "hygiene";
 121 
		return "hygiene";
118 
	}
 122 
	}
119 
 
 123 
 
120 
	private Map<Integer, FofoOrder> getfofoOrderByOrderId(List<Integer> fofoOrderIds)
 124 
	private Map<Integer, FofoOrder> getfofoOrderByOrderId(List<Integer> fofoOrderIds)
121 
			throws ProfitMandiBusinessException {
 125 
			throws ProfitMandiBusinessException {