WebSVN – SmartDukaan – Diff – /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/UpSaleController.java

 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
+import java.time.Instant;
+import java.time.LocalDateTime;
-import java.time.*;
+import java.time.ZoneId;
 import java.util.*;
 import java.util.stream.Collectors;
 @Controller
     public String fetchMobileNumberForUpSale(HttpServletRequest request, Model model) throws Exception {
         LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
         AuthUser user = authRepository.selectByEmailOrMobile(loginDetails.getEmailId());
         Map<String, Set<Integer>> pp = csService.getAuthUserPartnerIdMappingByCategoryIds(Arrays.asList(ProfitMandiConstants.UPSELLING), true);
-        LOGGER.info("pp pp - {}", pp);
         Set<Integer> fofoIds = new HashSet<>(pp.get(user.getEmailId()));
-        LOGGER.info("fofoIds- {}", fofoIds);
-        LocalDate currentYearJune21 = LocalDate.of(LocalDate.now().getYear(), Month.JUNE, 21);
-        LocalDateTime startDate = currentYearJune21.atStartOfDay();
         LocalDateTime endDate = LocalDateTime.now();
         List<UpSaleAgentCollection> upSaleAgentCollections = upSaleAgentCollectionRepository.selectByAgentId(user.getId());
         double totalProductSaleAmount = upSaleAgentCollections.stream()
                     FofoOrder fofoOrder = fofoOrderRepository.selectByOrderId(upSaleCall.getOriginalOrderId());
                     Customer customer = customerRepository.selectById(fofoOrder.getCustomerId());
                     if (fofoIds.contains(fofoOrder.getFofoId())) {
                         if (customer != null) {
-                            String mobile = customer.getMobileNumber();
-                            // Update the UpSaleCall status to FETCHED and set reschedule time to null
                             upSaleCall.setStatus(UpSaleCallStatus.FETCHED);
                             upSaleCall.setRescheduledTimestamp(null);
                             LOGGER.info("Processing Rescheduled UpSaleCall {}", upSaleCall);
                             Set<Integer> fofoOrderItemIds = fofoOrderItems.stream().map(FofoOrderItem::getId).collect(Collectors.toSet());
                             List<FofoLineItem> fofoLineItems = fofoLineItemRepository.selectByFofoOrderItemIds(fofoOrderItemIds);
                             Map<Integer, List<FofoLineItem>> fofoLineItemMap = fofoLineItems.stream()
                                     .collect(Collectors.groupingBy(FofoLineItem::getFofoOrderItemId));
-                            LOGGER.info("fofoLineItemMap {}", fofoLineItemMap);
                             List<UpSaleCallStatus> upSaleCallStatuses = new ArrayList<>(Arrays.asList(UpSaleCallStatus.values()));
-                            LOGGER.info("upSaleCallStatuses {}", upSaleCallStatuses);
                             model.addAttribute("upSaleCallStatuses", upSaleCallStatuses);
                             model.addAttribute("fofoOrder", fofoOrder);
                             model.addAttribute("customer", customer);
                             model.addAttribute("itemDetails", itemDetails);
+                    }
+                }
+            }
         } catch (Exception e) {
             // If no rescheduled calls found, fall back to original logic
-            List<UpSaleOrder> upSaleOrders = upSaleOrderRepository.selectAllBetweenDates(startDate, endDate);
+            UpSaleOrder last48hourLatestOrder = this.getOldestUpSaleOrderFromLast48Hours(fofoIds);
+            last48hourLatestOrder.setFetched(true);
-            for (UpSaleOrder upSaleOrder : upSaleOrders) {
+            LOGGER.info("last48hourLatestOrder {}", last48hourLatestOrder);
-                boolean exists = upSaleCallRepository.existsOrderId(upSaleOrder.getOrderId());
+            boolean exists = upSaleCallRepository.existsOrderId(last48hourLatestOrder.getOrderId());
                 if (!exists) {
-                    FofoOrder fofoOrder = fofoOrderRepository.selectByOrderId(upSaleOrder.getOrderId());
+                    FofoOrder fofoOrder = fofoOrderRepository.selectByOrderId(last48hourLatestOrder.getOrderId());
                     if (fofoIds.contains(fofoOrder.getFofoId())) {
                         Customer customer = customerRepository.selectById(fofoOrder.getCustomerId());
                         if (customer != null) {
                             String mobile = customer.getMobileNumber();
-                            boolean mobileExists = upSaleCallRepository.existsByMobileAndOrderId(mobile, fofoOrder.getId());
-                            if (!mobileExists) {
                                 UpSaleCall upSaleCall = new UpSaleCall();
                                 upSaleCall.setAgentId(user.getId());
                                 upSaleCall.setMobile(mobile);
                                 upSaleCall.setOriginalOrderId(fofoOrder.getId());
                                 upSaleCall.setStatus(UpSaleCallStatus.FETCHED);
                                 upSaleCall.setCreatedTimestamp(LocalDateTime.now());
                                 upSaleCallRepository.persist(upSaleCall);
-                                LOGGER.info("Processing UpSaleOrder {}", upSaleOrder);
+                            LOGGER.info("Processing UpSaleOrder {}", last48hourLatestOrder);
                                 List<Map<String, Object>> itemDetails = new ArrayList<>();
                                 List<FofoOrderItem> fofoOrderItems = fofoOrderItemRepository.selectByOrderId(fofoOrder.getId());
                                 for (FofoOrderItem fofoOrderItem : fofoOrderItems) {
                                 Set<Integer> fofoOrderItemIds = fofoOrderItems.stream().map(FofoOrderItem::getId).collect(Collectors.toSet());
                                 List<FofoLineItem> fofoLineItems = fofoLineItemRepository.selectByFofoOrderItemIds(fofoOrderItemIds);
                                 Map<Integer, List<FofoLineItem>> fofoLineItemMap = fofoLineItems.stream()
                                         .collect(Collectors.groupingBy(FofoLineItem::getFofoOrderItemId));
-                                LOGGER.info("fofoLineItemMap {}", fofoLineItemMap);
                                 List<UpSaleCallStatus> upSaleCallStatuses = new ArrayList<>(Arrays.asList(UpSaleCallStatus.values()));
-                                LOGGER.info("upSaleCallStatuses {}", upSaleCallStatuses);
                                 model.addAttribute("upSaleCallStatuses", upSaleCallStatuses);
                                 model.addAttribute("fofoOrder", fofoOrder);
                                 model.addAttribute("customer", customer);
                                 model.addAttribute("itemDetails", itemDetails);
                                 model.addAttribute("stateNames",
                                         stateRepository.selectAll().stream().map(State::getName).collect(Collectors.toList()));
                                 model.addAttribute("totalProductSaleAmount", totalProductSaleAmount);
                                 return "up-sale-call";
-                            }
+                        }
+                    }
+                }
-            }
+        }
         LOGGER.info("No valid UpSaleOrder found for up-sale call.");
         model.addAttribute("totalProductSaleAmount", totalProductSaleAmount);
         model.addAttribute("message", "No valid UpSaleOrder found.");
         return "up-sale-call";
+    }
+    UpSaleOrder getOldestUpSaleOrderFromLast48Hours(Set<Integer> fofoIds) {
+        LocalDateTime startDateTime = LocalDateTime.now().minusDays(2); // 48 hours ago
+        return upSaleOrderRepository.findOldestUpSaleOrderByFofoIdsLast48Hours(fofoIds, startDateTime);
+    }
     @RequestMapping(value = "/generatePaymentLink", method = RequestMethod.POST)
     public ResponseEntity<String> generatePaymentLink(HttpServletRequest request, Model model, @RequestBody PaymentLinkDetailModel paymentLinkDetailModel) {
         double amount;
         LOGGER.info("paymnetlinkmodel {}", paymentLinkDetailModel);
         try {

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/UpSaleController.java – Rev 33717 → 33719