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;
 /**
  * @author Varun Gupta
  * @description: This class handles web requests to generate vendor specific reconciliation reports
  *               for given vendor for a given date range
  */
+//
 //@InterceptorRefs({
 //    @InterceptorRef("defaultStack"),
 //    @InterceptorRef("login")
 //})
 //@Results({
 		BILLING_NUMBER(2),
 		BILLING_DATE(3),
 		DELIVERY_DATE(4),
 		SETTLEMENT_DATE(5),
 		CURRENT_STATUS(6),
+		PAYMENT_STATUS(7),
 		BRAND(7),
 		MODEL_NAME(8),
 		MODEL_NUMBER(9),
 		COLOR(10),
 		QUANTITY(11),
 	private Map<Long, Map<String, Double>> misMatches = new HashMap<Long, Map<String, Double>>();
 	private Map<Long, String> ebsSettlementSummaries;
 	private List<OrderStatus> refundOrderStatuses = new ArrayList<OrderStatus>();
+	private List<Order> refundedOrdersBilledinDateRange = new ArrayList<Order>();
+	private List<Order> reshippedOrders = new ArrayList<Order>();
 	private final DateFormat DATE_FORMAT = new SimpleDateFormat("dd/MM/yyyy");
 	public VendorReconciliationController()	{
 		try	{
 			CatalogClient csc = new CatalogClient();
 			Date endDate = dateFormat.parse(request.getParameter("end"));
 		    long vendorId = Long.parseLong(request.getParameter("vendor"));
 		    logger.info(startDate + " " + endDate + " " + vendorId);
-			TransactionClient tsc = new TransactionClient();
+		    String vendorName = getVendorName(vendorId);
-			in.shop2020.model.v1.order.TransactionService.Client transactionClient = tsc.getClient();
-			List<Order> orders = transactionClient.getBilledOrdersForVendor(vendorId, startDate.getTime(), endDate.getTime());
-			logger.info("Order count: " + orders.size());
 			DateFormat dateFormatForFile = new SimpleDateFormat("dd.MM.yyyy");
-			String vendorName = getVendorName(vendorId);
 			response.setContentType("application/vnd.ms-excel");
 			response.setHeader("Content-disposition", "inline; filename=" + vendorName + "-reconciliation-from-" + dateFormatForFile.format(startDate) + "-" + dateFormatForFile.format(endDate) + ".xls");
 			ServletOutputStream sos;
 			try {
-				ByteArrayOutputStream baos = getReconciliationReport(orders, startDate, endDate);
+				ByteArrayOutputStream baos = getReconciliationReport(vendorId, startDate, endDate);
 				sos = response.getOutputStream();
 				baos.writeTo(sos);
 				sos.flush();
 			} catch (IOException e)	{
 				logger.error("Error while streaming the hotspot reconciliation report", e);
+			}
 		} catch (ParseException e)	{
 			logger.error("Unable to parse the start or end date", e);
-		} catch (TransactionServiceException e)	{
-			logger.error("Error while getting order information from the transaction service", e);
-		} catch (TException e) {
-            logger.error("Unable to get the orders or the warehouses", e);
 		} catch (NullPointerException e)   {
             logger.error("NullPointerException", e);
-		} catch (Exception e)   {
-            logger.error("Unexpected exception", e);
-        }
+		}
 		return new DefaultHttpHeaders("report");
+	}
 	public void uploadEBSSettlementSummary()	{
+        }
         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(List<Order> orders, Date startDate, Date endDate)	{
+	private ByteArrayOutputStream getReconciliationReport(long vendorId, Date startDate, Date endDate)	{
-		ByteArrayOutputStream baosXLS = new ByteArrayOutputStream();
+		List<Order> billedOrders = null;
+		try	{
-	    Workbook wb = new HSSFWorkbook();
+			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();
+			billedOrders = transactionClient.getBilledOrdersForVendor(vendorId, startDate.getTime(), endDate.getTime());
+			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>();
+			for (PaymentSettlement paymentSettlement: paymentSettlements)	{
+				Payment payment = paymentClient.getPayment(paymentSettlement.getPaymentId());
+				Transaction txn = transactionClient.getTransaction(payment.getMerchantTxnId());
+				settledOrders.addAll(txn.getOrders());
+			}
+			logger.info("Settled Orders count: " + settledOrders.size());
+		} catch	(TransactionServiceException e)	{
+			String errMsg = "Transaction Service Exception occured";
+			logger.error(errMsg, e);
+			addActionError(errMsg);
+		} catch (TTransportException e) {
+			String errMsg = "Transaction Service Exception occured";
+			logger.error(errMsg, e);
+			addActionError(errMsg);
+		} catch (TException e) {
+			// TODO Auto-generated
+			String errMsg = "Transaction Service Exception occured";
+			logger.error(errMsg, e);
+			addActionError(errMsg);
+		} catch (PaymentException e) {
+			String errMsg = "Transaction Service Exception occured";
+			logger.error(errMsg, e);
+			addActionError(errMsg);
+		}
+		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);
 	    rightAlignStyle.setAlignment(CellStyle.ALIGN_RIGHT);
 		Sheet orderSheet = wb.createSheet("Orders");
 		Sheet mismatchSheet = wb.createSheet("Mismatches");
-	    populateOrderSheet(orders, startDate, endDate, orderSheet, boldStyle, rightAlignStyle);
+	    populateOrderSheet(billedOrders, startDate, endDate, orderSheet, boldStyle, rightAlignStyle);
 	    populateMismatchSheet(mismatchSheet);
 		// Write the workbook to the output stream
 		try {
 			wb.write(baosXLS);
 	    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");
 	    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();
 				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)	{
 				orderIds.add(order.getId());
 				if (orderMap.containsKey(order.getTransactionId()))	{
 					orderMap.get(order.getTransactionId()).add(order);
+					countMultipleOrderTxns += 1;
 				} else	{
 					List<Order> o = new ArrayList<Order>();
 					o.add(order);
 					orderMap.put(order.getTransactionId(), o);
+				}
+			}
-			List<Long> reshippedOrderIds = null;
+			// Getting list of order ids belonging to reshipped orders
-			reshippedOrderIds = transactionClient.getReshippedOrderIds(orderIds);
+			List<Long> reshippedOrderIds = transactionClient.getReshippedOrderIds(orderIds);
 			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());
+				    if (isReshippedOrder)	{
+				    	reshippedOrders.add(order);
+//				    	orderList.remove(order);
+//				    	orderMap.get(txnId).remove(order);
+				    	continue;
+				    }
 				    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());
+				    		payment = paymentClient.getSuccessfulPaymentForTxnId(order.getTransactionId());
+				    	}
-					    logger.info("getSuccessfulPaymentForTxnId: " + payment);
+					    logger.info("getSuccessfulPaymentForTxnId, " + order.getTransactionId() + ": " + payment);
 				    } catch (TApplicationException e)	{
 				    	orderIdsWithoutSuccess.add(order.getId());
-						logger.error("Exception while getting successfull payment for transaction Id, " + order.getTransactionId(), e);
+				    	String errMsg = "Exception while getting successfull payment for transaction Id, " + order.getTransactionId();
+						logger.error(errMsg, e);
-						addActionError("Exception while getting payment for transaction Id, " + order.getTransactionId());
+						addActionError(errMsg);
+					}
 				    Transaction txn = transactionClient.getTransaction(order.getTransactionId());
 				    PaymentSettlement paymentSettlement = null;
 				    String paymentType = null;
 				    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_TYPE.getValue()).setCellValue(paymentType);
+				    	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.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);
-				    boolean isReshippedOrder = reshippedOrderIds.contains(order.getId());
 				    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("countMultipleOrderTxns: " + countMultipleOrderTxns);
 	    	sheet.createRow(serialNo++);
 		    // Refunds belonging to orders billed before the start date of supplied billing date range
 		    for (long paymentId: refunds.keySet())	{

Subversion Repositories SmartDukaan

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