| Line 86... |
Line 86... |
| 86 |
|
86 |
|
| 87 |
List<Integer> orderIds = hygieneData.stream().map(x -> x.getOrderId()).collect(Collectors.toList());
|
87 |
List<Integer> orderIds = hygieneData.stream().map(x -> x.getOrderId()).collect(Collectors.toList());
|
| 88 |
Map<Integer, FofoOrder> fofoOrdersMap = this.getfofoOrderByOrderId(orderIds);
|
88 |
Map<Integer, FofoOrder> fofoOrdersMap = this.getfofoOrderByOrderId(orderIds);
|
| 89 |
Set<Integer> fofoIds = fofoOrdersMap.values().stream().map(x -> x.getFofoId()).collect(Collectors.toSet());
|
89 |
Set<Integer> fofoIds = fofoOrdersMap.values().stream().map(x -> x.getFofoId()).collect(Collectors.toSet());
|
| 90 |
Map<Integer, CustomerAddress> customerAddress = this.getCustomerAddressByFofoOrder(fofoOrdersMap.values());
|
90 |
Map<Integer, CustomerAddress> customerAddress = this.getCustomerAddressByFofoOrder(fofoOrdersMap.values());
|
| - |
|
91 |
Map<Integer, CustomRetailer> customRetailerMap = retailerService.getAllFofoRetailers();
|
| 91 |
|
92 |
|
| 92 |
Map<Integer, CustomRetailer> partnerAddressMap = retailerService
|
93 |
Map<Integer, CustomRetailer> partnerAddressMap = fofoIds.stream().map(x -> customRetailerMap.get(x))
|
| - |
|
94 |
.filter(x -> x != null).collect(Collectors.toList()).stream()
|
| 93 |
.getFofoRetailers(new ArrayList<Integer>(fofoIds));
|
95 |
.collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
|
| 94 |
|
96 |
|
| 95 |
model.addAttribute("hygieneData", hygieneData).addAttribute("fofoOrder", fofoOrdersMap)
|
97 |
model.addAttribute("hygieneData", hygieneData).addAttribute("fofoOrder", fofoOrdersMap)
|
| 96 |
.addAttribute("partnerAddress", partnerAddressMap).addAttribute("customerAddress", customerAddress);
|
98 |
.addAttribute("partnerAddress", partnerAddressMap).addAttribute("customerAddress", customerAddress);
|
| 97 |
|
99 |
|
| 98 |
return "hygiene";
|
100 |
return "hygiene";
|
| Line 199... |
Line 201... |
| 199 |
throws Exception {
|
201 |
throws Exception {
|
| 200 |
HygieneData hygieneData = hygieneDataRepository.selectById(hygieneDataModel.getOrderId());
|
202 |
HygieneData hygieneData = hygieneDataRepository.selectById(hygieneDataModel.getOrderId());
|
| 201 |
FofoOrder fofoOrder = fofoOrderRepository.selectByOrderId(hygieneDataModel.getOrderId());
|
203 |
FofoOrder fofoOrder = fofoOrderRepository.selectByOrderId(hygieneDataModel.getOrderId());
|
| 202 |
LocalDateTime hygieneDateTime = hygieneData.getCreatedTimestamp().toLocalDate().atStartOfDay();
|
204 |
LocalDateTime hygieneDateTime = hygieneData.getCreatedTimestamp().toLocalDate().atStartOfDay();
|
| 203 |
CustomerAddress customerAddress = customerAddressRepository.selectById(fofoOrder.getCustomerAddressId());
|
205 |
CustomerAddress customerAddress = customerAddressRepository.selectById(fofoOrder.getCustomerAddressId());
|
| 204 |
List<CustomerAddress> customerAddresses = customerAddressRepository.selectByMobileNumber(customerAddress.getPhoneNumber());
|
206 |
List<CustomerAddress> customerAddresses = customerAddressRepository
|
| - |
|
207 |
.selectByMobileNumber(customerAddress.getPhoneNumber());
|
| 205 |
LOGGER.info("Fofo id {}, Date Range = {}, Customer Address Ids {}", fofoOrder.getFofoId(), DateRangeModel.of(hygieneDateTime, hygieneDateTime.plusDays(1)),
|
208 |
LOGGER.info("Fofo id {}, Date Range = {}, Customer Address Ids {}", fofoOrder.getFofoId(),
|
| - |
|
209 |
DateRangeModel.of(hygieneDateTime, hygieneDateTime.plusDays(1)),
|
| 206 |
customerAddresses.stream().map(x->x.getId()).collect(Collectors.toList()));
|
210 |
customerAddresses.stream().map(x -> x.getId()).collect(Collectors.toList()));
|
| 207 |
List<FofoOrder> fofoOrders = fofoOrderRepository.selectByCustomerAddressIds(fofoOrder.getFofoId(), DateRangeModel.of(hygieneDateTime, hygieneDateTime.plusDays(1)),
|
211 |
List<FofoOrder> fofoOrders = fofoOrderRepository.selectByCustomerAddressIds(fofoOrder.getFofoId(),
|
| - |
|
212 |
DateRangeModel.of(hygieneDateTime, hygieneDateTime.plusDays(1)),
|
| 208 |
customerAddresses.stream().map(x->x.getId()).collect(Collectors.toList()));
|
213 |
customerAddresses.stream().map(x -> x.getId()).collect(Collectors.toList()));
|
| 209 |
LOGGER.info("Order Size - {}", fofoOrders.size());
|
214 |
LOGGER.info("Order Size - {}", fofoOrders.size());
|
| 210 |
for(FofoOrder fo : fofoOrders) {
|
215 |
for (FofoOrder fo : fofoOrders) {
|
| 211 |
LOGGER.info("Order Id - {}", fo.getId());
|
216 |
LOGGER.info("Order Id - {}", fo.getId());
|
| 212 |
hygieneData = hygieneDataRepository.selectById(fo.getId());
|
217 |
hygieneData = hygieneDataRepository.selectById(fo.getId());
|
| 213 |
if(hygieneData==null) continue;
|
218 |
if (hygieneData == null)
|
| - |
|
219 |
continue;
|
| 214 |
if (hygieneDataModel.getScheduleTime() != null) {
|
220 |
if (hygieneDataModel.getScheduleTime() != null) {
|
| 215 |
hygieneData.setStatus(hygieneDataModel.getStatus());
|
221 |
hygieneData.setStatus(hygieneDataModel.getStatus());
|
| 216 |
hygieneData.setRemark(hygieneDataModel.getRemark());
|
222 |
hygieneData.setRemark(hygieneDataModel.getRemark());
|
| 217 |
hygieneData.setHygieneRating(hygieneDataModel.getHygieneRating());
|
223 |
hygieneData.setHygieneRating(hygieneDataModel.getHygieneRating());
|
| 218 |
hygieneData.setNextTimestamp(hygieneDataModel.getScheduleTime());
|
224 |
hygieneData.setNextTimestamp(hygieneDataModel.getScheduleTime());
|