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

             Map<Date, Long> registerCountMap = new HashMap<Date, Long>();
             Map<Date, Double> saleQuantityMap = new HashMap<Date, Double>();
             Map<Date, Double> saleAmountMap = new HashMap<Date, Double>();
             Map<Date, Map<String, Double>> productQuantityMap = new HashMap<Date, Map<String, Double>>();
+            Map<Date, Map<Long, String>> dateTxnProductMap = new HashMap<Date, Map<Long, String>>();
             Map<Date, Map<String, Double>> productAmountMap = new HashMap<Date, Map<String,Double>>();
             for (Affiliate aff : affiliates) {
                 Set<Long> Payments = new HashSet<Long>(); // To deal with multiple refreshes on pay-success page.
                 for (TrackLog tracklog : userClient.getTrackLogsByAffiliate(aff.getId(), startDate.getTime(), endDate.getTime())) {
                                     String productName = item.getBrand() + " "
                                             + item.getModel_name() + " "
                                             + item.getModel_number();
                                     productName = productName.replace("null", "").replaceAll("  ", " ").trim();
                                     if (productQuantityMap.containsKey(date)) {
                                         Map<String, Double> pQuantityMap = productQuantityMap.get(date);
                                         if (pQuantityMap.containsKey(productName)) {
                                             Double quantity = pQuantityMap.get(productName);
                                             quantity += item.getQuantity();
                                         Map<String, Double> pQuantityMap = new HashMap<String, Double>();
                                         pQuantityMap.put(productName, item.getQuantity());
                                         productQuantityMap.put(date, pQuantityMap);
+                                    }
+                                    if (dateTxnProductMap.containsKey(date)) {
+                                        Map<Long, String> txnProductMap = dateTxnProductMap.get(date);
+                                        txnProductMap.put(order.getTransactionId(), productName);
+                                    }
+                                    else {
+                                        Map<Long, String> txnProductMap = new HashMap<Long, String>();
+                                        txnProductMap.put(order.getTransactionId(), productName);
+                                        dateTxnProductMap.put(date, txnProductMap);
+                                    }
                                     if (productAmountMap.containsKey(date)) {
                                         Map<String, Double> pAmountMap = productAmountMap.get(date);
                                         if (pAmountMap.containsKey(productName)) {
                                             Double amount = pAmountMap.get(productName);
                                             amount += item.getTotal_price();
             response.setHeader("Content-disposition", "inline; filename=" + mAffName + "-affiliate-report" + ".xls");
             ServletOutputStream sos;
             try {
-                ByteArrayOutputStream baos = getSpreadSheetData(mAffName, dates, registerCountMap, saleQuantityMap, saleAmountMap, productQuantityMap, productAmountMap);
+                ByteArrayOutputStream baos = getSpreadSheetData(mAffName,
+                                                                   dates,
+                                                                   registerCountMap,
+                                                                   saleQuantityMap,
+                                                                   saleAmountMap,
+                                                                   productQuantityMap,
+                                                                   dateTxnProductMap,
+                                                                   productAmountMap);
                 sos = response.getOutputStream();
                 baos.writeTo(sos);
                 sos.flush();
             } catch (IOException e) {
                 log.error("Unable to stream the affiliates report", e);
     // Prepares the XLS worksheet object and fills in the data with proper formatting
 	private ByteArrayOutputStream getSpreadSheetData(String mAffName,
 	        SortedSet<Date> dates,
             Map<Date, Long> registerCountMap,
             Map<Date, Double> saleQuantityMap,
             Map<Date, Double> saleAmountMap,
             Map<Date, Map<String, Double>> productQuantityMap,
+            Map<Date, Map<Long, String>> dateTxnProductMap,
             Map<Date, Map<String, Double>> productAmountMap)
+	{
 	    ByteArrayOutputStream baosXLS = new ByteArrayOutputStream();
 		Workbook wb = new HSSFWorkbook();
 	    CreationHelper createHelper = wb.getCreationHelper();
 	    CellStyle dateCellStyle = wb.createCellStyle();
 	    dateCellStyle.setDataFormat(createHelper.createDataFormat().getFormat("DD/MM/YYYY"));
 	    createSummarySheet(mAffName, dates, registerCountMap, saleQuantityMap, saleAmountMap, wb, style, dateCellStyle);
-	    createSaleDetailSheet(mAffName, dates, productQuantityMap, productAmountMap, wb, style, dateCellStyle);
+	    createSaleDetailSheet(mAffName, dates, dateTxnProductMap, productQuantityMap, productAmountMap, wb, style, dateCellStyle);
 		// Write the workbook to the output stream
 		try {
 			wb.write(baosXLS);
 			baosXLS.close();
+		}
 		return baosXLS;
+	}
     private void createSaleDetailSheet(String mAffName, SortedSet<Date> dates,
+            Map<Date, Map<Long, String>> dateTxnProductMap,
             Map<Date, Map<String, Double>> productQuantityMap,
             Map<Date, Map<String, Double>> productAmountMap, Workbook wb,
             CellStyle style, CellStyle dateCellStyle) {
         // Product Sales SHEET
         Sheet affSheet = wb.createSheet("Product Sales Report");
         affSheet.createRow(affSerialNo ++);affSheet.createRow(affSerialNo ++);
         Row affHeaderRow = affSheet.createRow(affSerialNo++);
         affHeaderRow.createCell(0).setCellValue("Date");
         affHeaderRow.createCell(1).setCellValue("ProductName");
-        affHeaderRow.createCell(2).setCellValue("Sales Count");
+        affHeaderRow.createCell(2).setCellValue("Transaction Id");
         affHeaderRow.createCell(3).setCellValue("Amount");
         for (int i=0; i<4 ;i++) {
             affHeaderRow.getCell(i).setCellStyle(style);
+        }
         Double totalQuantity = 0d;
         Double totalAmount = 0d;
         for(Date date : dates) {
-            if (!productQuantityMap.containsKey(date)) {
+            if (!dateTxnProductMap.containsKey(date)) {
                 continue;
+            }
+            //HashSet<String> tmpProductSet = new HashSet<String>();
+            String prodName = null;
+            Row commContentRow = null;
-            for (Entry<String, Double> quantityEntry : productQuantityMap.get(date).entrySet()) {
+            for (Entry<Long, String> txnEntry : dateTxnProductMap.get(date).entrySet()) {
                 affSerialNo++;
-                String prodName = quantityEntry.getKey();
+                prodName = txnEntry.getValue();
-                Double quantity = quantityEntry.getValue();
+                Long txn = txnEntry.getKey();
-                Double amount = productAmountMap.get(date).get(prodName);
-                totalQuantity += quantity;
-                totalAmount += amount;
-                Row commContentRow = affSheet.createRow(affSerialNo);
+                commContentRow = affSheet.createRow(affSerialNo);
                 commContentRow.createCell(0).setCellValue(date);
                 commContentRow.getCell(0).setCellStyle(dateCellStyle);
                 commContentRow.createCell(1).setCellValue(prodName);
-                commContentRow.createCell(2).setCellValue(quantity);
+                commContentRow.createCell(2).setCellValue(txn);
+                Double amount = productAmountMap.get(date).get(prodName);
+                amount = amount/(productQuantityMap.get(date).get(prodName));
+                totalAmount += amount;
                 commContentRow.createCell(3).setCellValue(amount);
+                totalQuantity++;
+            }
+        }
         affSerialNo+=2;
         Row commContentRow = affSheet.createRow(affSerialNo);
         commContentRow.createCell(0).setCellValue("Total");

Subversion Repositories SmartDukaan

(root)/trunk/Support/src/main/java/in/shop2020/support/controllers/AffiliateController.java – Rev 3936 → 4598