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

 import com.spice.profitmandi.dao.entity.logistics.ProviderDetails;
 import com.spice.profitmandi.dao.entity.logistics.ProviderTat;
 import com.spice.profitmandi.dao.entity.logistics.PublicHolidays;
 import com.spice.profitmandi.dao.entity.transaction.Order;
 import com.spice.profitmandi.dao.entity.user.Address;
+import com.spice.profitmandi.dao.enumuration.cs.EscalationType;
 import com.spice.profitmandi.dao.model.*;
 import com.spice.profitmandi.dao.repository.auth.AuthRepository;
 import com.spice.profitmandi.dao.repository.cs.CsService;
 import com.spice.profitmandi.dao.repository.cs.PositionRepository;
 import com.spice.profitmandi.dao.repository.dtr.UserAccountRepository;
         Map<Integer, List<Order>> existingProviderOrderMap = ordersByWaybill.stream().collect(Collectors.groupingBy(x -> x.getLogisticsProviderId()));
         for (Entry<Integer, List<Order>> existingProviderEntrySet : existingProviderOrderMap.entrySet()) {
             String providerName = providerMap.get(existingProviderEntrySet.getKey());
             LOGGER.info("Provider Name - {}", providerName);
             Set<String> wayBillNumbers = providerWayBillNumberMap.get(providerName);
-            if(wayBillNumbers==null) continue;
+            if (wayBillNumbers == null) continue;
             for (Order order : ordersByWaybill) {
                 if (wayBillNumbers.contains(order.getAirwayBillNumber())) {
                     String errorMessage = "Provider " + providerName + ", wayBillNumber " + order.getAirwayBillNumber() + " already exists";
                     throw new ProfitMandiBusinessException(errorMessage, errorMessage, errorMessage);
+                }
         AuthUser authUser = authRepository.selectByEmailOrMobile(email);
         List<Position> positions = positionRepository.selectAll(authUser.getId());
         List<Position> warehousePositions = positions.stream().filter(x -> x.getCategoryId() == ProfitMandiConstants.TICKET_CATEGORY_WAREHOUSE).collect(Collectors.toList());
+        List<Integer> authWarehouseIds = null;
+        if (warehousePositions.stream().filter(x -> EscalationType.L2.isGreaterThanEqualTo(x.getEscalationType())).count() > 0) {
+            authWarehouseIds = new ArrayList<>(ProfitMandiConstants.WAREHOUSE_MAP.keySet());
+        } else {
-        Set<CustomRetailer> positionRetailers = new HashSet<>();
+            Set<CustomRetailer> positionRetailers = new HashSet<>();
-        csService.getPositionCustomRetailerMap(warehousePositions).values().forEach(customRetailers -> {
+            csService.getPositionCustomRetailerMap(warehousePositions).values().forEach(customRetailers -> {
-            positionRetailers.addAll(customRetailers);
+                positionRetailers.addAll(customRetailers);
-        });
+            });
+            LOGGER.info("positionRetailers" + positionRetailers);
+            List<Integer> fofoIds = new ArrayList<>();
+            if (!positionRetailers.isEmpty()) {
+                fofoIds.addAll(positionRetailers.stream().map(x -> x.getPartnerId()).collect(Collectors.toList()));
-        LOGGER.info("positionRetailers" + positionRetailers);
-        List<Integer> fofoIds = new ArrayList<>();
-        List<Integer> warehouseIds = new ArrayList<>();
-        if (!positionRetailers.isEmpty()) {
-            fofoIds.addAll(positionRetailers.stream().map(x -> x.getPartnerId()).collect(Collectors.toList()));
-            warehouseIds = this.getWarehouses(positionRetailers).entrySet().stream().map(x -> x.getKey()).collect(Collectors.toList());
+                authWarehouseIds = this.getWarehouses(positionRetailers).entrySet().stream().map(x -> x.getKey()).collect(Collectors.toList());
+            }
+        }
-        LOGGER.info("fofoIds" + fofoIds);
-        LOGGER.info("warehouseIds" + warehouseIds);
         Map<String, DispatchNotificationModel> dispatchNotication = new HashMap<>();
         if (!billedOrderListModels.isEmpty()) {
             List<Order> ords = orderRepository.selectByInvoiceNumbers(
                     billedOrderListModels.stream().map(x -> x.getInvoiceNumber()).collect(Collectors.toList()));
             List<Integer> shippingWarehouseIds = ords.stream().map(x -> x.getWarehouseId()).collect(Collectors.toList());
-            if (!warehouseIds.containsAll(shippingWarehouseIds)) {
+            if (!authWarehouseIds.containsAll(shippingWarehouseIds)) {
                 throw new ProfitMandiBusinessException("Uploaded File", "", "Partners are not belong to the same warehouse");
+            }
             Map<String, Integer> invoiceRetailerMap = ords.stream().collect(Collectors.toMap(
-                    x -> x.getInvoiceNumber(), x->x.getRetailerId(), (u,v)-> u ));
+                    x -> x.getInvoiceNumber(), x -> x.getRetailerId(), (u, v) -> u));
             LOGGER.info("invoicefofoIdmap" + invoiceRetailerMap);
             Map<String, Set<String>> airbillInvoiceNumberMap = billedOrderListModels.stream().collect(Collectors.groupingBy(x -> x.getAirwayBillNumber(), Collectors.mapping(BilledOrderListModel::getInvoiceNumber, Collectors.toSet())));
             if (!dispatchNotication.isEmpty()) {
                 for (Entry<String, DispatchNotificationModel> dn : dispatchNotication.entrySet()) {
                     DispatchNotificationModel dispatchNotificationModel = dn.getValue();
                     //Send message only if shipping date is within T+1 of upload date
-                    if(dispatchNotificationModel.getShippingDate().isAfter(LocalDate.now().minusDays(2))) {
+                    if (dispatchNotificationModel.getShippingDate().isAfter(LocalDate.now().minusDays(2))) {
                         Provider pr = providerRepository.selectById(dispatchNotificationModel.getProviderId());
                         String title = "Order Shipped";
                         com.spice.profitmandi.dao.entity.user.User user = userUserRepository.selectById(dn.getValue().getFofoId());
                         order.setStatusDescription("Order Delivered");
+                    }
                     //Send notification only if the case is of T + 2 days
-                    if(orders.get(0).getDeliveryTimestamp().toLocalDate().isBefore(LocalDate.now().plusDays(2))) {
+                    if (orders.get(0).getDeliveryTimestamp().toLocalDate().isBefore(LocalDate.now().plusDays(2))) {
                         String title = "Order Delivered";
                         SendNotificationModel sendNotificationModel = new SendNotificationModel();
                         sendNotificationModel.setCampaignName("Order Delivered");
                         sendNotificationModel.setTitle(title);

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/LogisticsController.java – Rev 32883 → 32933