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.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.model.v1.order.Order;
+import in.shop2020.model.v1.order.OrderStatus;
 import in.shop2020.model.v1.order.PaymentSettlement;
 import in.shop2020.model.v1.order.Transaction;
 import in.shop2020.model.v1.order.TransactionServiceException;
 import in.shop2020.payments.Payment;
 import in.shop2020.payments.PaymentException;
 import in.shop2020.payments.PaymentGateway;
 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 javax.servlet.ServletContext;
 import javax.servlet.ServletOutputStream;
 	private File aramexSettlementReport;
 	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 final DateFormat DATE_FORMAT = new SimpleDateFormat("dd/MM/yyyy");
 	public VendorReconciliationController()	{
 		try	{
 			CatalogClient csc = new CatalogClient();
 		return new DefaultHttpHeaders("report");
+	}
 	public HttpHeaders generateReconciliationReport()	{
 		DateFormat dateFormat = new SimpleDateFormat("dd/MM/yyyy");
+		refundOrderStatuses.add(OrderStatus.CANCELLED_ON_CUSTOMER_REQUEST);
+		refundOrderStatuses.add(OrderStatus.RTO_REFUNDED);
+		refundOrderStatuses.add(OrderStatus.DOA_VALID_REFUNDED);
+		refundOrderStatuses.add(OrderStatus.DOA_INVALID_REFUNDED);
+		refundOrderStatuses.add(OrderStatus.CANCELLED_DUE_TO_LOW_INVENTORY);
+		refundOrderStatuses.add(OrderStatus.DOA_REFUNDED_RCVD_DAMAGED);
+		refundOrderStatuses.add(OrderStatus.DOA_REFUNDED_LOST_IN_TRANSIT);
+		refundOrderStatuses.add(OrderStatus.RTO_DAMAGED_REFUNDED);
+		refundOrderStatuses.add(OrderStatus.RTO_LOST_IN_TRANSIT_REFUNDED);
+		refundOrderStatuses.add(OrderStatus.RET_PRODUCT_USABLE_REFUNDED);
+		refundOrderStatuses.add(OrderStatus.RET_PRODUCT_UNUSABLE_REFUNDED);
+		refundOrderStatuses.add(OrderStatus.RET_REFUNDED_LOST_IN_TRANSIT);
+		refundOrderStatuses.add(OrderStatus.RET_REFUNDED_RCVD_DAMAGED);
+		refundOrderStatuses.add(OrderStatus.LOST_IN_TRANSIT_REFUNDED);
 		try	{
 			//Formatting Form input parameters
 		    Date startDate = dateFormat.parse(request.getParameter("start"));
 		Workbook wb = null;
 		try {
 			wb = new HSSFWorkbook(new FileInputStream(this.hdfcSettlementReport));
 		} catch (FileNotFoundException e) {
-			logger.error("Unable to open the Settlement report", e);
+			String errMsg = "Unable to open the HDFC Payout report";
+			logger.error(errMsg, e);
+			addActionError(errMsg);
+			return;
 		} catch (IOException e) {
-			logger.error("Unable to open the Settlement report", e);
+			String errMsg = "Unable to open the HDFC Payout report";
+			logger.error(errMsg, e);
+			addActionError(errMsg);
+			return;
+		}
 		Sheet sheet = wb.getSheetAt(0);
 		Row firstRow = sheet.getRow(0);
 		int indexNetCollection = 17;
 		TransactionClient tsc;
 		String paymentIdStr = "";
 		long paymentId = 0;
+		int countSuccessfulInserts = 0;
+		int countRefunds = 0;
 		try {
 			tsc = new TransactionClient();
 			in.shop2020.model.v1.order.TransactionService.Client transactionClient = tsc.getClient();
                 	logger.info("paymentId: " + paymentId + ", recfmt: " + recfmt + ", settlementDate: " + settlementDate + ", netCollection: " + netCollection);
                     if (recfmt.trim().equalsIgnoreCase("CVD"))	{
                     	if (netCollection > 0.0)	netCollection *= -1.0;
                     	transactionClient.savePaymentSettlements(settlementDate.getTime(), 1, paymentId, 0.0, 0.0, netCollection);
+                    	countRefunds += 1;
                     } else	{
                     	double msf = row.getCell(indexMSF).getNumericCellValue();
                     	double serviceTax = row.getCell(indexServiceTax).getNumericCellValue();
                     	double eduCess = row.getCell(indexEduCess).getNumericCellValue();
                     	logger.info("msf: " + msf + ", serviceTax: " + serviceTax + ", eduCess: " + eduCess);
                     	transactionClient.savePaymentSettlements(settlementDate.getTime(), 1, paymentId, serviceTax, (eduCess + msf), netCollection);
+                    	countSuccessfulInserts += 1;
+                 	}
                 } catch (NumberFormatException e) {
-        			logger.error("NumberFormatException recieved for payment Id," + paymentIdStr + " "+ e);
+                	String errMsg = "NumberFormatException recieved for payment Id, " + paymentIdStr;
+        			logger.error(errMsg + e);
+        			addActionError(errMsg);
         		} catch (TransactionServiceException e) {
-        			logger.error("TransactionServiceException recieved for payment Id," + Long.toString(paymentId) + " " + e);
+                	String errMsg = "TransactionServiceException recieved for payment Id, " + paymentId;
+        			logger.error(errMsg + e);
+        			addActionError(errMsg);
+        		}
+			}
 		} catch (TTransportException e) {
 			logger.error("TTransportException recieved for payment Id," + Long.toString(paymentId) + " " + e);
 		} catch (TException e) {
 			logger.error("TException recieved for payment Id," + Long.toString(paymentId) + " " + e);
+		}
+		addActionMessage("Added settlements for " + countSuccessfulInserts + " payments");
+		addActionMessage("Added settlements for " + countRefunds + " refund payments");
+	}
 	public void uploadEBSSettlements()	{
 		Workbook wb = null;
         try {
             wb = new HSSFWorkbook(new FileInputStream(this.ebsSettlementReport));
         } catch (FileNotFoundException e) {
-            logger.error("Unable to open the Settlement report", e);
+            logger.error("Unable to open the EBS Settlement detail report", e);
         } catch (IOException e) {
-            logger.error("Unable to open the Settlement report", e);
+            logger.error("Unable to open the EBS Settlement detail report", e);
+        }
         Sheet sheet = wb.getSheetAt(0);
 		Row firstRow = sheet.getRow(0);
         int indexTxnType = 5;
         int indexAmount = 6;
         Map<Long, Map<String, Double>> map = new HashMap<Long, Map<String,Double>>();
         Map <String, Double> record;
+        int countPaymentIds = 0;
         try	{
         	for (Row row: sheet)	{
                 if(row.equals(firstRow) || row.equals(secondRow))	continue;
                 } else	{
                 	record = new HashMap<String, Double>();
                 	record.put(transactionType, amount);
                 	map.put(paymentId, record);
+                	countPaymentIds += 1;
+                }
+        	}
         } catch	(NullPointerException e)	{
         	logger.error("" + e);
+        }
+        addActionMessage("Total Payment Ids added: " + countPaymentIds);
 		TransactionClient tsc;
         long settlementId = Long.parseLong(request.getParameter("settlementId"));
+        int countPaymentsRecieved = 0;
+        int countPaymentsRefunded = 0;
         try	{
 			tsc = new TransactionClient();
 			in.shop2020.model.v1.order.TransactionService.Client transactionClient = tsc.getClient();
+			long settlementDate;
+			try	{
-			long settlementDate = transactionClient.getEBSSettlementDate(settlementId);
+				settlementDate = transactionClient.getEBSSettlementDate(settlementId);
+			} catch (TransactionServiceException e) {
+				String errMsg = "Could not retrieve EBS Settlement date for settlementId, " + settlementId;
+	        	logger.error(errMsg + e);
+	        	addActionError(errMsg);
+	        	return;
+			}
         	for (long paymentId: map.keySet())	{
             	record = map.get(paymentId);
             	if(record.containsKey("Captured"))	{
             		if(tdr < 0)	tdr *= -1;
             		if(serviceTax < 0)	serviceTax *= -1;
             		double amount = capturedAmount - tdr - serviceTax;
+            		try	{
-            		transactionClient.savePaymentSettlements(settlementDate, 2, paymentId, serviceTax, tdr, amount);
+            			transactionClient.savePaymentSettlements(settlementDate, 2, paymentId, serviceTax, tdr, amount);
+        			} catch (TransactionServiceException e) {
+        				String errMsg = "Could not save settlement for paymentId, " + paymentId;
+        	        	logger.error(errMsg + e);
+        	        	addActionError(errMsg);
+        			}
+            		countPaymentsRecieved += 1;
-            	} else	{
+            	}
+            	if(record.containsKey("Refunded"))	{
             		double refundedAmount = record.get("Refunded");
             		if (refundedAmount > 0)	refundedAmount *= -1;
+            		try	{
-            		transactionClient.savePaymentSettlements(settlementDate, 2, paymentId, 0.0, 0.0, refundedAmount);
+            			transactionClient.savePaymentSettlements(settlementDate, 2, paymentId, 0.0, 0.0, refundedAmount);
+        			} catch (TransactionServiceException e) {
+        				String errMsg = "Could not save refund settlement for paymentId, " + paymentId;
+        	        	logger.error(errMsg + e);
+        	        	addActionError(errMsg);
+        			}
+            		countPaymentsRefunded += 1;
+            	}
+            }
+        	addActionMessage("Total count of payments recieved: " + countPaymentsRecieved);
-        	transactionClient.markEBSSettlementUploaded(settlementId);
+        	addActionMessage("Total count of payments refunded: " + countPaymentsRefunded);
+        	try	{
+        		transactionClient.markEBSSettlementUploaded(settlementId);
+			} catch (TransactionServiceException e) {
+				String errMsg = "Could not mark settlement for details Uploaded. Settlement ID: " + settlementId;
+	        	logger.error(errMsg + e);
+	        	addActionError(errMsg);
+			}
         } catch (TTransportException e) {
         	logger.error("TTransportException " + e);
 		} catch (TException e) {
         	logger.error("TException " + e);
-		} catch (TransactionServiceException e) {
-        	logger.error("TransactionServiceException " + e);
+		}
+	}
 	public void uploadBluedartSettlements()	{
         Sheet sheet = wb.getSheetAt(0);
         Row firstRow = sheet.getRow(0);
         logger.info("Cell count:" + firstRow.getPhysicalNumberOfCells());
-        int indexAWBno = 4;		//FIXME: add look up string to determine exact cell
+        int indexOrderId = 0;
-        int indexAmount = 19;
+        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();
         	for (Row row : sheet) {
         		Order order = null;
         		try	{
         			if(row.equals(firstRow))	continue;
-        			long awbNumber = (long) row.getCell(indexAWBno).getNumericCellValue();
+        			long orderId = (long) row.getCell(indexOrderId).getNumericCellValue();
         			double amount = row.getCell(indexAmount).getNumericCellValue();
-        			order = transactionClient.getOrderForAwb(Long.toString(awbNumber));
+        			order = transactionClient.getOrder(orderId);
-        			Payment payment = paymentClient.getSuccessfulPaymentForTxnId(order.getTransactionId());
+        			Payment payment = paymentClient.getPaymentForTxnId(order.getTransactionId()).get(0);
         			logger.info("settlementDate: " + settlementDate + ", PaymentId: " + payment.getPaymentId() + ", Amount: " + amount);
         			transactionClient.savePaymentSettlements(settlementDate, 4, payment.getPaymentId(), 0.0, 0, amount);
+        			countSuccessfulSaves += 1;
         		} catch (NullPointerException e) {
         			logger.error("" + e);
         		} catch (PaymentException e) {
         			logger.error("" + e);
 		} catch (TTransportException e) {
 			logger.error("" + e);
         } catch (TException e) {
         	logger.error("" + e);
+        }
+        addActionMessage("Successfully added Bluedart settlement details for " + countSuccessfulSaves + " orders");
+	}
 	public void uploadAramexSettlements()	{
 		logger.info("Uploading Aramex Settlements" + this.aramexSettlementDate);
+		}
         Sheet sheet = wb.getSheetAt(0);
         int indexOrderId = 0;
-        int indexAmount = 4;
+        int indexAmount = 1;
         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();
 	    		double amount = row.getCell(indexAmount).getNumericCellValue();
 	    		Order order = null;
 	    		try {
 					order = transactionClient.getOrder(orderId);
-					Payment payment = paymentClient.getSuccessfulPaymentForTxnId(order.getTransactionId());
+					Payment payment = paymentClient.getPaymentForTxnId(order.getTransactionId()).get(0);
 					transactionClient.savePaymentSettlements(settlementDate, 4, payment.getPaymentId(), 0.0, 0.0, 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 (TTransportException e) {
         	logger.error("" + e);
         } catch (TException e) {
         	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(List<Order> orders, Date startDate, Date endDate)	{
 		ByteArrayOutputStream baosXLS = new ByteArrayOutputStream();
 	    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());
 			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>>();
 			for(Order order : orders)	{
 				orderIds.add(order.getId());
+				if (orderMap.containsKey(order.getTransactionId()))	{
+					orderMap.get(order.getTransactionId()).add(order);
+				} else	{
+					List<Order> o = new ArrayList<Order>();
+					o.add(order);
+					orderMap.put(order.getTransactionId(), o);
+				}
+			}
 			List<Long> reshippedOrderIds = null;
 			reshippedOrderIds = transactionClient.getReshippedOrderIds(orderIds);
-			for(Order order : orders)	{
+			for(long txnId: orderMap.keySet())	{
-			    logger.info("For order: " + order.getId());
+				List<Order> orderList = orderMap.get(txnId);
-			    LineItem lineItem = order.getLineitems().get(0);
-			    double transferPrice = lineItem.getTransfer_price();
-			    Payment payment = null;
-			    try	{
-			    	payment = paymentClient.getSuccessfulPaymentForTxnId(order.getTransactionId());
-				    logger.info("getSuccessfulPaymentForTxnId: " + payment);
-			    } catch (TApplicationException e)	{
+				for (Order order: orderList)	{
-			    	orderIdsWithoutSuccess.add(order.getId());
+				    logger.info("For order: " + order.getId());
+				    LineItem lineItem = order.getLineitems().get(0);
+				    double transferPrice = lineItem.getTransfer_price();
+				    Payment payment = null;
+				    try	{
+				    	payment = paymentClient.getSuccessfulPaymentForTxnId(order.getTransactionId());
+					    logger.info("getSuccessfulPaymentForTxnId: " + payment);
+				    } catch (TApplicationException e)	{
+				    	orderIdsWithoutSuccess.add(order.getId());
-					logger.error("Exception while getting successfull payment for transaction Id, " + order.getTransactionId(), e);
+						logger.error("Exception while getting successfull payment for transaction Id, " + order.getTransactionId(), e);
-					addActionError("Exception while getting payment for transaction Id, " + order.getTransactionId());
+						addActionError("Exception while getting payment for transaction Id, " + order.getTransactionId());
-				}
+					}
-			    Transaction txn = transactionClient.getTransaction(order.getTransactionId());
+				    Transaction txn = transactionClient.getTransaction(order.getTransactionId());
-			    PaymentSettlement paymentSettlement = null;
+				    PaymentSettlement paymentSettlement = null;
-			    String paymentType = null;
+				    String paymentType = null;
-			    if(payment != 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 totalSellingPrice = lineItem.getTotal_price();
-	            double serviceTax = 0.0;
+		            double serviceTax = 0.0;
-	            double otherCollectionCharges = 0.0;
+		            double otherCollectionCharges = 0.0;
-	            double netCollection = 0.0;
+		            double netCollection = 0.0;
-	            if(paymentSettlement != null)	{
+		            if(paymentSettlement != null)	{
-		            serviceTax = paymentSettlement.getServiceTax();
+			            serviceTax = paymentSettlement.getServiceTax();
-		            otherCollectionCharges = paymentSettlement.getOtherCharges();
+			            otherCollectionCharges = paymentSettlement.getOtherCharges();
-		            netCollection = paymentSettlement.getNetCollection();
+			            netCollection = paymentSettlement.getNetCollection();
-	            }
+		            }
-	            if (netCollection < 0.0)	{
+		            if (netCollection < 0.0)	{
-	            	paymentType = paymentType + "-REFUND";
+		            	paymentType = paymentType + "-REFUND";
-	            }
+		            }
-	            double expectedCollection = totalSellingPrice - otherCollectionCharges - serviceTax;
+		            double expectedCollection = totalSellingPrice - otherCollectionCharges - serviceTax;
-	            //FIXME ignore differences of upto 50 paisa
+		            //FIXME ignore differences of upto 50 paisa
-	            if (netCollection > 0.0 && expectedCollection != netCollection)	{
+		            if (netCollection > 0.0 && expectedCollection != netCollection)	{
-	            	Map <String, Double> mismatch = new HashMap<String, Double>();
+		            	Map <String, Double> mismatch = new HashMap<String, Double>();
-	            	mismatch.put("expected", expectedCollection);
+		            	mismatch.put("expected", expectedCollection);
-	            	mismatch.put("actual", netCollection);
+		            	mismatch.put("actual", netCollection);
-	            	misMatches.put(order.getId(), mismatch);
+		            	misMatches.put(order.getId(), mismatch);
-	            }
+		            }
-		    	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;
+			    	Row contentRow = sheet.createRow(serialNo++);
-			    if (payment != null)	{
+		            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.SETTLEMENT_DATE.getValue()).setCellValue(DATE_FORMAT.format(new Date(paymentSettlement.getSettlementDate())));
+				    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.GATEWAY_TRANSACTION_ID.getValue()).setCellValue(payment.getGatewayTxnId());
+				    contentRow.createCell(OrderReportColumn.QUANTITY.getValue()).setCellValue(lineItem.getQuantity());
-			    	contentRow.createCell(OrderReportColumn.PAYMENT_TYPE.getValue()).setCellValue(paymentType);
+				    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.PAYMENT_ID.getValue()).setCellValue(payment.getPaymentId());
+				    contentRow.createCell(OrderReportColumn.CURRENT_STATUS.getValue()).setCellValue(order.getStatusDescription());
+			    	double refund = 0.0;
+				    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_ID.getValue()).setCellValue(payment.getPaymentId());
-			    	if(refunds.containsKey(payment.getPaymentId()))	{
+				    	if(refunds.containsKey(payment.getPaymentId()))	{
-			    		refund = refunds.get(payment.getPaymentId()).getNetCollection();
+				    		refund = refunds.get(payment.getPaymentId()).getNetCollection();
-			    		refunds.remove(payment.getPaymentId());
+				    		refunds.remove(payment.getPaymentId());
-			    	}
+				    	}
-			    	contentRow.createCell(OrderReportColumn.REFUND.getValue()).setCellValue(refund);
+				    	contentRow.createCell(OrderReportColumn.REFUND.getValue()).setCellValue(refund);
-			    }
+				    }
-			    contentRow.createCell(OrderReportColumn.COUPON_CODE.getValue()).setCellValue(txn.getCoupon_code());
+				    contentRow.createCell(OrderReportColumn.COUPON_CODE.getValue()).setCellValue(txn.getCoupon_code());
-			    contentRow.createCell(OrderReportColumn.SERVICE_TAX.getValue()).setCellValue(serviceTax);
+				    contentRow.createCell(OrderReportColumn.SERVICE_TAX.getValue()).setCellValue(serviceTax);
-			    contentRow.createCell(OrderReportColumn.OTHER_CHARGES.getValue()).setCellValue(otherCollectionCharges);
+				    contentRow.createCell(OrderReportColumn.OTHER_CHARGES.getValue()).setCellValue(otherCollectionCharges);
-			    contentRow.createCell(OrderReportColumn.NET_COLLECTION.getValue()).setCellValue(netCollection);
+				    contentRow.createCell(OrderReportColumn.NET_COLLECTION.getValue()).setCellValue(netCollection);
-			    contentRow.createCell(OrderReportColumn.FINAL_AMOUNT.getValue()).setCellValue(netCollection - refund);
+				    contentRow.createCell(OrderReportColumn.FINAL_AMOUNT.getValue()).setCellValue(netCollection - refund);
-			    boolean isReshippedOrder = reshippedOrderIds.contains(order.getId());
+				    boolean isReshippedOrder = reshippedOrderIds.contains(order.getId());
-			    contentRow.createCell(OrderReportColumn.IS_RESHIPED_ORDER.getValue()).setCellValue(isReshippedOrder ? 1 : 0);
+				    contentRow.createCell(OrderReportColumn.IS_RESHIPED_ORDER.getValue()).setCellValue(isReshippedOrder ? 1 : 0);
-		    }
+				}
+			}
 		    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);
 		    	Payment payment = paymentClient.getPayment(paymentId);
 		    	Transaction txn = transactionClient.getTransaction(payment.getMerchantTxnId());
 		    	PaymentSettlement paymentSettlement = refunds.get(paymentId);
 		    	for (Order order: txn.getOrders())	{
+		    		if(!refundOrderStatuses.contains(order.getStatus()))	continue;
 			    	Row contentRow = sheet.createRow(serialNo++);
 			    	LineItem lineItem = order.getLineitems().get(0);
 				    double transferPrice = lineItem.getTransfer_price();
 		            double totalSellingPrice = lineItem.getTotal_price();
 		} catch (PaymentException e) {
 			logger.error("PaymentException " + e);
 		} catch (TException e) {
 			logger.error("TException " + e);
 		} catch (TransactionServiceException e) {
-			logger.error("TransactionServiceException " + e);
+			logger.error("Transaction Service Exception " + e);
+		} catch (LogisticsServiceException e) {
+			addActionError("Error loading list of COD providers");
+			logger.error("Logistics Service Exception " + e);
+		}
+	}
 	public List<Vendor> getAllVendors()	{
 		return this.vendors;

Subversion Repositories SmartDukaan

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