WebSVN – SmartDukaan – Diff – /trunk/Support/src/main/java/in/shop2020/support/controllers/CourierPerformanceController.java

 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import in.shop2020.logistics.LogisticsServiceException;
 import in.shop2020.logistics.Provider;
+import in.shop2020.model.v1.order.LineItem;
 import in.shop2020.model.v1.order.Order;
 import in.shop2020.model.v1.order.OrderStatus;
 import in.shop2020.model.v1.order.TransactionServiceException;
 import in.shop2020.support.utils.ReportsUtils;
 import in.shop2020.thrift.clients.LogisticsClient;
         affHeaderRow.createCell(4).setCellValue("Logistics Provider");
         affHeaderRow.createCell(5).setCellValue("Shipping Date");
         affHeaderRow.createCell(6).setCellValue("Delivery Date");
         affHeaderRow.createCell(7).setCellValue("Expected Delivery Date");
         affHeaderRow.createCell(8).setCellValue("Delay");
-        affHeaderRow.createCell(9).setCellValue("Promised Delivery Date");
-        affHeaderRow.createCell(10).setCellValue("Order Created Date");
-        affHeaderRow.createCell(11).setCellValue("Promised Shipping Date");
+        affHeaderRow.createCell(9).setCellValue("First Delivery Attempt");
+        affHeaderRow.createCell(10).setCellValue("First Attempt Delay");
+        affHeaderRow.createCell(11).setCellValue("Promised Delivery Date");
+        affHeaderRow.createCell(12).setCellValue("Order Created Date");
+        affHeaderRow.createCell(13).setCellValue("Promised Shipping Date");
+        affHeaderRow.createCell(14).setCellValue("Return Receive Date");
+        affHeaderRow.createCell(15).setCellValue("Product Name");
+        affHeaderRow.createCell(16).setCellValue("AWB");
-        for (int i=0; i<12 ;i++) {
+        for (int i=0; i<17 ;i++) {
             affHeaderRow.getCell(i).setCellStyle(style);
+        }
-        Calendar deliveryTime = Calendar.getInstance();
-        Calendar expectedDeliveryTime = Calendar.getInstance();
-        long millisInDays = 24 * 60 * 60 * 1000;
         try {
             TransactionClient tc = new TransactionClient();
             orders = tc.getClient().getAllOrders(rtoStatuses, startDate.getTime(), endDate.getTime(), 0);
         } catch (TransactionServiceException e) {
             // TODO Auto-generated catch block
             boolean deliveryTimestampSet = false;
             long diffDays = -99;
             if (order.getDelivery_timestamp() != 0) {
                 deliveryTimestampSet = true;
-                deliveryTime.setTimeInMillis(order.getDelivery_timestamp());
-                expectedDeliveryTime.setTimeInMillis(order.getExpected_delivery_time());
+                diffDays = GetDelayinDays(order.getDelivery_timestamp(), order.getExpected_delivery_time());
-                long deliveryTimeInMillis = deliveryTime.getTimeInMillis();
-                long expectedDeliveryTimeInMillis = expectedDeliveryTime.getTimeInMillis();
-                long diff = deliveryTimeInMillis - expectedDeliveryTimeInMillis;
-                diffDays = diff / millisInDays;
+            }
             affSerialNo++;
             Row commContentRow = sheet1.createRow(affSerialNo);
             commContentRow.createCell(0).setCellValue(order.getId());
             commContentRow.createCell(1).setCellValue(order.isCod() ? "COD" : "PREPAID");
             commContentRow.createCell(2).setCellValue(order.getCustomer_pincode());
             if (diffDays == -99) {
                 commContentRow.createCell(8).setCellValue("N/A");
             } else {
                 commContentRow.createCell(8).setCellValue(diffDays);
+            }
-            commContentRow.createCell(9).setCellValue(new Date(order.getPromised_delivery_time()));
+            commContentRow.createCell(9).setCellValue(new Date(order.getFirst_attempt_timestamp()));
             commContentRow.getCell(9).setCellStyle(dateCellStyle);
+            if (order.getFirst_attempt_timestamp() != 0) {
-            commContentRow.createCell(10).setCellValue(new Date(order.getCreated_timestamp()));
+                commContentRow.createCell(9).setCellValue(new Date(order.getFirst_attempt_timestamp()));
-            commContentRow.getCell(10).setCellStyle(dateCellStyle);
+                commContentRow.getCell(9).setCellStyle(dateCellStyle);
+                diffDays = GetDelayinDays(order.getFirst_attempt_timestamp(), order.getExpected_delivery_time());
+                commContentRow.createCell(10).setCellValue(diffDays);
+            } else {
+                commContentRow.createCell(9).setCellValue("N/A");
+                commContentRow.createCell(10).setCellValue("N/A");
+            }
-            commContentRow.createCell(11).setCellValue(new Date(order.getPromised_shipping_time()));
+            commContentRow.createCell(11).setCellValue(new Date(order.getPromised_delivery_time()));
             commContentRow.getCell(11).setCellStyle(dateCellStyle);
+            commContentRow.createCell(12).setCellValue(new Date(order.getCreated_timestamp()));
+            commContentRow.getCell(12).setCellStyle(dateCellStyle);
+            commContentRow.createCell(13).setCellValue(new Date(order.getPromised_shipping_time()));
+            commContentRow.getCell(13).setCellStyle(dateCellStyle);
+            commContentRow.createCell(14).setCellValue(new Date(order.getReceived_return_timestamp()));
+            commContentRow.getCell(14).setCellStyle(dateCellStyle);
+            List<LineItem> items = order.getLineitems();
+            String product = items.get(0).getBrand() + " " + ((items.get(0).getModel_name() == null)? "" : items.get(0).getModel_name()) + " " + items.get(0).getModel_number();
+            commContentRow.createCell(15).setCellValue(product);
+            commContentRow.createCell(16).setCellValue(order.getAirwaybill_no());
+        }
-        for (int i = 0; i<12; i++) {
+        for (int i = 0; i<17; i++) {
             sheet1.autoSizeColumn(i);
+        }
+    }
     private void createDeliveredSheet(Workbook wb,
         affHeaderRow.createCell(4).setCellValue("Logistics Provider");
         affHeaderRow.createCell(5).setCellValue("Shipping Date");
         affHeaderRow.createCell(6).setCellValue("Delivery Date");
         affHeaderRow.createCell(7).setCellValue("Expected Delivery Date");
         affHeaderRow.createCell(8).setCellValue("Delay");
-        affHeaderRow.createCell(9).setCellValue("Promised Delivery Date");
+        affHeaderRow.createCell(9).setCellValue("First Delivery Attempt");
-        affHeaderRow.createCell(10).setCellValue("Order Created Date");
+        affHeaderRow.createCell(10).setCellValue("First Attempt Delay");
-        affHeaderRow.createCell(11).setCellValue("Promised Shipping Date");
+        affHeaderRow.createCell(11).setCellValue("Promised Delivery Date");
+        affHeaderRow.createCell(12).setCellValue("Order Created Date");
+        affHeaderRow.createCell(13).setCellValue("Promised Shipping Date");
+        affHeaderRow.createCell(14).setCellValue("Product Name");
+        affHeaderRow.createCell(15).setCellValue("AWB");
-        for (int i=0; i<12 ;i++) {
+        for (int i=0; i<16 ;i++) {
             affHeaderRow.getCell(i).setCellStyle(style);
+        }
-        Calendar deliveryTime = Calendar.getInstance();
-        Calendar expectedDeliveryTime = Calendar.getInstance();
-        long millisInDays = 24 * 60 * 60 * 1000;
         try {
             TransactionClient tc = new TransactionClient();
             List<OrderStatus> deliveredStatuses = new ArrayList<OrderStatus>();
             deliveredStatuses.add(OrderStatus.DELIVERY_SUCCESS);
             orders = tc.getClient().getAllOrders(deliveredStatuses, startDate.getTime(), endDate.getTime(), 0);
             // TODO Auto-generated catch block
             e.printStackTrace();
+        }
         for(Order order : orders) {
-            deliveryTime.setTimeInMillis(order.getDelivery_timestamp());
-            expectedDeliveryTime.setTimeInMillis(order.getExpected_delivery_time());
+            long diffDays = GetDelayinDays(order.getDelivery_timestamp(), order.getExpected_delivery_time());
-            long deliveryTimeInMillis = deliveryTime.getTimeInMillis();
-            long expectedDeliveryTimeInMillis = expectedDeliveryTime.getTimeInMillis();
-            long diff = deliveryTimeInMillis - expectedDeliveryTimeInMillis;
-            long diffDays = diff / millisInDays;
             affSerialNo++;
             Row commContentRow = sheet2.createRow(affSerialNo);
             commContentRow.createCell(0).setCellValue(order.getId());
             commContentRow.createCell(1).setCellValue(order.isCod() ? "COD" : "PREPAID");
             commContentRow.createCell(2).setCellValue(order.getCustomer_pincode());
             commContentRow.createCell(6).setCellValue(new Date(order.getDelivery_timestamp()));
             commContentRow.getCell(6).setCellStyle(dateCellStyle);
             commContentRow.createCell(7).setCellValue(new Date(order.getExpected_delivery_time()));
             commContentRow.getCell(7).setCellStyle(dateCellStyle);
             commContentRow.createCell(8).setCellValue(diffDays);
-            commContentRow.createCell(9).setCellValue(new Date(order.getPromised_delivery_time()));
+            commContentRow.createCell(9).setCellValue(new Date(order.getFirst_attempt_timestamp()));
             commContentRow.getCell(9).setCellStyle(dateCellStyle);
-            commContentRow.createCell(10).setCellValue(new Date(order.getCreated_timestamp()));
+            diffDays = GetDelayinDays(order.getFirst_attempt_timestamp(), order.getExpected_delivery_time());
-            commContentRow.getCell(10).setCellStyle(dateCellStyle);
+            commContentRow.createCell(10).setCellValue(diffDays);
-            commContentRow.createCell(11).setCellValue(new Date(order.getPromised_shipping_time()));
+            commContentRow.createCell(11).setCellValue(new Date(order.getPromised_delivery_time()));
             commContentRow.getCell(11).setCellStyle(dateCellStyle);
+            commContentRow.createCell(12).setCellValue(new Date(order.getCreated_timestamp()));
+            commContentRow.getCell(12).setCellStyle(dateCellStyle);
+            commContentRow.createCell(13).setCellValue(new Date(order.getPromised_shipping_time()));
+            commContentRow.getCell(13).setCellStyle(dateCellStyle);
+            List<LineItem> items = order.getLineitems();
+            String product = items.get(0).getBrand() + " " + items.get(0).getModel_name() + " " + items.get(0).getModel_number();
+            commContentRow.createCell(14).setCellValue(product);
+            commContentRow.createCell(15).setCellValue(order.getAirwaybill_no());
+        }
-        for (int i = 0; i<12; i++) {
+        for (int i = 0; i<16; i++) {
             sheet2.autoSizeColumn(i);
+        }
+    }
+    long GetDelayinDays(long actualDate, long expectedDate) {
+        Calendar actualTime = Calendar.getInstance();
+        Calendar expectedTime = Calendar.getInstance();
+        long millisInDays = 24 * 60 * 60 * 1000;
+        actualTime.setTimeInMillis(actualDate);
+        expectedTime.setTimeInMillis(expectedDate);
+        long actualTimeInMillis = actualTime.getTimeInMillis();
+        long expectedTimeInMillis = expectedTime.getTimeInMillis();
+        long diff = actualTimeInMillis - expectedTimeInMillis;
+        long diffDays = diff / millisInDays;
+        return diffDays;
+    }
     public List<OrderStatus> getRtoStatuses() {
         return rtoStatuses;
+    }

Subversion Repositories SmartDukaan

(root)/trunk/Support/src/main/java/in/shop2020/support/controllers/CourierPerformanceController.java – Rev 4801 → 5354