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

 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import javax.servlet.ServletContext;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
+import org.apache.commons.io.IOUtils;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellStyle;
 import org.apache.poi.ss.usermodel.Font;
 import org.apache.poi.ss.usermodel.Row;
 	private Map<Long, Map<String, Double>> misMatches = new HashMap<Long, Map<String, Double>>();
 	private Map<Long, String> ebsSettlementSummaries;
 	private List<OrderStatus> refundOrderStatuses;
-	private List<Order> refundedOrdersBilledinDateRange = new ArrayList<Order>();
 	private List<Order> reshippedOrders = new ArrayList<Order>();
+	private List<Order> refundedOrders = new ArrayList<Order>();
+	private List<Order> unsettledOrders = new ArrayList<Order>();
-	private Map<Long, PaymentSettlement> paymentSettlementsMap;
+	private Map<Long, PaymentSettlement> paymentSettlementsMap = new HashMap<Long, PaymentSettlement>();
 	private final DateFormat DATE_FORMAT = new SimpleDateFormat("dd/MM/yyyy");
 	private int rowCount = 0;
 		} else if (formType.equals("uploadAramexSettlements")) {
 			uploadAramexSettlements();
 		} else if (formType.equals("markOrdersAsPaid"))	{
-//			uploadOrderIdsToBeMarkedPaid();
+			uploadOrderIdsToBeMarkedPaid();
+		}
 	    logger.info("Order Ids where no successful payment was found", orderIdsWithoutSuccess);
 		initiatializeDashboard();
 		return new DefaultHttpHeaders("report");
+	}
 	public HttpHeaders generateReconciliationReport()	{
 		DateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy");
+		initiatializeDashboard();
 		try	{
 			//Formatting Form input parameters
 //		    Date startDate = dateFormat.parse(request.getParameter("start"));
 //			Date endDate = dateFormat.parse(request.getParameter("end"));
         addActionMessage("Successfully added Aramex settlement details for " + countSuccessfulSaves + " orders");
+	}
 	public void uploadOrderIdsToBeMarkedPaid()	{
 		logger.info("Uploading Order Ids to be marked as paid");
+		List<Long> orderIds = new ArrayList<Long>();
-		Workbook wb = null;
-        try {
+		try {
-        	wb = new XSSFWorkbook(new FileInputStream(this.orderIdsToBeMarkedPaid));
+			FileInputStream uploadedFile = new FileInputStream(this.orderIdsToBeMarkedPaid);
-        } catch (FileNotFoundException e) {
+			String uploadedContent = IOUtils.toString(uploadedFile);
-        	addActionError(e.getMessage());
+			for(String s: uploadedContent.trim().split("\n"))	{
-            logger.error("Unable to open the sheet containing orders for which vendor is paid", e);
+				if(! s.trim().isEmpty())	orderIds.add(Long.parseLong(s));
-        	return;
+			}
-        } catch (IOException e) {
+		} catch (FileNotFoundException e) {
-        	addActionError(e.getMessage());
+			addActionError(e.getMessage());
             logger.error("Unable to open the sheet containing orders for which vendor is paid", e);
-        	return;
-        } catch (NullPointerException e) {
+		} catch (IOException e) {
-        	addActionError(e.getMessage());
+			addActionError(e.getMessage());
-        	logger.error("Unable to open the sheet containing orders for which vendor is paid", e);
+            logger.error("IOException occured while reading the file containing orders for which vendor is paid", e);
-        	return;
+		}
-        Sheet sheet = wb.getSheetAt(0);
-        int indexOrderId = 0;
         TransactionClient tsc;
         int countSuccessfulSaves = 0;
-//        try	{
+        try	{
-//        	tsc = new TransactionClient();
+        	tsc = new TransactionClient();
-//        	in.shop2020.model.v1.order.TransactionService.Client transactionClient = tsc.getClient();
+        	in.shop2020.model.v1.order.TransactionService.Client transactionClient = tsc.getClient();
-//
-//	    	for (Row row: sheet)	{
+	    	for (long orderId: orderIds)	{
-//
-//	    		if(row.getCell(indexOrderId).getStringCellValue().equals(""))	break;
-//
-//	    		long orderId = Long.parseLong(row.getCell(indexOrderId).getStringCellValue());
-//	    		logger.info("Aramex Settlement, Order Id: " + orderId);
+	    		logger.info("Aramex Settlement, Order Id: " + orderId);
-//	    		try {
+	    		try {
-//	    			transactionClient.updateOrderAsPaidToVendor(orderId);
+	    			transactionClient.updateOrderAsPaidToVendor(orderId);
-//					countSuccessfulSaves += 1;
+					countSuccessfulSaves += 1;
-//
-//				} catch (TransactionServiceException e) {
+				} catch (TransactionServiceException e) {
-//					logger.error("Transaction Service Exception while getting order for id, " + orderId, e);
+					logger.error("Transaction Service Exception while getting order for id, " + orderId, e);
-//					addActionError("Transaction Service Exception while getting order for id, " + orderId);
+					addActionError("Transaction Service Exception while getting order for id, " + orderId);
-//				}
+				}
-//	    	}
+	    	}
-//        } catch (TTransportException e) {
+        } catch (TTransportException e) {
-//        	addActionError(e.getMessage());
+        	addActionError(e.getMessage());
-//        	logger.error("" + e);
+        	logger.error("" + e);
-//
-//        } catch (TException e) {
+        } catch (TException e) {
-//        	addActionError(e.getMessage());
+        	addActionError(e.getMessage());
-//        	logger.error("" + e);
+        	logger.error("" + e);
-//        }
+        }
         addActionMessage("Successfully marked " + countSuccessfulSaves + " orders as paid to vendor");
+	}
-	// Prepares the XLS worksheet object and fills in the data with proper formatting
 	private ByteArrayOutputStream getReconciliationReport(long vendorId)	{
-		List<PaymentSettlement> paymentSettlements = new ArrayList<PaymentSettlement>();
-		List<PaymentSettlement> refundPaymentSettlements = new ArrayList<PaymentSettlement>();
 		try	{
 			TransactionClient tsc = new TransactionClient();
 			in.shop2020.model.v1.order.TransactionService.Client transactionClient = tsc.getClient();
+	    	PaymentClient psc = new PaymentClient();
+	    	in.shop2020.payments.PaymentService.Client paymentClient = psc.getClient();
-			paymentSettlements = transactionClient.getSettlementsByDate(0, (new Date()).getTime(), false);
+			List<Order> unpaidOrders = transactionClient.getOrdersWhereVendorNotPaid(vendorId);
-			logger.info("Settlement Count: " + paymentSettlements.size());
+			logger.info("Unpaid Order count: " + unpaidOrders.size());
+			Map<Long, List<Order>> mapAllOrders = new HashMap<Long, List<Order>>();
+			for(Order order: unpaidOrders)	{
+				if(order.getOriginalOrderId() == 0)	{
+					List<Order> l = new LinkedList<Order>();
+					l.add(order);
+					mapAllOrders.put(order.getId(), l);
+				} else if(mapAllOrders.containsKey(order.getOriginalOrderId()))	{
+					List<Order> l = mapAllOrders.get(order.getOriginalOrderId());
+					l.add(order);
+					mapAllOrders.put(order.getOriginalOrderId(), l);
+				} else	{
+					List<Order> l = new LinkedList<Order>();
+					l.add(order);
+					mapAllOrders.put(order.getOriginalOrderId(), l);
+				}
+			}
+			logger.info("Unpaid Order count in Map: " + mapAllOrders.size());
+	    	int pmtSettlementFoundNull = 0;
+	    	int pmtSettlementFound = 0;
+			for (long originalOrderId: mapAllOrders.keySet())	{
+				List <Order> orders = mapAllOrders.get(originalOrderId);
+				try {
+					PaymentSettlement pmtSettlement = null;
+					if(orders.get(0).isCod())	{	// COD Order(s)
+						long settledOrderId = 0;
+						for (Order order: orders)	{
-			refundPaymentSettlements = transactionClient.getSettlementsByDate(0, (new Date()).getTime(), true);
+							pmtSettlement = transactionClient.getSettlementForReferenceId(order.getId(), false);
+							if(pmtSettlement.getReferenceId() > 0)	{
+								settledOrderId = order.getId();
+								paymentSettlementsMap.put(order.getId(), pmtSettlement);
+							} else	{
+								pmtSettlementFoundNull ++;
+							}
+						}
+						if(settledOrderId > 0)	{	// Adding unsettled clone orders to re-shipped orders
+							for (Order order: orders)	{
+								if (order.getId() != settledOrderId)	{
+									reshippedOrders.add(order);
+								}
+							}
+						} else	{
+							unsettledOrders.addAll(orders);
+						}
+					} else	{						// Prepaid Order(s)
+						Payment payment = paymentClient.getSuccessfulPaymentForTxnId(orders.get(0).getTransactionId());
+						// Checking if this payment settlement has already been fetched
+						if(! paymentSettlementsMap.containsKey(payment.getPaymentId()))	{
+							pmtSettlement = transactionClient.getSettlementForReferenceId(payment.getPaymentId(), false);
+							if(pmtSettlement.getReferenceId() > 0)	{
+								paymentSettlementsMap.put(payment.getPaymentId(), pmtSettlement);
+							} else	{
+								unsettledOrders.addAll(orders);
+								pmtSettlementFoundNull ++;
+							}
+						}
+						if(orders.size() > 1)	{
+							reshippedOrders.addAll(orders.subList(1, orders.size()));
+						}
+					}
+				} catch (PaymentException e) {
+					logger.error("" + e);
+				}
+			}
+			logger.info("pmtSettlementFoundNull: " + pmtSettlementFoundNull);
-			logger.info("Refund Settlement Count: " + refundPaymentSettlements.size());
+			logger.info("Reshipped Orders count: " + reshippedOrders.size());
 		} catch	(TransactionServiceException e)	{
 			String errMsg = "Transaction Service Exception occured";
 			logger.error(errMsg, e);
 			addActionError(errMsg);
 			// TODO Auto-generated
 			String errMsg = "Transaction Service Exception occured";
 			logger.error(errMsg, e);
 			addActionError(errMsg);
+		}
+		logger.info("Payment Settlement Count: " + paymentSettlementsMap.keySet().size());
+		logger.info("Unsettled Orders Count: " + unsettledOrders.size());
 		ByteArrayOutputStream baosXLS = new ByteArrayOutputStream();
 	    Workbook wb = new HSSFWorkbook();
 	    boldStyle.setFont(font);
 	    CellStyle rightAlignStyle = wb.createCellStyle();
 	    rightAlignStyle.setAlignment(CellStyle.ALIGN_RIGHT);
-		Sheet orderSheet = wb.createSheet("Orders");
+		Sheet orderSheet = wb.createSheet("Settled Orders");
+		Sheet unsettledOrderSheet = wb.createSheet("Unsettled Orders");
 		Sheet reshippedOrderSheet = wb.createSheet("Reshipped");
-		Sheet mismatchSheet = wb.createSheet("Mismatches");
+//		Sheet mismatchSheet = wb.createSheet("Mismatches");
-	    populateOrderSheet(paymentSettlements, refundPaymentSettlements, vendorId, orderSheet, boldStyle, rightAlignStyle);
+	    populateOrderSheet(vendorId, orderSheet, boldStyle, rightAlignStyle);
+		populateUnsettledOrderSheet(unsettledOrderSheet);
-//	    populateReshippedOrderSheet(reshippedOrders, reshippedOrderSheet);
+	    populateReshippedOrderSheet(reshippedOrders, reshippedOrderSheet);
 //	    populateMismatchSheet(mismatchSheet);
 		// Write the workbook to the output stream
 		try {
 			wb.write(baosXLS);
 			baosXLS.close();
 		} catch (IOException e) {
 			logger.error("Unable to write the hotspot reconciliation report to the byte array", e);
 		}
 		return baosXLS;
+	}
 	private void populateMismatchSheet(Sheet sheet)	{
 	    int serialNo = 0;
 	    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;
 			    Transaction txn = transactionClient.getTransaction(order.getTransactionId());
 			    PaymentSettlement paymentSettlement = null;
 			    String paymentType = null;
 			    if(payment != null)	{
-			    	paymentSettlement = transactionClient.getSettlementForPaymentId(payment.getPaymentId());
+//			    	paymentSettlement = transactionClient.getSettlementForPaymentId(payment.getPaymentId());
-			    	paymentType = paymentGateways.get(payment.getGatewayId());
+//			    	paymentType = paymentGateways.get(payment.getGatewayId());
+			    }
 	            double totalSellingPrice = lineItem.getTotal_price();
 	            double serviceTax = 0.0;
 	            double otherCollectionCharges = 0.0;
 		    	} 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.SETTLEMENT_DATE.getValue()).setCellValue(DATE_FORMAT.format(new Date(paymentSettlement.getSettlementDate())));
-			    	contentRow.createCell(OrderReportColumn.PAYMENT_STATUS.getValue()).setCellValue(payment.getStatus().name());
+//			    	contentRow.createCell(OrderReportColumn.PAYMENT_STATUS.getValue()).setCellValue(payment.getStatus().name());
-			    	contentRow.createCell(OrderReportColumn.PAYMENT_ID.getValue()).setCellValue(payment.getPaymentId());
+//			    	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());
 			addActionError("Error loading list of COD providers");
 			logger.error("Logistics Service Exception " + e);
+		}
+	}
+	private void populateUnsettledOrderSheet(Sheet sheet)	{
+		rowCount = 0;
+	    Row headerRow = sheet.createRow(rowCount ++);
+	    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.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");
+	    sheet.createRow(rowCount ++);
+    	PaymentClient psc;
+    	logger.info("unsettledOrders count: " + unsettledOrders.size());
+    	try	{
+			psc = new PaymentClient();
+	    	in.shop2020.payments.PaymentService.Client paymentClient = psc.getClient();
+			for (Order order: unsettledOrders)	{
+				Row contentRow = sheet.createRow(rowCount ++);
+				LineItem lineItem = order.getLineitems().get(0);
+				Payment pmt = null;
+				if(order.isCod())	{
+					pmt = paymentClient.getPaymentForTxnId(order.getTransactionId()).get(0);
+				} else	{
+					pmt = paymentClient.getSuccessfulPaymentForTxnId(order.getTransactionId());
+				}
+		        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(lineItem.getTransfer_price());
+			    contentRow.createCell(OrderReportColumn.UNIT_SELLING_PRICE.getValue()).setCellValue(lineItem.getUnit_price());
+			    contentRow.createCell(OrderReportColumn.TOTAL_TRANSFER_PRICE.getValue()).setCellValue(lineItem.getTransfer_price() * lineItem.getQuantity());
+			    contentRow.createCell(OrderReportColumn.TOTAL_SELLING_PRICE.getValue()).setCellValue(lineItem.getTotal_price());
+			    contentRow.createCell(OrderReportColumn.CURRENT_STATUS.getValue()).setCellValue(order.getStatusDescription());
+			    if(pmt.getGatewayId() == 4)	{
+			    	contentRow.createCell(OrderReportColumn.PAYMENT_TYPE.getValue()).setCellValue("COD-" + codProviders.get(order.getLogistics_provider_id()));
+			    } else	{
+			    	contentRow.createCell(OrderReportColumn.PAYMENT_TYPE.getValue()).setCellValue(paymentGateways.get(pmt.getGatewayId()));
+			    }
+		    	contentRow.createCell(OrderReportColumn.PAYMENT_STATUS.getValue()).setCellValue(pmt.getStatus().name());
+		    	contentRow.createCell(OrderReportColumn.PAYMENT_ID.getValue()).setCellValue(pmt.getPaymentId());
+	    	}
+	    } catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
-	private void populateOrderSheet(List<PaymentSettlement> paymentSettlements, List<PaymentSettlement> refundSettlements, long vendorId, Sheet sheet, CellStyle style, CellStyle rightAlignStyle) {
+	private void populateOrderSheet(long vendorId, Sheet sheet, CellStyle style, CellStyle rightAlignStyle) {
 	    // Create the title row and put all the titles in it. Rows are 0 based
 	    Row titleRow = sheet.createRow(rowCount ++);
 	    Cell titleCell = titleRow.createCell(0);
 	    titleCell.setCellValue("Order Reconciliation Report");
     	LogisticsClient lsc;
 		try {
 			tsc = new TransactionClient();
 			in.shop2020.model.v1.order.TransactionService.Client transactionClient = tsc.getClient();
 	    	lsc = new LogisticsClient();
 	    	in.shop2020.logistics.LogisticsService.Client logisticsClient = lsc.getClient();
 			psc = new PaymentClient();
 	    	in.shop2020.payments.PaymentService.Client paymentClient = psc.getClient();
 	    	List<PaymentGateway> tPaymentGateways = paymentClient.getActivePaymentGateways();
 	    			this.settlement = settlement;
 	    			this.payment = pmt;
 	    			this.transaction = txn;
+	    		}
+	    	}
-	    	List<Long> allOrderIds = new ArrayList<Long>();
-	    	Map<Long, PaymentSettlementMap> referenceMap = new HashMap<Long, PaymentSettlementMap>();
-	    	for (PaymentSettlement paymentSettlement: paymentSettlements)	{
-	    		try {
-    				if(paymentSettlement.getPaymentGatewayId() == 4)	{	// If COD
-	    				Order order = transactionClient.getOrder(paymentSettlement.getReferenceId());
-	    				Transaction txn = transactionClient.getTransaction(order.getTransactionId());
-	    				Payment payment = paymentClient.getPaymentForTxnId(txn.getId()).get(0);
-		    			if (order.getVendorId() == vendorId)	{
-		    				allOrderIds.add(order.getId());
-		    			}
-    				} else	{	// If prepaid
-    					Payment payment = paymentClient.getPayment(paymentSettlement.getReferenceId());
-    					Transaction txn = transactionClient.getTransaction(payment.getMerchantTxnId());
-    					for (Order order: txn.getOrders())	{
-    						allOrderIds.add(order.getId());
-    					}
-    				}
-    			} catch (TransactionServiceException e) {
-					logger.error("TransactionServiceException " + e);
-				} catch (TException e) {
-					logger.error("TException " + e);
-				} catch (PaymentException e) {
-					logger.error("PaymentException " + e);
-				}
-	    	}
-	    	for (PaymentSettlement paymentSettlement: paymentSettlements)	{
+	    	for (PaymentSettlement paymentSettlement: paymentSettlementsMap.values())	{
     			try {
     				if(paymentSettlement.getPaymentGatewayId() == 4)	{	// If COD
 	    				Order order = transactionClient.getOrder(paymentSettlement.getReferenceId());
 	    				Transaction txn = transactionClient.getTransaction(order.getTransactionId());
 		    			if (order.getVendorId() == vendorId)	{
 					    	Row contentRow = sheet.createRow(rowCount ++);
 					    	outputCODRow(contentRow, paymentSettlement, order, txn, payment);
+		    			}
     				} else	{	// If prepaid
+    					logger.info("ReferenceId: " + paymentSettlement.getReferenceId());
     					Payment payment = paymentClient.getPayment(paymentSettlement.getReferenceId());
     					Transaction txn = transactionClient.getTransaction(payment.getMerchantTxnId());
     					outputPrepaidTransactionRows(sheet, vendorId, paymentSettlement, txn, payment);
+    				}
     			} catch (TransactionServiceException e) {
 					logger.error("TransactionServiceException " + e);
 				} catch (TException e) {
-					logger.error("TException " + e);
+					e.printStackTrace();
 				} catch (PaymentException e) {
 					logger.error("PaymentException " + e);
+				}
+	    	}
 	    	rowCount ++;
+	    	logger.info("Refunded Order Count: " + refundedOrders.size());
-	    	for (PaymentSettlement paymentSettlement: refundSettlements)	{
+	    	for (Order order: refundedOrders)	{
 	    		try {
+					Transaction txn = transactionClient.getTransaction(order.getTransactionId());
-	    			Payment payment = paymentClient.getPayment(paymentSettlement.getReferenceId());
+	    			Payment payment = paymentClient.getSuccessfulPaymentForTxnId(txn.getId());
-					Transaction txn = transactionClient.getTransaction(payment.getMerchantTxnId());
+	    			PaymentSettlement paymentSettlement = transactionClient.getSettlementForReferenceId(payment.getPaymentId(), true);
 					outputRefundRows(sheet, vendorId, paymentSettlement, txn, payment);
     			} catch (TransactionServiceException e) {
 					logger.error("TransactionServiceException " + e);
 				} catch (TException e) {
 					logger.error("TException " + e);
 				} catch (PaymentException e) {
 					logger.error("PaymentException " + e);
+				}
+	    	}
+//	    	for (PaymentSettlement paymentSettlement: refundSettlements)	{
+//	    		try {
+//	    			Payment payment = paymentClient.getPayment(paymentSettlement.getReferenceId());
+//					Transaction txn = transactionClient.getTransaction(payment.getMerchantTxnId());
+//
+//					outputRefundRows(sheet, vendorId, paymentSettlement, txn, payment);
+//    			} catch (TransactionServiceException e) {
+//					logger.error("TransactionServiceException " + e);
+//				} catch (TException e) {
+//					logger.error("TException " + e);
+//				} catch (PaymentException e) {
+//					logger.error("PaymentException " + e);
+//				}
+//	    	}
 		} catch (TTransportException e) {
 			logger.error("TTransportException", e);
 		} catch (LogisticsServiceException e) {
 			logger.error("LogisticsServiceException" + e);
 		} catch (TException e) {
 			logger.error("PaymentException" + e);
+		}
+	}
 	private void outputRefundRows(Sheet sheet, long vendorId, PaymentSettlement paymentSettlement, Transaction txn, Payment payment)	{
-		logger.info("Printing orders for pmt Id, " + payment.getPaymentId());
+		logger.info("Printing Refunded orders for pmt Id, " + payment.getPaymentId());
 		boolean isFirstOrderForTransaction = true;
 		for (Order order: txn.getOrders())	{
 			if(order.getVendorId() == vendorId && refundOrderStatuses.contains(order.getStatus()))	{
 		logger.info("Printing orders for pmt Id, " + payment.getPaymentId());
 		boolean isFirstOrderForTransaction = true;
 		for (Order order: txn.getOrders())	{
-			if(order.getVendorId() == vendorId)	{
+			if(order.getVendorId() == vendorId && ! order.isVendorPaid())	{
+				if(refundOrderStatuses.contains(order.getStatus()))	{
+					refundedOrders.add(order);
+				}
 		    	Row contentRow = sheet.createRow(rowCount ++);
 		    	LineItem lineItem = order.getLineitems().get(0);
 		        contentRow.createCell(OrderReportColumn.ORDER_ID.getValue()).setCellValue(order.getId());
 		        contentRow.createCell(OrderReportColumn.ORDER_DATE.getValue()).setCellValue(DATE_FORMAT.format(new Date(order.getCreated_timestamp())));

Subversion Repositories SmartDukaan

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