| Line 70... |
Line 70... |
| 70 |
import java.io.ByteArrayInputStream;
|
70 |
import java.io.ByteArrayInputStream;
|
| 71 |
import java.io.ByteArrayOutputStream;
|
71 |
import java.io.ByteArrayOutputStream;
|
| 72 |
import java.io.IOException;
|
72 |
import java.io.IOException;
|
| 73 |
import java.io.InputStream;
|
73 |
import java.io.InputStream;
|
| 74 |
import java.nio.charset.StandardCharsets;
|
74 |
import java.nio.charset.StandardCharsets;
|
| - |
|
75 |
import java.time.LocalDate;
|
| 75 |
import java.time.LocalDateTime;
|
76 |
import java.time.LocalDateTime;
|
| 76 |
import java.time.format.DateTimeFormatter;
|
77 |
import java.time.format.DateTimeFormatter;
|
| 77 |
import java.time.temporal.ChronoUnit;
|
78 |
import java.time.temporal.ChronoUnit;
|
| 78 |
import java.util.*;
|
79 |
import java.util.*;
|
| 79 |
import java.util.stream.Collectors;
|
80 |
import java.util.stream.Collectors;
|
| Line 1156... |
Line 1157... |
| 1156 |
model.addAttribute("pendingOrderItem", pendingOrderItem);
|
1157 |
model.addAttribute("pendingOrderItem", pendingOrderItem);
|
| 1157 |
return "cancel-pending-order";
|
1158 |
return "cancel-pending-order";
|
| 1158 |
}
|
1159 |
}
|
| 1159 |
|
1160 |
|
| 1160 |
@RequestMapping(value = "/getPendingOrderChangePartnerById", method = RequestMethod.GET)
|
1161 |
@RequestMapping(value = "/getPendingOrderChangePartnerById", method = RequestMethod.GET)
|
| 1161 |
public String getPendingOrderChangePartnerById(HttpServletRequest request, @RequestParam int id, Model model)
|
1162 |
public String getPendingOrderChangePartnerById(HttpServletRequest request, @RequestParam int id, @RequestParam String pinCode, Model model)
|
| 1162 |
throws Exception {
|
1163 |
throws Exception {
|
| 1163 |
|
1164 |
|
| 1164 |
PendingOrder pendingOrder = pendingOrderRepository.selectById(id);
|
1165 |
PendingOrder pendingOrder = pendingOrderRepository.selectById(id);
|
| 1165 |
Map<Integer, CustomRetailer> customRetailersMap = retailerService.getFofoRetailers(true);
|
1166 |
Map<Integer, CustomRetailer> customRetailersMap = retailerService.getFofoRetailers(true, pinCode);
|
| 1166 |
model.addAttribute("customRetailersMap", customRetailersMap);
|
1167 |
model.addAttribute("customRetailersMap", customRetailersMap);
|
| 1167 |
model.addAttribute("pendingOrder", pendingOrder);
|
1168 |
model.addAttribute("pendingOrder", pendingOrder);
|
| 1168 |
return "change-partner-po";
|
1169 |
return "change-partner-po";
|
| 1169 |
}
|
1170 |
}
|
| 1170 |
|
1171 |
|
| Line 1351... |
Line 1352... |
| 1351 |
LOGGER.info("startTime {}", startTime);
|
1352 |
LOGGER.info("startTime {}", startTime);
|
| 1352 |
LOGGER.info("endTime {}", endTime);
|
1353 |
LOGGER.info("endTime {}", endTime);
|
| 1353 |
|
1354 |
|
| 1354 |
List<PendingOrderItem> pendingOrderItems;
|
1355 |
List<PendingOrderItem> pendingOrderItems;
|
| 1355 |
if (startTime == null) {
|
1356 |
if (startTime == null) {
|
| - |
|
1357 |
LocalDate date = LocalDate.now().minusDays(15);
|
| - |
|
1358 |
if (status.equals(OrderStatus.PENDING)) {
|
| - |
|
1359 |
pendingOrderItems = pendingOrderItemRepository.selectByStatusAndCreateTimestamp(Collections.singletonList(status), date.atStartOfDay(), LocalDateTime.now());
|
| - |
|
1360 |
} else {
|
| 1356 |
pendingOrderItems = pendingOrderItemRepository.selectOrderItemByStatus(status);
|
1361 |
pendingOrderItems = pendingOrderItemRepository.selectOrderItemByStatus(status);
|
| - |
|
1362 |
}
|
| - |
|
1363 |
|
| 1357 |
} else {
|
1364 |
} else {
|
| 1358 |
List<OrderStatus> statusList = new ArrayList<>();
|
1365 |
List<OrderStatus> statusList = new ArrayList<>();
|
| 1359 |
if (status.equals(OrderStatus.DELIVERED)) {
|
1366 |
if (status.equals(OrderStatus.DELIVERED)) {
|
| 1360 |
statusList.add(OrderStatus.SETTLED);
|
1367 |
statusList.add(OrderStatus.SETTLED);
|
| 1361 |
statusList.add(OrderStatus.UNSETTLED);
|
1368 |
statusList.add(OrderStatus.UNSETTLED);
|