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

 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import in.shop2020.datalogger.event.OrderCreation;
 import in.shop2020.logistics.LogisticsServiceException;
 import in.shop2020.logistics.Provider;
 import in.shop2020.model.v1.catalog.InventoryService.Client;
 import in.shop2020.model.v1.catalog.Vendor;
 import in.shop2020.model.v1.order.LineItem;
 import in.shop2020.thrift.clients.CatalogClient;
 import in.shop2020.thrift.clients.LogisticsClient;
 import in.shop2020.thrift.clients.PaymentClient;
 import in.shop2020.thrift.clients.TransactionClient;
-import javassist.expr.NewArray;
 import javax.servlet.ServletContext;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
         int indexOrderId = 0;
         int indexAmount = 1;
         TransactionClient tsc;
-        PaymentClient psc;
     	int countSuccessfulSaves = 0;
         try	{
 			long settlementDate = DATE_FORMAT.parse(bluedartSettlementDate).getTime();
         	tsc = new TransactionClient();
         	in.shop2020.model.v1.order.TransactionService.Client transactionClient = tsc.getClient();
-			psc = new PaymentClient();
-	    	in.shop2020.payments.PaymentService.Client paymentClient = psc.getClient();
         	for (Row row : sheet) {
-        		Order order = null;
+    			long orderId = 0;
         		try	{
         			if(row.equals(firstRow))	continue;
-        			long orderId = (long) row.getCell(indexOrderId).getNumericCellValue();
+        			orderId = (long) row.getCell(indexOrderId).getNumericCellValue();
         			double amount = row.getCell(indexAmount).getNumericCellValue();
-        			order = transactionClient.getOrder(orderId);
-        			Payment payment = paymentClient.getPaymentForTxnId(order.getTransactionId()).get(0);
+        			transactionClient.saveCODPaymentSettlement(orderId, settlementDate, amount);
-        			logger.info("settlementDate: " + settlementDate + ", PaymentId: " + payment.getPaymentId() + ", Amount: " + amount);
+        			logger.info("SettlementDate: " + settlementDate + ", OrderId: " + orderId + ", Amount: " + amount);
-        			transactionClient.savePaymentSettlements(settlementDate, 4, payment.getPaymentId(), 0.0, 0, amount);
         			countSuccessfulSaves += 1;
-        		} catch (NullPointerException e) {
-        			logger.error("" + e);
-        		} catch (PaymentException e) {
+        		} catch (NullPointerException e) {
-        			logger.error("" + e);
+        			logger.error("For OrderId: " + orderId + " " + e);
-				} catch (TransactionServiceException e) {
+        		} catch (TransactionServiceException e) {
-					logger.error("" + e);
+					logger.error("For OrderId: " + orderId + " " + e);
-				} catch (TApplicationException e)	{
-					orderIdsWithoutSuccess.add(order.getId());
-					logger.error("Application Exception while getting successfull payment for transaction Id, " + order.getTransactionId(), e);
-					addActionError("Application Exception while getting payment for transaction Id, " + order.getTransactionId());
+				}
+        	}
         } catch (ParseException e) {
         	logger.error("Could not parse " + bluedartSettlementDate + " " + e);
+			addActionError(e.getMessage());
 		} catch (TTransportException e) {
 			logger.error("" + e);
+			addActionError(e.getMessage());
         } catch (TException e) {
         	logger.error("" + e);
+			addActionError(e.getMessage());
+        }
         addActionMessage("Successfully added Bluedart settlement details for " + countSuccessfulSaves + " orders");
+	}
 	public void uploadAramexSettlements()	{
 		Workbook wb = null;
         try {
             wb = new HSSFWorkbook(new FileInputStream(this.aramexSettlementReport));
         } catch (FileNotFoundException e) {
+        	addActionError(e.getMessage());
             logger.error("Unable to open the Settlement report", e);
         } catch (IOException e) {
+        	addActionError(e.getMessage());
             logger.error("Unable to open the Settlement report", e);
         } catch (NullPointerException e) {
         	addActionError(e.getMessage());
         	logger.error("Unable to open the Settlement report", e);
         	return;
         Row firstRow = sheet.getRow(0);
         logger.info("Cell count:" + firstRow.getPhysicalNumberOfCells());
         TransactionClient tsc;
-        PaymentClient psc;
         int countSuccessfulSaves = 0;
         try	{
 			long settlementDate = DATE_FORMAT.parse(aramexSettlementDate).getTime();
         	tsc = new TransactionClient();
         	in.shop2020.model.v1.order.TransactionService.Client transactionClient = tsc.getClient();
-			psc = new PaymentClient();
-	    	in.shop2020.payments.PaymentService.Client paymentClient = psc.getClient();
 	    	for (Row row: sheet)	{
 	    		if(row.equals(firstRow))	continue;
 	    		long orderId = (long) row.getCell(indexOrderId).getNumericCellValue();
 	    		double amount = row.getCell(indexAmount).getNumericCellValue();
-	    		Order order = null;
 	    		try {
-					order = transactionClient.getOrder(orderId);
-					Payment payment = paymentClient.getPaymentForTxnId(order.getTransactionId()).get(0);
-					transactionClient.savePaymentSettlements(settlementDate, 4, payment.getPaymentId(), 0.0, 0.0, amount);
+					transactionClient.saveCODPaymentSettlement(orderId, settlementDate, amount);
 					countSuccessfulSaves += 1;
 				} catch (TransactionServiceException e) {
 					logger.error("Transaction Service Exception while getting order for id, " + orderId, e);
 					addActionError("Transaction Service Exception while getting order for id, " + orderId);
-				} catch (PaymentException e) {
-					logger.error("Payment Service Exception while getting successfull payment for transaction Id, " + order.getTransactionId(), e);
-					addActionError("Payment Service Exception while getting payment for transaction Id, " + order.getTransactionId());
-				} catch (TApplicationException e)	{
-					orderIdsWithoutSuccess.add(orderId);
-					logger.error("Application Exception while getting successfull payment for transaction Id, " + order.getTransactionId(), e);
-					addActionError("Application Exception while getting payment for transaction Id, " + order.getTransactionId());
+				}
+	    	}
         } catch (ParseException e) {
         	addActionError("Could not parse " + aramexSettlementDate);
         	logger.error("Could not parse " + aramexSettlementDate + " " + e);
-        	return;
         } catch (TTransportException e) {
+        	addActionError(e.getMessage());
         	logger.error("" + e);
         } catch (TException e) {
+        	addActionError(e.getMessage());
         	logger.error("" + e);
+        }
         addActionMessage("Successfully added Aramex settlement details for " + countSuccessfulSaves + " orders");
+	}
 	// Prepares the XLS worksheet object and fills in the data with proper formatting
 	private ByteArrayOutputStream getReconciliationReport(long vendorId, Date startDate, Date endDate)	{
 		List<Order> billedOrders = null;
+		List<Order> settledOrders = null;
 		try	{
 			TransactionClient tsc = new TransactionClient();
 			in.shop2020.model.v1.order.TransactionService.Client transactionClient = tsc.getClient();
 			PaymentClient psc = new PaymentClient();
 			logger.info("Billed Orders count: " + billedOrders.size());
 			List<PaymentSettlement> paymentSettlements = transactionClient.getSettlementsByDate(startDate.getTime(), endDate.getTime(), false);
 			logger.info("Settlement Count: " + paymentSettlements.size());
-			List<Order> settledOrders = new ArrayList<Order>();
+			settledOrders = new ArrayList<Order>();
 			for (PaymentSettlement paymentSettlement: paymentSettlements)	{
 				Payment payment = paymentClient.getPayment(paymentSettlement.getPaymentId());
 				Transaction txn = transactionClient.getTransaction(payment.getMerchantTxnId());
 				settledOrders.addAll(txn.getOrders());
 			String errMsg = "Transaction Service Exception occured";
 			logger.error(errMsg, e);
 			addActionError(errMsg);
+		}
+		List<Order> settledOrdersForVendor = new ArrayList<Order>();
+		for (Order order: settledOrders)	{
+			if(order.getVendorId() == vendorId)	{
+				settledOrdersForVendor.add(order);
+			}
+		}
+		logger.info("Settled Order count for Vendor: " + settledOrdersForVendor.size());
 		ByteArrayOutputStream baosXLS = new ByteArrayOutputStream();
-//		return baosXLS;
 	    Workbook wb = new HSSFWorkbook();
 	    //Create the style for the title row
 	    Font font = wb.createFont();
 	    font.setBoldweight(Font.BOLDWEIGHT_BOLD);
 	    CellStyle boldStyle = wb.createCellStyle();
 	    boldStyle.setFont(font);
 	    CellStyle rightAlignStyle = wb.createCellStyle();
 	    rightAlignStyle.setAlignment(CellStyle.ALIGN_RIGHT);
 		Sheet orderSheet = wb.createSheet("Orders");
+		Sheet reshippedOrderSheet = wb.createSheet("Reshipped");
 		Sheet mismatchSheet = wb.createSheet("Mismatches");
-	    populateOrderSheet(billedOrders, startDate, endDate, orderSheet, boldStyle, rightAlignStyle);
+	    populateOrderSheet(settledOrdersForVendor, startDate, endDate, orderSheet, boldStyle, rightAlignStyle);
+	    populateReshippedOrderSheet(reshippedOrders, reshippedOrderSheet);
 	    populateMismatchSheet(mismatchSheet);
 		// Write the workbook to the output stream
 		try {
 			wb.write(baosXLS);
 	    	contentRow.createCell(OrderMismatchColumn.EXPECTED_COLLECTION.getValue()).setCellValue(misMatches.get(orderId).get("expected"));
 	    	contentRow.createCell(OrderMismatchColumn.ACTUAL_COLLECTION.getValue()).setCellValue(misMatches.get(orderId).get("actual"));
+	    }
+	}
+	private void populateReshippedOrderSheet(List<Order> orders, Sheet sheet) {
+	    short serialNo = 0;
+	    // Create the title row and put all the titles in it. Rows are 0 based.
+	    Row titleRow = sheet.createRow(serialNo ++);
+	    Cell titleCell = titleRow.createCell(0);
+	    titleCell.setCellValue("Reshipped Orders");
+	    sheet.addMergedRegion(new CellRangeAddress(0, 0, 0, 6));
+	    sheet.createRow(serialNo ++);
+	    Row headerRow = sheet.createRow(serialNo ++);
+	    headerRow.createCell(OrderReportColumn.ORDER_ID.getValue()).setCellValue("Order Id");
+	    headerRow.createCell(OrderReportColumn.ORDER_DATE.getValue()).setCellValue("Order Date");
+	    headerRow.createCell(OrderReportColumn.BILLING_NUMBER.getValue()).setCellValue("Billing Number");
+	    headerRow.createCell(OrderReportColumn.BILLING_DATE.getValue()).setCellValue("Billing Date");
+	    headerRow.createCell(OrderReportColumn.DELIVERY_DATE.getValue()).setCellValue("Delivery Date");
+	    headerRow.createCell(OrderReportColumn.SETTLEMENT_DATE.getValue()).setCellValue("Settlement Date");
+	    headerRow.createCell(OrderReportColumn.BRAND.getValue()).setCellValue("Brand");
+	    headerRow.createCell(OrderReportColumn.MODEL_NAME.getValue()).setCellValue("Model Name");
+	    headerRow.createCell(OrderReportColumn.MODEL_NUMBER.getValue()).setCellValue("Model Number");
+	    headerRow.createCell(OrderReportColumn.COLOR.getValue()).setCellValue("Color");
+	    headerRow.createCell(OrderReportColumn.QUANTITY.getValue()).setCellValue("Quantity");
+	    headerRow.createCell(OrderReportColumn.UNIT_TRANSFER_PRICE.getValue()).setCellValue("Unit Transfer Price");
+	    headerRow.createCell(OrderReportColumn.UNIT_SELLING_PRICE.getValue()).setCellValue("Unit Selling Price");
+	    headerRow.createCell(OrderReportColumn.TOTAL_TRANSFER_PRICE.getValue()).setCellValue("Total Transfer Price");
+	    headerRow.createCell(OrderReportColumn.TOTAL_SELLING_PRICE.getValue()).setCellValue("Total Selling Price");
+	    headerRow.createCell(OrderReportColumn.CURRENT_STATUS.getValue()).setCellValue("Current Status");
+	    headerRow.createCell(OrderReportColumn.GATEWAY_TRANSACTION_ID.getValue()).setCellValue("Gateway Transaction Id");
+	    headerRow.createCell(OrderReportColumn.PAYMENT_TYPE.getValue()).setCellValue("Payment Type");
+	    headerRow.createCell(OrderReportColumn.PAYMENT_STATUS.getValue()).setCellValue("Payment Status");
+	    headerRow.createCell(OrderReportColumn.PAYMENT_ID.getValue()).setCellValue("Payment Id");
+	    headerRow.createCell(OrderReportColumn.COUPON_CODE.getValue()).setCellValue("Coupon Code");
+//	    headerRow.createCell(OrderReportColumn.COUPON_CATEGORY.getValue()).setCellValue("Coupon Category");
+//	    headerRow.createCell(OrderReportColumn.DISCOUNT.getValue()).setCellValue("Discount");
+	    headerRow.createCell(OrderReportColumn.SERVICE_TAX.getValue()).setCellValue("Service Tax");
+	    headerRow.createCell(OrderReportColumn.OTHER_CHARGES.getValue()).setCellValue("Other Charges");
+	    headerRow.createCell(OrderReportColumn.NET_COLLECTION.getValue()).setCellValue("Net Collection");
+	    sheet.createRow(serialNo ++);
+		TransactionClient tsc;
+    	PaymentClient psc;
+    	LogisticsClient lsc;
+		try {
+			tsc = new TransactionClient();
+			in.shop2020.model.v1.order.TransactionService.Client transactionClient = tsc.getClient();
+			psc = new PaymentClient();
+	    	in.shop2020.payments.PaymentService.Client paymentClient = psc.getClient();
+	    	lsc = new LogisticsClient();
+	    	in.shop2020.logistics.LogisticsService.Client logisticsClient = lsc.getClient();
+	    	Map<Long, String> codProviders = new HashMap<Long, String>();
+	    	for (Provider provider: logisticsClient.getAllProviders())	{
+	    		codProviders.put(provider.getId(), provider.getName());
+	    	}
+	    	List<PaymentGateway> tPaymentGateways = paymentClient.getActivePaymentGateways();
+	    	Map<Long, String> paymentGateways = new HashMap<Long, String>();
+	    	for (PaymentGateway tPaymentGateway: tPaymentGateways)	{
+	    		paymentGateways.put(tPaymentGateway.getId(), tPaymentGateway.getName());
+	    	}
+			int countMultipleOrderTxns = 0;
+			for (Order order: orders)	{
+			    logger.info("For order: " + order.getId());
+			    LineItem lineItem = order.getLineitems().get(0);
+			    double transferPrice = lineItem.getTransfer_price();
+			    Payment payment = null;
+			    try	{
+			    	if(order.isCod())	{
+			    		payment = paymentClient.getPaymentForTxnId(order.getTransactionId()).get(0);
+			    	} else	{
+			    		payment = paymentClient.getSuccessfulPaymentForTxnId(order.getTransactionId());
+			    	}
+				    logger.info("getSuccessfulPaymentForTxnId, " + order.getTransactionId() + ": " + payment);
+			    } catch (TApplicationException e)	{
+			    	orderIdsWithoutSuccess.add(order.getId());
+			    	String errMsg = "Exception while getting successfull payment for transaction Id, " + order.getTransactionId();
+					logger.error(errMsg, e);
+					addActionError(errMsg);
+				}
+			    Transaction txn = transactionClient.getTransaction(order.getTransactionId());
+			    PaymentSettlement paymentSettlement = null;
+			    String paymentType = null;
+			    if(payment != null)	{
+			    	paymentSettlement = transactionClient.getSettlementForPaymentId(payment.getPaymentId());
+			    	paymentType = paymentGateways.get(payment.getGatewayId());
+			    }
+	            double totalSellingPrice = lineItem.getTotal_price();
+	            double serviceTax = 0.0;
+	            double otherCollectionCharges = 0.0;
+	            double netCollection = 0.0;
+	            if(paymentSettlement != null)	{
+		            serviceTax = paymentSettlement.getServiceTax();
+		            otherCollectionCharges = paymentSettlement.getOtherCharges();
+		            netCollection = paymentSettlement.getNetCollection();
+	            }
+	            if (netCollection < 0.0)	{
+	            	paymentType = paymentType + "-REFUND";
+	            }
+		    	Row contentRow = sheet.createRow(serialNo++);
+	            contentRow.createCell(OrderReportColumn.ORDER_ID.getValue()).setCellValue(order.getId());
+	            contentRow.createCell(OrderReportColumn.ORDER_DATE.getValue()).setCellValue(DATE_FORMAT.format(new Date(order.getCreated_timestamp())));
+			    contentRow.createCell(OrderReportColumn.BILLING_NUMBER.getValue()).setCellValue(order.getInvoice_number());
+			    contentRow.createCell(OrderReportColumn.BILLING_DATE.getValue()).setCellValue(DATE_FORMAT.format(new Date(order.getBilling_timestamp())));
+			    contentRow.createCell(OrderReportColumn.DELIVERY_DATE.getValue()).setCellValue(DATE_FORMAT.format(new Date(order.getDelivery_timestamp())));
+			    contentRow.createCell(OrderReportColumn.BRAND.getValue()).setCellValue(getValueForEmptyString(lineItem.getBrand()));
+			    contentRow.createCell(OrderReportColumn.MODEL_NAME.getValue()).setCellValue(getValueForEmptyString(lineItem.getModel_name()));
+			    contentRow.createCell(OrderReportColumn.MODEL_NUMBER.getValue()).setCellValue(getValueForEmptyString(lineItem.getModel_number()));
+			    contentRow.createCell(OrderReportColumn.COLOR.getValue()).setCellValue(getValueForEmptyString(lineItem.getColor()));
+			    contentRow.createCell(OrderReportColumn.QUANTITY.getValue()).setCellValue(lineItem.getQuantity());
+			    contentRow.createCell(OrderReportColumn.UNIT_TRANSFER_PRICE.getValue()).setCellValue(transferPrice);
+			    contentRow.createCell(OrderReportColumn.UNIT_SELLING_PRICE.getValue()).setCellValue(lineItem.getUnit_price());
+			    contentRow.createCell(OrderReportColumn.TOTAL_TRANSFER_PRICE.getValue()).setCellValue(transferPrice * lineItem.getQuantity());
+			    contentRow.createCell(OrderReportColumn.TOTAL_SELLING_PRICE.getValue()).setCellValue(totalSellingPrice);
+			    contentRow.createCell(OrderReportColumn.CURRENT_STATUS.getValue()).setCellValue(order.getStatusDescription());
+		    	double refund = 0.0;
+		    	if(order.isCod())	{
+		    		contentRow.createCell(OrderReportColumn.PAYMENT_TYPE.getValue()).setCellValue("COD - " + codProviders.get(order.getLogistics_provider_id()));
+		    	} else	{
+			    	contentRow.createCell(OrderReportColumn.PAYMENT_TYPE.getValue()).setCellValue(paymentType);
+		    	}
+			    if (payment != null)	{
+				    contentRow.createCell(OrderReportColumn.SETTLEMENT_DATE.getValue()).setCellValue(DATE_FORMAT.format(new Date(paymentSettlement.getSettlementDate())));
+			    	contentRow.createCell(OrderReportColumn.GATEWAY_TRANSACTION_ID.getValue()).setCellValue(payment.getGatewayTxnId());
+			    	contentRow.createCell(OrderReportColumn.PAYMENT_STATUS.getValue()).setCellValue(payment.getStatus().name());
+			    	contentRow.createCell(OrderReportColumn.PAYMENT_ID.getValue()).setCellValue(payment.getPaymentId());
+			    }
+			    contentRow.createCell(OrderReportColumn.COUPON_CODE.getValue()).setCellValue(txn.getCoupon_code());
+			    contentRow.createCell(OrderReportColumn.SERVICE_TAX.getValue()).setCellValue(serviceTax);
+			    contentRow.createCell(OrderReportColumn.OTHER_CHARGES.getValue()).setCellValue(otherCollectionCharges);
+			    contentRow.createCell(OrderReportColumn.NET_COLLECTION.getValue()).setCellValue(netCollection);
+			}
+		    logger.info("Order Ids where no successful payment was found: " + orderIdsWithoutSuccess.size());
+		    logger.info(orderIdsWithoutSuccess.toString());
+	    	sheet.createRow(serialNo++);
+		} catch (TTransportException e) {
+			logger.error("TTransportException " + e);
+		} catch (PaymentException e) {
+			logger.error("PaymentException " + e);
+		} catch (TException e) {
+			logger.error("TException " + e);
+		} catch (TransactionServiceException e) {
+			logger.error("Transaction Service Exception " + e);
+		} catch (LogisticsServiceException e) {
+			addActionError("Error loading list of COD providers");
+			logger.error("Logistics Service Exception " + e);
+		}
+	}
 	private void populateOrderSheet(List<Order> orders, Date startDate, Date endDate, Sheet sheet, CellStyle style, CellStyle rightAlignStyle) {
 	    short serialNo = 0;
 	    // Create the title row and put all the titles in it. Rows are 0 based.
 	    Row titleRow = sheet.createRow(serialNo ++);
 	    headerRow.createCell(OrderReportColumn.SERVICE_TAX.getValue()).setCellValue("Service Tax");
 	    headerRow.createCell(OrderReportColumn.OTHER_CHARGES.getValue()).setCellValue("Other Charges");
 	    headerRow.createCell(OrderReportColumn.NET_COLLECTION.getValue()).setCellValue("Net Collection");
 	    headerRow.createCell(OrderReportColumn.REFUND.getValue()).setCellValue("Refund");
 	    headerRow.createCell(OrderReportColumn.FINAL_AMOUNT.getValue()).setCellValue("Final Amount");
-	    headerRow.createCell(OrderReportColumn.IS_RESHIPED_ORDER.getValue()).setCellValue("Is Reshipped Order");
 	    sheet.createRow(serialNo ++);
 		TransactionClient tsc;
     	PaymentClient psc;
 	    	for (PaymentGateway tPaymentGateway: tPaymentGateways)	{
 	    		paymentGateways.put(tPaymentGateway.getId(), tPaymentGateway.getName());
+	    	}
-			List<PaymentSettlement> settlements = transactionClient.getSettlementsByDate(startDate.getTime(), endDate.getTime(), true);
-			logger.info("Refunds: " + settlements.size());
-			logger.info(settlements.toString());
-			Map<Long, PaymentSettlement> refunds = new HashMap<Long, PaymentSettlement>();
-			for (PaymentSettlement settlement: settlements)	{
-				refunds.put(settlement.getPaymentId(), settlement);
-			}
 			List <Long> orderIds = new ArrayList<Long>();
 			Map<Long, List<Order>> orderMap = new HashMap<Long, List<Order>>();
 			int countMultipleOrderTxns = 0;
 			for(Order order : orders)	{
+				if(order.getBilling_timestamp() == 0)	{
+					continue;
+				}
 				orderIds.add(order.getId());
 				if (orderMap.containsKey(order.getTransactionId()))	{
 					orderMap.get(order.getTransactionId()).add(order);
 					countMultipleOrderTxns += 1;
 			for(long txnId: orderMap.keySet())	{
 				List<Order> orderList = orderMap.get(txnId);
 				for (Order order: orderList)	{
 				    logger.info("For order: " + order.getId());
-				    boolean isReshippedOrder = reshippedOrderIds.contains(order.getId());
+				    // Orders where payment was captured but never billed
+				    if(order.getBilling_timestamp() == 0)	{
+						continue;
+					}
-				    if (isReshippedOrder)	{
+				    if (reshippedOrderIds.contains(order.getId()))	{
 				    	reshippedOrders.add(order);
-//				    	orderList.remove(order);
-//				    	orderMap.get(txnId).remove(order);
 				    	continue;
+				    }
 				    LineItem lineItem = order.getLineitems().get(0);
 				    double transferPrice = lineItem.getTransfer_price();
 				    if (payment != null)	{
 					    contentRow.createCell(OrderReportColumn.SETTLEMENT_DATE.getValue()).setCellValue(DATE_FORMAT.format(new Date(paymentSettlement.getSettlementDate())));
 				    	contentRow.createCell(OrderReportColumn.GATEWAY_TRANSACTION_ID.getValue()).setCellValue(payment.getGatewayTxnId());
 				    	contentRow.createCell(OrderReportColumn.PAYMENT_STATUS.getValue()).setCellValue(payment.getStatus().name());
 				    	contentRow.createCell(OrderReportColumn.PAYMENT_ID.getValue()).setCellValue(payment.getPaymentId());
-				    	if(refunds.containsKey(payment.getPaymentId()))	{
-				    		refund = refunds.get(payment.getPaymentId()).getNetCollection();
-				    		refunds.remove(payment.getPaymentId());
-				    	}
-				    	contentRow.createCell(OrderReportColumn.REFUND.getValue()).setCellValue(refund);
+				    }
 				    contentRow.createCell(OrderReportColumn.COUPON_CODE.getValue()).setCellValue(txn.getCoupon_code());
 				    contentRow.createCell(OrderReportColumn.SERVICE_TAX.getValue()).setCellValue(serviceTax);
 				    contentRow.createCell(OrderReportColumn.OTHER_CHARGES.getValue()).setCellValue(otherCollectionCharges);
 				    contentRow.createCell(OrderReportColumn.NET_COLLECTION.getValue()).setCellValue(netCollection);
 				    contentRow.createCell(OrderReportColumn.FINAL_AMOUNT.getValue()).setCellValue(netCollection - refund);
-				    contentRow.createCell(OrderReportColumn.IS_RESHIPED_ORDER.getValue()).setCellValue(isReshippedOrder ? 1 : 0);
+				}
+			}
 			logger.info("Reshipped Orders ", reshippedOrders);
 		    logger.info("Order Ids where no successful payment was found: " + orderIdsWithoutSuccess.size());
 		    logger.info(orderIdsWithoutSuccess.toString());
-		    logger.info("Pending Refunds: " + refunds);
-		    logger.info("Reshipped Order Ids" + reshippedOrderIds);
+		    logger.info("Reshipped Order Ids: " + reshippedOrderIds);
 			logger.info("countMultipleOrderTxns: " + countMultipleOrderTxns);
 	    	sheet.createRow(serialNo++);
+			List<PaymentSettlement> refundSettlements = transactionClient.getSettlementsByDate(startDate.getTime(), endDate.getTime(), true);
+			logger.info("Refunds: " + refundSettlements.size());
+			logger.info(refundSettlements.toString());
+			Map<Long, PaymentSettlement> refunds = new HashMap<Long, PaymentSettlement>();
+			for (PaymentSettlement settlement: refundSettlements)	{
+				refunds.put(settlement.getPaymentId(), settlement);
+			}
 		    // Refunds belonging to orders billed before the start date of supplied billing date range
 		    for (long paymentId: refunds.keySet())	{
 		    	Payment payment = paymentClient.getPayment(paymentId);
 		    	Transaction txn = transactionClient.getTransaction(payment.getMerchantTxnId());
 		    	PaymentSettlement paymentSettlement = refunds.get(paymentId);
 				    contentRow.createCell(OrderReportColumn.UNIT_TRANSFER_PRICE.getValue()).setCellValue(transferPrice);
 				    contentRow.createCell(OrderReportColumn.UNIT_SELLING_PRICE.getValue()).setCellValue(lineItem.getUnit_price());
 				    contentRow.createCell(OrderReportColumn.TOTAL_TRANSFER_PRICE.getValue()).setCellValue(transferPrice * lineItem.getQuantity());
 				    contentRow.createCell(OrderReportColumn.TOTAL_SELLING_PRICE.getValue()).setCellValue(totalSellingPrice);
 				    contentRow.createCell(OrderReportColumn.CURRENT_STATUS.getValue()).setCellValue(order.getStatusDescription());
 				    contentRow.createCell(OrderReportColumn.SETTLEMENT_DATE.getValue()).setCellValue(DATE_FORMAT.format(new Date(paymentSettlement.getSettlementDate())));
 			    	contentRow.createCell(OrderReportColumn.GATEWAY_TRANSACTION_ID.getValue()).setCellValue(payment.getGatewayTxnId());
 			    	contentRow.createCell(OrderReportColumn.PAYMENT_TYPE.getValue()).setCellValue(paymentType);
 			    	contentRow.createCell(OrderReportColumn.PAYMENT_ID.getValue()).setCellValue(payment.getPaymentId());
-			    	contentRow.createCell(OrderReportColumn.REFUND.getValue()).setCellValue(paymentSettlement.getNetCollection());
 				    contentRow.createCell(OrderReportColumn.COUPON_CODE.getValue()).setCellValue(txn.getCoupon_code());
 				    contentRow.createCell(OrderReportColumn.SERVICE_TAX.getValue()).setCellValue(0.0);
 				    contentRow.createCell(OrderReportColumn.OTHER_CHARGES.getValue()).setCellValue(0.0);
 				    contentRow.createCell(OrderReportColumn.NET_COLLECTION.getValue()).setCellValue(paymentSettlement.getNetCollection());

Subversion Repositories SmartDukaan

(root)/trunk/Support/src/main/java/in/shop2020/support/controllers/VendorReconciliationController.java – Rev 4745 → 4875