WebSVN – SmartDukaan – Diff – //StoreWebsite/src/main/java/in/shop2020/serving/controllers/ReportController.java

 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.RechargeOrderStatus;
 import in.shop2020.model.v1.order.RechargeTransaction;
+import in.shop2020.model.v1.order.StoreOrderCollection;
 import in.shop2020.model.v1.order.StoreOrderDetail;
 import in.shop2020.model.v1.order.TransactionService;
 import in.shop2020.thrift.clients.HelperClient;
 import in.shop2020.thrift.clients.TransactionClient;
 import in.shop2020.utils.Mail;
     public String getCollection() throws Exception{
         String loginStatus = (String) request.getSession().getAttribute("LOGGED_IN");
         if(loginStatus == null || !loginStatus.equals("TRUE")){
             return "authfail";
+        }
+        long sDate = -1;
+        long eDate = -1;
+        if(dateselector.equals("1")) {
+            sDate = new Date().getTime();
+            eDate = sDate;
+        }else if (dateselector.equals("2")) {
+            sDate = new Date().getTime() - 86400*1000;
+            eDate = sDate;
+        }else {
+            if(!(startDate.equals(""))) {
+                sDate = dateFormatter.parse(startDate).getTime();
+                startDate = dateFormatter.format(sDate);
+            }
+            if(!endDate.equals("")) {
+                eDate = dateFormatter.parse(endDate).getTime();
+                endDate = dateFormatter.format(eDate);
+            }
+        }
         long today = -1;
         today = new Date().getTime();
-        List<OrderStatus> statuses = new ArrayList<OrderStatus>();
-        statuses.add(OrderStatus.DELIVERY_SUCCESS);
-        statuses.add(OrderStatus.SUBMITTED_FOR_PROCESSING);
-        statuses.add(OrderStatus.ACCEPTED);
-        statuses.add(OrderStatus.BILLED);
-        List<Order> successfulOrders = tClient.getOrdersForStore(0, Long.parseLong((String) request.getSession().getAttribute("STORE_ID")), today, today, statuses);
-        statuses.clear();
-        statuses.add(OrderStatus.CANCELLED_ON_CUSTOMER_REQUEST);
-        statuses.add(OrderStatus.CANCELLED_DUE_TO_LOW_INVENTORY);
-        List<Order> refundedOrders = tClient.getOrdersForStore(0, Long.parseLong((String) request.getSession().getAttribute("STORE_ID")), today, today, statuses);
+        List<StoreOrderCollection> collections = tClient.getCollectionsForStore(Long.parseLong((String) request.getSession().getAttribute("STORE_ID")), sDate, eDate);
-        ByteArrayOutputStream baos = generateCollectionReport(successfulOrders, refundedOrders);
+        ByteArrayOutputStream baos = generateCollectionReport(collections);
         response.setContentType("application/vnd.ms-excel");
         String fileName = "collection-report";
         String todayDate = df4Filename.format(new Date(today));
         fileName = fileName + "-" + todayDate;
         fileName = fileName + ".xls";
+        }
         return null;
+    }
-    private ByteArrayOutputStream generateCollectionReport(List<Order> successfulOrders,
+    private ByteArrayOutputStream generateCollectionReport(List<StoreOrderCollection> collections) {
-                                                            List<Order> refundedOrders) {
         ByteArrayOutputStream baosXLS = new ByteArrayOutputStream();
         Workbook wb = new HSSFWorkbook();
-        Sheet reportSheet = wb.createSheet("Recharge Report");
+        Sheet reportSheet = wb.createSheet("Collection Report");
         Row reportSheetHeader = reportSheet.createRow((short)0);
         reportSheetHeader.createCell(0).setCellValue("Order ID");
-        reportSheetHeader.createCell(1).setCellValue("Order Date");
+        reportSheetHeader.createCell(1).setCellValue("Date");
         reportSheetHeader.createCell(2).setCellValue("Product");
-        reportSheetHeader.createCell(3).setCellValue("Status");
+        reportSheetHeader.createCell(3).setCellValue("Collection Type");
-        reportSheetHeader.createCell(4).setCellValue("Refund Date");
+        reportSheetHeader.createCell(4).setCellValue("Amount");
-        reportSheetHeader.createCell(5).setCellValue("Order Value");
+        reportSheetHeader.createCell(5).setCellValue("Cash");
-        reportSheetHeader.createCell(6).setCellValue("Collected Amount");
+        reportSheetHeader.createCell(6).setCellValue("Card");
-        int serialNo = 0;
-        for(Order order : successfulOrders) {
-            serialNo++;
-            Row contentRow = reportSheet.createRow((short)serialNo);
-            contentRow.createCell(0).setCellValue(order.getId());
-            contentRow.createCell(1).setCellValue(formatter.format(new Date(order.getCreated_timestamp())));
-            contentRow.createCell(2).setCellValue(getProductName(order.getLineitems().get(0)));
-            contentRow.createCell(3).setCellValue(order.getStatusDescription());
-            contentRow.createCell(4).setCellValue("N/A");
-            contentRow.createCell(5).setCellValue(order.getTotal_amount());
-            contentRow.createCell(6).setCellValue(order.getAdvanceAmount());
-        }
+        int serialNo = 0;
-        for(Order order : refundedOrders) {
+        for(StoreOrderCollection collection : collections) {
             serialNo++;
             Row contentRow = reportSheet.createRow((short)serialNo);
-            contentRow.createCell(0).setCellValue(order.getId());
+            contentRow.createCell(0).setCellValue(collection.getOrderId());
-            contentRow.createCell(1).setCellValue(formatter.format(new Date(order.getCreated_timestamp())));
+            contentRow.createCell(1).setCellValue(formatter.format(new Date(collection.getPushedAt())));
-            contentRow.createCell(2).setCellValue(getProductName(order.getLineitems().get(0)));
+            contentRow.createCell(2).setCellValue(collection.getProductName());
-            contentRow.createCell(3).setCellValue(order.getStatusDescription());
+            contentRow.createCell(3).setCellValue(collection.getCollectionType());
-            contentRow.createCell(4).setCellValue(formatter.format(new Date(order.getRefund_timestamp())));
+            contentRow.createCell(4).setCellValue(collection.getAdvanceAmount());
-            contentRow.createCell(5).setCellValue(order.getTotal_amount());
+            contentRow.createCell(5).setCellValue(collection.getCash());
-            contentRow.createCell(6).setCellValue(-order.getAdvanceAmount());
+            contentRow.createCell(6).setCellValue(collection.getCard());
+        }
         try {
             wb.write(baosXLS);
         } catch (IOException e) {
             // TODO Auto-generated catch block
             e.printStackTrace();
     public String create() throws Exception{
         long sDate = -1;
         long eDate = -1;
-        RechargeOrderStatus st = null;
         String loginStatus = (String) request.getSession().getAttribute("LOGGED_IN");
         if(loginStatus == null || !loginStatus.equals("TRUE")){
             return "authfail";
+        }
         if(dateselector.equals("1")) {
             if(!endDate.equals("")) {
                 eDate = dateFormatter.parse(endDate).getTime();
                 endDate = dateFormatter.format(sDate);
+            }
+        }
-        if(!status.equals("-1")){
-            st = RechargeOrderStatus.findByValue(Integer.parseInt(status));
+        List<OrderStatus> statuses = new ArrayList<OrderStatus>();
-        }
+        statuses.add(OrderStatus.DELIVERY_SUCCESS);
+        orders = tClient.getOrdersForStore(0, Long.parseLong((String) request.getSession().getAttribute("STORE_ID")), sDate, eDate, statuses);
-        ByteArrayOutputStream baos = generateReport(tClient.getRechargeTrans(Long.parseLong((String) request.getSession().getAttribute("STORE_ID")), sDate, eDate, st));
+        ByteArrayOutputStream baos = generateReport(orders);
         response.setContentType("application/vnd.ms-excel");
-        String st1 = "ALL";
-        if(st!=null){
-            st1 = st.name();
-        }
-        String fileName = st1 + "-recharge-report";
+        String fileName = "sales-report";
         if (!startDate.equals("")) {
             fileName = fileName + "-" + startDate.replaceAll("\\\\", "_") ;
+        }
         if (!endDate.equals("")) {
             fileName = fileName + "-" + endDate.replaceAll("\\\\", "_") ;
+        }
         return "index";
+    }
-    private ByteArrayOutputStream generateReport(
+    private ByteArrayOutputStream generateReport(List<Order> orders) {
-            List<RechargeTransaction> rechargeTrans) {
-ByteArrayOutputStream baosXLS = new ByteArrayOutputStream();
+        ByteArrayOutputStream baosXLS = new ByteArrayOutputStream();
         Workbook wb = new HSSFWorkbook();
         Sheet reportSheet = wb.createSheet("Recharge Report");
         Row reportSheetHeader = reportSheet.createRow((short)0);
         reportSheetHeader.createCell(0).setCellValue("Order ID");
         reportSheetHeader.createCell(1).setCellValue("Order Date");
-        reportSheetHeader.createCell(2).setCellValue("Operator");
-        reportSheetHeader.createCell(3).setCellValue("Device");
+        reportSheetHeader.createCell(2).setCellValue("Product");
-        reportSheetHeader.createCell(4).setCellValue("Status");
+        reportSheetHeader.createCell(3).setCellValue("Status");
-        reportSheetHeader.createCell(5).setCellValue("Recharge Amount");
-        reportSheetHeader.createCell(6).setCellValue("Discount");
-        reportSheetHeader.createCell(7).setCellValue("Net Amount");
+        reportSheetHeader.createCell(4).setCellValue("Order Amount");
-        reportSheetHeader.createCell(8).setCellValue("Type");
+        reportSheetHeader.createCell(5).setCellValue("Advance");
-        reportSheetHeader.createCell(9).setCellValue("Pay Method");
-        reportSheetHeader.createCell(10).setCellValue("Refund Date");
         int serialNo = 0;
-        for(RechargeTransaction transaction : rechargeTrans) {
+        for(Order order : orders) {
             serialNo++;
             Row contentRow = reportSheet.createRow((short)serialNo);
-            contentRow.createCell(0).setCellValue(transaction.getId());
+            contentRow.createCell(0).setCellValue(order.getId());
-            contentRow.createCell(1).setCellValue(formatter.format(new Date(transaction.getTransactionTime())));
+            contentRow.createCell(1).setCellValue(formatter.format(new Date(order.getCreated_timestamp())));
-//            contentRow.createCell(2).setCellValue(getOperatorName(transaction.getOperatorId()));
+            contentRow.createCell(2).setCellValue(getProductName(order.getLineitems().get(0)));
-            contentRow.createCell(3).setCellValue(transaction.getDeviceNum());
-            contentRow.createCell(4).setCellValue(transaction.getStatus().name());
+            contentRow.createCell(3).setCellValue(order.getStatusDescription());
-            contentRow.createCell(5).setCellValue(transaction.getAmount());
+            contentRow.createCell(4).setCellValue(order.getTotal_amount());
-            contentRow.createCell(6).setCellValue(transaction.getDiscount());
-            contentRow.createCell(7).setCellValue(transaction.getPaymentAmount());
+            contentRow.createCell(5).setCellValue(order.getAdvanceAmount());
-            contentRow.createCell(8).setCellValue(transaction.isIsFrc() ? "FRC" : "Normal");
-            contentRow.createCell(9).setCellValue(transaction.getPayMethod().name());
-            if(transaction.getStatus() == RechargeOrderStatus.RECHARGE_FAILED_REFUNDED) {
-                contentRow.createCell(10).setCellValue(transaction.getResponseTime());
-            } else {
-                contentRow.createCell(10).setCellValue("N/A");
-            }
+        }
         try {
             wb.write(baosXLS);
         } catch (IOException e) {
             // TODO Auto-generated catch block

Subversion Repositories SmartDukaan

(root)//StoreWebsite/src/main/java/in/shop2020/serving/controllers/ReportController.java – Rev 7423 → 7427