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

         Map<LocalDate, List<StatementDetailModel>> dateInvoiceMap = invoiceDetails.stream().collect(Collectors.groupingBy(x -> x.getOnDate().toLocalDate()));
         //LOGGER.info("dateInvoiceMap - {}", dateInvoiceMap);
         Map<LocalDate, List<UserWalletHistory>> dateWalletMap = history.stream().collect(Collectors.groupingBy(x -> x.getTimestamp().toLocalDate()));
         XSSFWorkbook workbook = new XSSFWorkbook(is);
         CreationHelper creationHelper = workbook.getCreationHelper();
-        CellStyle style2 = workbook.createCellStyle();
+        CellStyle dateStyle = workbook.createCellStyle();
-        style2.setDataFormat(creationHelper.createDataFormat().getFormat("dd/mm/yyyy"));
+        dateStyle.setDataFormat(creationHelper.createDataFormat().getFormat("dd/mm/yyyy"));
         ByteArrayOutputStream bos = new ByteArrayOutputStream();
         Sheet sheet = workbook.getSheetAt(0);
         sheet.getRow(0).getCell(0).setCellValue(customRetailer.getBusinessName());
         sheet.getRow(1).getCell(1).setCellValue(new Date(startLocalDateTime.atZone(ZoneId.systemDefault()).toInstant().toEpochMilli()));
         int row = 4;
         LocalDate startDate = startLocalDateTime.toLocalDate();
         LocalDate endDate = endLocalDateTime.toLocalDate();
         LOGGER.info(" startDate - {}", startDate);
         LOGGER.info(" endDate - {}", endDate);
+        double currentOpening = openingBalance;
         for (LocalDate date = startDate; date.isBefore(endDate.plusDays(1)); date = date.plusDays(1)) {
             List<UserWalletHistory> datewiseWalletHistory = dateWalletMap.get(date);
             LOGGER.info("date - {}, datewiseWalletHistory - {}", date, datewiseWalletHistory);
             if (datewiseWalletHistory != null) {
                 for (UserWalletHistory walletEntry : datewiseWalletHistory) {
                     Cell dateCell = sheet.createRow(row).createCell(0);
+                    //Date
                     dateCell.setCellValue(new Date(walletEntry.getTimestamp().atZone(ZoneId.systemDefault()).toInstant().toEpochMilli()));
-                    dateCell.setCellStyle(style2);
+                    dateCell.setCellStyle(dateStyle);
+                    //TransactType
                     sheet.getRow(row).createCell(1).setCellValue(walletEntry.getReferenceType().toString());
+                    //Reference Id
+                    sheet.getRow(row).createCell(5).setCellValue(walletEntry.getReference());
                     if (walletEntry.getAmount() > 0) {
+                        //Debit
                         sheet.getRow(row).createCell(2).setCellValue(0);
+                        //Credit
                         sheet.getRow(row).createCell(3).setCellValue(walletEntry.getAmount());
                         grandTotalCredit += walletEntry.getAmount();
                     } else {
                         sheet.getRow(row).createCell(2).setCellValue(-walletEntry.getAmount());
                         sheet.getRow(row).createCell(3).setCellValue(0);
                         grandTotalDebit -= walletEntry.getAmount();
+                    }
+                    //Running balance
+                    currentOpening += walletEntry.getAmount();
+                    sheet.getRow(row).createCell(4).setCellValue(currentOpening);
+                    //Description
                     sheet.getRow(row).createCell(4).setCellValue(walletEntry.getDescription());
-                    sheet.getRow(row).createCell(5).setCellValue(walletEntry.getReference());
                     row++;
+                }
+            }
             List<StatementDetailModel> statementDetailModels = dateInvoiceMap.get(date);
             LOGGER.info("statementDetailModels - {}", statementDetailModels);
             if (statementDetailModels != null) {
                 for (StatementDetailModel statementDetailModel : statementDetailModels) {
                     Cell dateCell = sheet.createRow(row).createCell(0);
                     dateCell.setCellValue(statementDetailModel.getOnDate());
-                    dateCell.setCellStyle(style2);
+                    dateCell.setCellStyle(dateStyle);
+                    //Transact Type
                     sheet.getRow(row).createCell(1).setCellValue("BILLING");
+                    //Transact Reference
+                    sheet.getRow(row).createCell(5).setCellValue(statementDetailModel.getInvoiceNumber());
                     if (statementDetailModel.getAmount() > 0) {
                         sheet.getRow(row).createCell(2).setCellValue(statementDetailModel.getAmount());
                         sheet.getRow(row).createCell(3).setCellValue(0);
                         grandTotalDebit += statementDetailModel.getAmount();
                     } else {
                         sheet.getRow(row).createCell(2).setCellValue(0);
                         sheet.getRow(row).createCell(3).setCellValue(-statementDetailModel.getAmount());
                         grandTotalCredit += -statementDetailModel.getAmount();
+                    }
+                    //Running Balance
+                    currentOpening += statementDetailModel.getAmount();
+                    //Narration
                     sheet.getRow(row).createCell(4).setCellValue(statementDetailModel.getReferenceType());
-                    sheet.getRow(row).createCell(5).setCellValue(statementDetailModel.getInvoiceNumber());
                     row += 1;
+                }
+            }
             if (YearMonth.from(date).atEndOfMonth().equals(date)) {
                 if (creditNotes != null) {
                     for (CreditNote creditNote : creditNotes) {
                         double cnAmount = creditNoteLineRepository.selectAllByCreditNote(creditNote.getId()).stream().collect(Collectors.summingDouble(x -> x.getAmount()));
                         Cell dateCell = sheet.createRow(row).createCell(0);
                         dateCell.setCellValue(new Date(date.atStartOfDay().atZone(ZoneId.systemDefault()).toInstant().toEpochMilli()));
-                        dateCell.setCellStyle(style2);
+                        dateCell.setCellStyle(dateStyle);
                         sheet.getRow(row).createCell(1).setCellValue("CREDIT NOTE");
+                        sheet.getRow(row).createCell(5).setCellValue(creditNote.getCreditNoteNumber());
                         if (cnAmount > 0) {
                             sheet.getRow(row).createCell(2).setCellValue(0);
                             sheet.getRow(row).createCell(3).setCellValue(cnAmount);
                             grandTotalCredit += cnAmount;
                         } else {
                             sheet.getRow(row).createCell(2).setCellValue(-cnAmount);
                             sheet.getRow(row).createCell(3).setCellValue(0);
                             grandTotalDebit += -cnAmount;
+                        }
+                        //Running balance
+                        currentOpening += cnAmount;
+                        sheet.getRow(row).createCell(4).setCellValue(currentOpening);
+                        //Narration
                         sheet.getRow(row).createCell(4).setCellValue("Credit Note Issued");
-                        sheet.getRow(row).createCell(5).setCellValue(creditNote.getCreditNoteNumber());
                         row += 1;
+                    }
+                }
+            }

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WalletController.java – Rev 33225 → 33226