WebSVN – SmartDukaan – Diff – /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java

 import java.util.*;
 import java.util.Map.Entry;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import static java.util.stream.Collectors.groupingBy;
 import static java.util.stream.Collectors.mapping;
 @Component
     private ServiceConfigRepository serviceConfigRepository;
     @Autowired
     private RetailerBlockBrandsRepository retailerBlockBrandsRepository;
-    @Value("${delhivery.tracking.token}")
-    private String token;
     private static final String[] STOCK_AGEING_MAIL_LIST = new String[]{"uday.singh@smartudkaan.com", "mohinder.mutreja@smartdukaan.com", "ankit.bhatia@smartdukaan.com", "tarun.verma@smartdukaan.com", "kuldeep.kumar@smartdukaan.com", "manish.gupta@smartdukaan.com"};
     private static final String[] ITEMWISE_PENDING_INDENT_MAIL_LIST = new String[]{"kamini.sharma@smartdukaan.com", "tarun.verma@smartdukaan.com", "uday.singh@smartdukaan.com", "kuldeep.kumar@smartdukaan.com", "niranjan.kala@smartdukaan.com"};
     private static final String[] INDENT_TERTIARY_MAIL_LIST = new String[]{"uday.singh@smartdukaan.com", "kuldeep.kumar@smartdukaan.com", "nishant.ohri@smartdukaan.com"};
         partnerTypeChangeService.getTypeOnDate(175139287, LocalDate.of(2023,03, 01));
         partnerTypeChangeService.getTypeOnDate(175139287, LocalDate.of(2023,04, 01));
         FofoStore fs = fofoStoreRepository.selectByRetailerId(175139287);
         this.rolloutMarginForStoreOnMonth(fs, LocalDate.of(2023, 2, 1));
         this.rolloutMarginForStoreOnMonth(fs, LocalDate.of(2023, 3, 1));*/
-        this.markBlueDartOrderDelivered();
         //this.sendMailForSamsungRebilling();
         /*List<PurchaseReturnItem> purchaseReturnItems = purchaseReturnItemRepository.selectPurchaseReturnByStatuses(Arrays.asList(PurchaseReturnStatus.DEBIT_NOTE_CREATED));
         Map<Integer, List<PurchaseReturnItem>> inventoryItemsMap = purchaseReturnItems.stream().collect(Collectors.groupingBy(x -> x.getDebitNoteId()));
         for (Map.Entry<Integer, List<PurchaseReturnItem>> debitNotePurcahseReturnMap : inventoryItemsMap.entrySet()) {
             List<InventoryItem> inventoryItems = inventoryItemRepository.selectAllByIds(debitNotePurcahseReturnMap.getValue().stream().map(x -> x.getInventoryItemId()).collect(Collectors.toList()));
         sb.append("</tbody></table></body></html>");
         return sb.toString();
+    }
-    private String getMessageForUncontacblePartner(List<PartnerCollectionRemark> pcrs) throws
+    private String getMessageForRBMEscalatedPartners(List<PartnerCollectionRemark> pcrs) throws
             ProfitMandiBusinessException {
         StringBuilder sb = new StringBuilder();
-        sb.append("<html><body><p>Alert</p><p>Not Responding Partner:-</p>" + "<br/><table style='border:1px solid black ;padding: 5px';>");
+        sb.append("<html><body><p>Alert</p><p>Escalated by RBM-L1:-</p>" + "<br/><table style='border:1px solid black ;padding: 5px';>");
+        sb.append("<tbody>" +
+                "<tr>" +
-        sb.append("<tbody>\n" + "	    				<tr>\n" + "	    					<th style='border:1px solid black;padding: 5px'>PartnerName</th>\n" + "	    					<th style='border:1px solid black;padding: 5px'>from</th>\n"
+                "<th style='border:1px solid black;padding: 5px'>PartnerName</th>" +
+                "<th style='border:1px solid black;padding: 5px'>Escalated Since</th>" +
+                "<th style='border:1px solid black;padding: 5px'>Message</th>" +
+                "</tr>");
-                + "	    				</tr>");
         for (PartnerCollectionRemark entry : pcrs) {
             CustomRetailer customRetailer = retailerService.getFofoRetailer(entry.getFofoId());
             sb.append("<tr>");
             sb.append("<td style='border:1px solid black;padding: 5px'>" + customRetailer.getBusinessName() + "(" + customRetailer.getCode() + ")" + "</td>");
             sb.append("<td style='border:1px solid black;padding: 5px'>" + entry.getCreateTimestamp().format(DateTimeFormatter.ofPattern("dd/MM/yyyy")) + "</td>");
+            sb.append("<td style='border:1px solid black;padding: 5px'>" + entry.getMessage() + "</td>");
             sb.append("</tr>");
+        }
         String data = "";
         data = new String(Files.readAllBytes(Paths.get(file)));
         return data;
+    }
-    public void markDelhiveryOrderDelivered() throws Exception {
-        List<Order> orders = orderRepository.selectOrderByProviderIdAndStatus(ProfitMandiConstants.DELHIVERY_PROVIDERID, OrderStatus.SHIPPED_FROM_WH);
-        if (!orders.isEmpty()) {
-            Set<String> airwayBill = orders.stream().map(x -> x.getAirwayBillNumber()).collect(Collectors.toSet());
-            int arraylength = airwayBill.size();
-            if (arraylength >= 75) {
-                airwayBill = airwayBill.stream().limit(74).collect(Collectors.toSet());
-            }
-            LOGGER.info("airwayBill" + airwayBill);
-            String url = "https://track.delhivery.com/api/v1/packages/json/";
-            OkHttpClient client = new OkHttpClient();
-            Request request1 = new Request.Builder().url(url + "?waybill=" + String.join(",", airwayBill) + "&token=" + token).get().build();
-            LOGGER.info("request1" + request1);
-            Response response = client.newCall(request1).execute();
-            LOGGER.info("jsonbj" + response.body());
-            JSONObject jsonObj = new JSONObject(response.body().string());
-            LOGGER.info("jsonObj" + jsonObj);
-            JSONArray shipmentData = jsonObj.getJSONArray("ShipmentData");
-            Set<String> airwaybillStatus = new HashSet<>();
-            for (int i = 0; i < shipmentData.length(); i++) {
-                JSONObject jsonObject = shipmentData.getJSONObject(i);
-                JSONObject shipment = jsonObject.getJSONObject("Shipment");
-                LOGGER.info("shipment" + shipment);
-                JSONObject statusDescription = shipment.getJSONObject("Status");
-                String awb = shipment.getString("AWB");
-                String status = statusDescription.getString("Status");
-                LOGGER.info("status" + status);
-                LOGGER.info("awb" + awb);
-                if (status.equals("Delivered")) {
-                    airwaybillStatus.add(awb);
-                }
-            }
-            markOrderDelivered(airwaybillStatus);
-        }
-    }
-    public void markBlueDartOrderDelivered() throws Exception {
-        String loginId = "DEL81122";
-        String licencekey = "uhfhlg2jpmnqfhfrlsgzfr1nhu1qfvel";
-        List<Order> orders = orderRepository.selectOrderByProviderIdAndStatus(ProfitMandiConstants.BLUEDART_PROVIDERID, OrderStatus.SHIPPED_FROM_WH);
-        if (!orders.isEmpty()) {
-            Set<String> airwayBillNo = orders.stream().map(x -> x.getAirwayBillNumber()).collect(Collectors.toSet());
-            LOGGER.info("airwayBill" + airwayBillNo);
-            String url = "https://api.bluedart.com/servlet/RoutingServlet?handler=tnt&action=custawbquery";
-            String response = restClient.get(url + "&loginid=" + loginId + "&awb=awb&numbers=" + String.join(",", airwayBillNo) + "&format=xml&lickey=" + licencekey + "&verno=1.3&scan=1", null, null);
-            JSONObject updateJson = XML.toJSONObject(response);
-            JSONObject shipmentData = updateJson.getJSONObject("ShipmentData");
-            Object shipmentObject = shipmentData.get("Shipment");
-            Set<String> airwaybillStatus = new HashSet<>();
-            if (shipmentObject instanceof JSONArray) {
-                JSONArray shipments = (JSONArray) shipmentObject;
-                for (int i = 0; i < shipments.length(); i++) {
-                    JSONObject jsonObject = shipments.getJSONObject(i);
-                    Number awb = jsonObject.getNumber("WaybillNo");
-                    String status = jsonObject.getString("Status");
-                    if (status.equals("SHIPMENT DELIVERED")) {
-                        airwaybillStatus.add(awb.toString());
-                    }
-                }
-            } else {
-                JSONObject jsonObject = (JSONObject) shipmentObject;
-                Number awb = jsonObject.getNumber("WaybillNo");
-                String status = jsonObject.getString("Status");
-                if (status.equals("SHIPMENT DELIVERED")) {
-                    airwaybillStatus.add(awb.toString());
-                }
-            }
-            LOGGER.info("airwaybillStatus" + airwaybillStatus);
-            markOrderDelivered(airwaybillStatus);
-        }
-    }
-    private void markOrderDelivered(Set<String> airwaybillStatus) throws Exception {
-        if (!airwaybillStatus.isEmpty()) {
-            for (String aws : airwaybillStatus) {
-                List<Order> deliverdOrders = orderRepository.selectByAirwayBillNumber(aws);
-                int fofoId = deliverdOrders.get(0).getRetailerId();
-                for (Order dlo : deliverdOrders) {
-                    dlo.setStatus(OrderStatus.DELIVERY_SUCCESS);
-                    dlo.setStatusDescription("Order Delivered");
-                    dlo.setDeliveryTimestamp(LocalDateTime.now());
-                }
-                com.spice.profitmandi.dao.entity.user.User user = userUserRepository.selectById(fofoId);
-                Address address = addressRepository.selectById(user.getAddressId());
-                String title = "Order Delivered";
-                String message = String.format("Dear partner, Your SmartDukaan Order " + aws + " has been delivered to you in a safe sealed bag.");
-                SendNotificationModel sendNotificationModel = new SendNotificationModel();
-                sendNotificationModel.setCampaignName("Order Delivered");
-                sendNotificationModel.setTitle(title);
-                sendNotificationModel.setMessage(message);
-                sendNotificationModel.setType("url");
-                sendNotificationModel.setUrl("https://app.smartdukaan.com/pages/home/notifications");
-                sendNotificationModel.setExpiresat(LocalDateTime.now().plusDays(1));
-                sendNotificationModel.setMessageType(MessageType.notification);
-                int userId = userAccountRepository.selectUserIdByRetailerId(fofoId);
-                sendNotificationModel.setUserIds(Arrays.asList(userId));
-                notificationService.sendNotification(sendNotificationModel);
-                notificationService.sendWhatsappMessage(message, title, address.getPhoneNumber());
-            }
-        }
-    }
     public void partnerWiseCreditAccount() throws Exception {
         List<FofoStore> fofoStores = fofoStoreRepository.selectActiveStores();
+    }
     @Autowired
     private PartnerCollectionRemarkRepository partnerCollectionRemarkRepository;
+    //RBM L2 Escalations
     public void reviewUncontactablePartner() throws
             ProfitMandiBusinessException, MessagingException, UnsupportedEncodingException {
         Map<Integer, CustomRetailer> customRetailerMap = retailerService.getFofoRetailers(true);
-        List<Integer> pcrms = partnerCollectionRemarkRepository.selectMaxRemarkId(new ArrayList<>(customRetailerMap.keySet()));
+        List<Integer> partnerLastCollectionRemarkIds = partnerCollectionRemarkRepository.selectMaxRemarkId(new ArrayList<>(customRetailerMap.keySet()));
-        if (!pcrms.isEmpty()) {
+        if (!partnerLastCollectionRemarkIds.isEmpty()) {
-            Map<Integer, PartnerCollectionRemark> partnerCollectionRemarksMap = partnerCollectionRemarkRepository.selectByIds(pcrms).stream().filter(x -> x.getRemark().equals(CollectionRemark.NOT_RESPONDING)).collect(Collectors.toMap(x -> x.getFofoId(), x -> x));
+            List<PartnerCollectionRemark> partnerCollectionRemarks = partnerCollectionRemarkRepository.selectByIds(partnerLastCollectionRemarkIds);
+            Map<Integer, PartnerCollectionRemark> rbmEscalatedRemarksMap = partnerCollectionRemarks.stream().filter(x -> x.getRemark().equals(CollectionRemark.COLLECTION_PLAN)).collect(Collectors.toMap(x -> x.getFofoId(), x -> x));
+            Map<Integer, PartnerCollectionRemark> salesEscalatedRemarksMap = partnerCollectionRemarks.stream().filter(x -> x.getRemark().equals(CollectionRemark.SALES_ESCALATION)).collect(Collectors.toMap(x -> x.getFofoId(), x -> x));
-            if (!partnerCollectionRemarksMap.isEmpty()) {
+            if (!rbmEscalatedRemarksMap.isEmpty()) {
+                //
-                for (Map.Entry<String, Set<Integer>> storeGuyEntry : csService.getAuthUserPartnerIdMapping().entrySet()) {
+                for (Map.Entry<String, Set<Integer>> storeGuyEntry : csService.getAuthUserPartnerIdMappingByCategoryIds(Arrays.asList(ProfitMandiConstants.TICKET_CATEGORY_RBM), true).entrySet()) {
+                    List<PartnerCollectionRemark> filteredRows = storeGuyEntry.getValue().stream()
-                    List<PartnerCollectionRemark> filteredRows = storeGuyEntry.getValue().stream().map(x -> partnerCollectionRemarksMap.get(x)).filter(x -> x != null).collect(Collectors.toList());
+                            .map(x -> rbmEscalatedRemarksMap.get(x)).filter(x -> x != null).collect(Collectors.toList());
-                    String subject = "UNCONTACTABLE PARTNERS";
+                    String subject = "Partners escalated to RBM-L2";
-                    String messageText = this.getMessageForUncontacblePartner(filteredRows);
+                    String messageText = this.getMessageForRBMEscalatedPartners(filteredRows);
+                    MimeMessage message = mailSender.createMimeMessage();
+                    MimeMessageHelper helper = new MimeMessageHelper(message, true);
+                    String[] email = new String[]{storeGuyEntry.getKey()};
+                    helper.setSubject(subject);
+                    helper.setText(messageText, true);
+                    helper.setTo(email);
+                    InternetAddress senderAddress = new InternetAddress("noreply@smartdukaan.com", "Smartdukaan Alerts");
+                    helper.setFrom(senderAddress);
+                    mailSender.send(message);
+                    LOGGER.info("filteredRows {}", filteredRows);
+                }
+            }
+            if (!salesEscalatedRemarksMap.isEmpty()) {
+                //
+                for (Map.Entry<String, Set<Integer>> storeGuyEntry : csService.getAuthUserPartnerIdMappingByCategoryIds(Arrays.asList(ProfitMandiConstants.TICKET_CATEGORY_SALES, ProfitMandiConstants.TICKET_CATEGORY_RBM), true).entrySet()) {
+                    List<PartnerCollectionRemark> filteredRows = storeGuyEntry.getValue().stream()
+                            .map(x -> salesEscalatedRemarksMap.get(x)).filter(x -> x != null).collect(Collectors.toList());
+                    String subject = "Partners escalated to Sales";
+                    String messageText = this.getMessageForSalesEscalatedPartners(filteredRows);
                     MimeMessage message = mailSender.createMimeMessage();
                     MimeMessageHelper helper = new MimeMessageHelper(message, true);
                     String[] email = new String[]{storeGuyEntry.getKey()};

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java – Rev 32822 → 32832