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

 					List<Order> l = new LinkedList<Order>();
 					l.add(order);
 					mapAllOrders.put(order.getOriginalOrderId(), l);
+				}
+			}
-			logger.info("Unpaid Order count in Map: " + mapAllOrders.size());
+			logger.info("Unpaid Order count in Map: " + mapAllOrders.keySet().size());
-	    	int pmtSettlementFoundNull = 0;
-	    	int pmtSettlementFound = 0;
 			for (long originalOrderId: mapAllOrders.keySet())	{
 				List <Order> orders = mapAllOrders.get(originalOrderId);
 				try {
 					PaymentSettlement pmtSettlement = null;
 							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(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("Reshipped Orders count: " + reshippedOrders.size());
 		} catch	(TransactionServiceException e)	{
 			String errMsg = "Transaction Service Exception occured";
 			logger.error(errMsg, e);
 			String errMsg = "Transaction Service Exception occured";
 			logger.error(errMsg, e);
 			addActionError(errMsg);
+		}
 		logger.info("Payment Settlement Count: " + paymentSettlementsMap.keySet().size());
+		logger.info("Payment Settlements: " + paymentSettlementsMap.keySet());
 		logger.info("Unsettled Orders Count: " + unsettledOrders.size());
 		ByteArrayOutputStream baosXLS = new ByteArrayOutputStream();
 	    Workbook wb = new HSSFWorkbook();
 	    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.SETTLEMENT_DATE.getValue()).setCellValue("Original Order Id");
 	    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");
 	    	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();
 			    	if(order.isCod())	{
 			    		payment = paymentClient.getPaymentForTxnId(order.getTransactionId()).get(0);
 			    	} else	{
 			    		payment = paymentClient.getSuccessfulPaymentForTxnId(order.getTransactionId());
+			    	}
-				    logger.info("getSuccessfulPaymentForTxnId, " + order.getTransactionId() + ": " + payment);
+				    logger.info("Getting Successful Payment for Txn Id: " + order.getTransactionId());
 			    } catch (TApplicationException e)	{
 			    	orderIdsWithoutSuccess.add(order.getId());
 			    	String errMsg = "Exception while getting successfull payment for transaction Id, " + order.getTransactionId();
 					logger.error(errMsg, e);
 	            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.SETTLEMENT_DATE.getValue()).setCellValue(order.getOriginalOrderId());
 			    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());
 		    	} 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.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());
+			}
 	    	for (Provider provider: logisticsClient.getAllProviders())	{
 	    		codProviders.put(provider.getId(), provider.getName());
+	    	}
-	    	class PaymentSettlementMap	{
-	    		public PaymentSettlement settlement;
-	    		public Payment payment;
-	    		public Transaction transaction;
-	    		public Order order;
-	    		public PaymentSettlementMap(PaymentSettlement settlement, Payment pmt, Transaction txn, Order order)	{
-	    			this.settlement = settlement;
-	    			this.payment = pmt;
-	    			this.transaction = txn;
-	    			this.order = order;
-	    		}
-	    		public PaymentSettlementMap(PaymentSettlement settlement, Payment pmt, Transaction txn)	{
-	    			this.settlement = settlement;
-	    			this.payment = pmt;
-	    			this.transaction = txn;
-	    		}
-	    	}
 	    	for (PaymentSettlement paymentSettlement: paymentSettlementsMap.values())	{
     			try {
     				if(paymentSettlement.getPaymentGatewayId() == 4)	{	// If COD
 	    				Order order = transactionClient.getOrder(paymentSettlement.getReferenceId());
+	}
 	private void outputPrepaidTransactionRows(Sheet sheet, long vendorId, PaymentSettlement paymentSettlement, Transaction txn, Payment payment)	{
 		logger.info("Printing orders for pmt Id, " + payment.getPaymentId());
-		boolean isFirstOrderForTransaction = true;
 		for (Order order: txn.getOrders())	{
-			if(order.getVendorId() == vendorId && ! order.isVendorPaid())	{
+			if(order.getVendorId() == vendorId && ! order.isVendorPaid() && order.getOriginalOrderId() == 0)	{
 				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())));
 			    contentRow.createCell(OrderReportColumn.SETTLEMENT_DATE.getValue()).setCellValue(DATE_FORMAT.format(new Date(paymentSettlement.getSettlementDate())));
 			    contentRow.createCell(OrderReportColumn.COUPON_CODE.getValue()).setCellValue(txn.getCoupon_code());
 		    	contentRow.createCell(OrderReportColumn.PAYMENT_STATUS.getValue()).setCellValue(payment.getStatus().name());
 		    	contentRow.createCell(OrderReportColumn.PAYMENT_ID.getValue()).setCellValue(payment.getPaymentId());
-		    	if(isFirstOrderForTransaction)	{
-			    	contentRow.createCell(OrderReportColumn.SERVICE_TAX.getValue()).setCellValue(paymentSettlement.getServiceTax());
+		    	contentRow.createCell(OrderReportColumn.SERVICE_TAX.getValue()).setCellValue((paymentSettlement.getServiceTax() * order.getTotal_amount()) / payment.getAmount());
-				    contentRow.createCell(OrderReportColumn.OTHER_CHARGES.getValue()).setCellValue(paymentSettlement.getOtherCharges());
+			    contentRow.createCell(OrderReportColumn.OTHER_CHARGES.getValue()).setCellValue((paymentSettlement.getOtherCharges() * order.getTotal_amount()) / payment.getAmount());
-				    contentRow.createCell(OrderReportColumn.NET_COLLECTION.getValue()).setCellValue(paymentSettlement.getNetCollection());
+			    contentRow.createCell(OrderReportColumn.NET_COLLECTION.getValue()).setCellValue((paymentSettlement.getNetCollection() * order.getTotal_amount()) / payment.getAmount());
-				    isFirstOrderForTransaction = false;
-		    	}
+			}
+		}
+	}
 	private void outputCODRow(Row contentRow, PaymentSettlement paymentSettlement, Order order, Transaction txn, Payment payment)	{

Subversion Repositories SmartDukaan

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