| Line 559... |
Line 559... |
| 559 |
|
559 |
|
| 560 |
Map<Integer, Optional<NotifyOrder>> notifyOrders = notifyOrderRespository.selectByorderIds(orderIds)
|
560 |
Map<Integer, Optional<NotifyOrder>> notifyOrders = notifyOrderRespository.selectByorderIds(orderIds)
|
| 561 |
.stream().collect(Collectors.groupingBy(NotifyOrder::getOrderId,
|
561 |
.stream().collect(Collectors.groupingBy(NotifyOrder::getOrderId,
|
| 562 |
Collectors.maxBy((x1, x2) -> x1.getId() - x2.getId())));
|
562 |
Collectors.maxBy((x1, x2) -> x1.getId() - x2.getId())));
|
| 563 |
|
563 |
|
| - |
|
564 |
Map<Integer, NotifyCancel> notifyCancelOrders = notifyCancelOrderRepository.selectByOrderIds(orderIds)
|
| - |
|
565 |
.stream().collect(Collectors.toMap(x -> x.getOrderId(), x -> x));
|
| 564 |
Map<Integer, String> storeIdAndFofoIdMap = fofoStoreRepository.selectByRetailerIds(retailerIds).stream()
|
566 |
Map<Integer, String> storeIdAndFofoIdMap = fofoStoreRepository.selectByRetailerIds(retailerIds).stream()
|
| 565 |
.collect(Collectors.toMap(FofoStore::getId, FofoStore::getCode));
|
567 |
.collect(Collectors.toMap(FofoStore::getId, FofoStore::getCode));
|
| 566 |
List<com.spice.profitmandi.dao.entity.transaction.Order> pendingPaymentorder = orderRepository
|
568 |
List<com.spice.profitmandi.dao.entity.transaction.Order> pendingPaymentorder = orderRepository
|
| 567 |
.selectAllOrderDatesBetweenByStatus(LocalDateTime.now().minusDays(30), LocalDateTime.now(),
|
569 |
.selectAllOrderDatesBetweenByStatus(LocalDateTime.now().minusDays(30), LocalDateTime.now(),
|
| 568 |
OrderStatus.PAYMENT_PENDING);
|
570 |
OrderStatus.PAYMENT_PENDING);
|
| Line 573... |
Line 575... |
| 573 |
|
575 |
|
| 574 |
model.addAttribute("inProcessorder", inProcessorder);
|
576 |
model.addAttribute("inProcessorder", inProcessorder);
|
| 575 |
model.addAttribute("storeIdAndFofoIdMap", storeIdAndFofoIdMap);
|
577 |
model.addAttribute("storeIdAndFofoIdMap", storeIdAndFofoIdMap);
|
| 576 |
model.addAttribute("pendingPaymentorder", pendingPaymentorder);
|
578 |
model.addAttribute("pendingPaymentorder", pendingPaymentorder);
|
| 577 |
model.addAttribute("latestNotifyOrders", notifyOrders);
|
579 |
model.addAttribute("latestNotifyOrders", notifyOrders);
|
| - |
|
580 |
model.addAttribute("notifyCancelOrders", notifyCancelOrders);
|
| 578 |
} else {
|
581 |
} else {
|
| 579 |
model.addAttribute("inProcessorder", inProcessorder);
|
582 |
model.addAttribute("inProcessorder", inProcessorder);
|
| 580 |
}
|
583 |
}
|
| 581 |
return "review_order";
|
584 |
return "review_order";
|
| 582 |
}
|
585 |
}
|
| Line 880... |
Line 883... |
| 880 |
public String NotifyCancelOrder(HttpServletRequest request, @RequestBody NotifyOrderModel notifyOrderModel,
|
883 |
public String NotifyCancelOrder(HttpServletRequest request, @RequestBody NotifyOrderModel notifyOrderModel,
|
| 881 |
Model model) throws Exception {
|
884 |
Model model) throws Exception {
|
| 882 |
for (NotifyOrderIdModel st : notifyOrderModel.getOrderIds()) {
|
885 |
for (NotifyOrderIdModel st : notifyOrderModel.getOrderIds()) {
|
| 883 |
LOGGER.info("orderId" + st.getOrderId());
|
886 |
LOGGER.info("orderId" + st.getOrderId());
|
| 884 |
Order order = orderRepository.selectById(st.getOrderId());
|
887 |
Order order = orderRepository.selectById(st.getOrderId());
|
| - |
|
888 |
NotifyCancel nc = notifyCancelOrderRepository.selectByOrderId(st.getOrderId());
|
| - |
|
889 |
if (nc == null) {
|
| 885 |
NotifyCancel nc = new NotifyCancel();
|
890 |
nc = new NotifyCancel();
|
| 886 |
nc.setOrderId(st.getOrderId());
|
891 |
nc.setOrderId(st.getOrderId());
|
| 887 |
nc.setItemId(st.getOlditemId());
|
892 |
nc.setItemId(st.getOlditemId());
|
| 888 |
nc.setFofoId(order.getRetailerId());
|
893 |
nc.setFofoId(order.getRetailerId());
|
| - |
|
894 |
nc.setCancellation(false);
|
| 889 |
nc.setCreatedTimestamp(LocalDateTime.now());
|
895 |
nc.setCreatedTimestamp(LocalDateTime.now());
|
| - |
|
896 |
nc.setUpdatedTimestamp(LocalDateTime.now());
|
| - |
|
897 |
notifyCancelOrderRepository.persist(nc);
|
| - |
|
898 |
} else {
|
| - |
|
899 |
nc.setOrderId(st.getOrderId());
|
| - |
|
900 |
nc.setItemId(st.getOlditemId());
|
| - |
|
901 |
nc.setFofoId(order.getRetailerId());
|
| 890 |
nc.setCancellation(false);
|
902 |
nc.setCancellation(false);
|
| 891 |
nc.setUpdatedTimestamp(LocalDateTime.now());
|
903 |
nc.setUpdatedTimestamp(LocalDateTime.now());
|
| 892 |
notifyCancelOrderRepository.persist(nc);
|
904 |
notifyCancelOrderRepository.persist(nc);
|
| - |
|
905 |
}
|
| 893 |
|
906 |
|
| 894 |
SendNotificationModel sendNotificationModel = new SendNotificationModel();
|
907 |
SendNotificationModel sendNotificationModel = new SendNotificationModel();
|
| 895 |
sendNotificationModel.setCampaignName("Notify Partner");
|
908 |
sendNotificationModel.setCampaignName("Notify Partner");
|
| 896 |
sendNotificationModel.setMessage(notifyOrderModel.getMessage());
|
909 |
sendNotificationModel.setMessage(notifyOrderModel.getMessage());
|
| 897 |
sendNotificationModel.setType("url");
|
910 |
sendNotificationModel.setType("url");
|