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



					
					if(orders.get(0).isCod())	{	// COD Order(s)
						long settledOrderId = 0;
						
						for (Order order: orders)	{
							pmtSettlement = transactionClient.getSettlementForReferenceId(order.getId(), 4, false);
							
							if(pmtSettlement.getReferenceId() > 0)	{
								settledOrderId = order.getId();
								paymentSettlementsMap.put(order.getId(), pmtSettlement);
							}

						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(), payment.getGatewayId(), false);
							
							if(pmtSettlement.getReferenceId() > 0)	{
								paymentSettlementsMap.put(payment.getPaymentId(), pmtSettlement);
							} else	{
								unsettledOrders.addAll(orders);

			    	}
				    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() + "(Order: " + order.getId() + ")"; 
					logger.error(errMsg, e);
					addActionError(errMsg);
				}
			    
			    Transaction txn = transactionClient.getTransaction(order.getTransactionId());

	    	
	    	for (Order order: refundedOrders)	{
	    		try {
					Transaction txn = transactionClient.getTransaction(order.getTransactionId());
	    			Payment payment = paymentClient.getSuccessfulPaymentForTxnId(txn.getId());
	    			PaymentSettlement paymentSettlement = transactionClient.getSettlementForReferenceId(payment.getPaymentId(), payment.getGatewayId(), true);
					
					outputRefundRows(sheet, vendorId, paymentSettlement, txn, payment);
    			} catch (TransactionServiceException e) {
					logger.error("TransactionServiceException " + e);
				} catch (TException e) {

Subversion Repositories SmartDukaan

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

Rev 5343		Rev 5382
Line 759...		Line 759...
759		759
760	`if(orders.get(0).isCod()) { // COD Order(s)`	760	`if(orders.get(0).isCod()) { // COD Order(s)`
761	`long settledOrderId = 0;`	761	`long settledOrderId = 0;`
762		762
763	`for (Order order: orders) {`	763	`for (Order order: orders) {`
764	`pmtSettlement = transactionClient.getSettlementForReferenceId(order.getId(), false);`	764	`pmtSettlement = transactionClient.getSettlementForReferenceId(order.getId(), 4, false);`
765		765
766	`if(pmtSettlement.getReferenceId() > 0) {`	766	`if(pmtSettlement.getReferenceId() > 0) {`
767	`settledOrderId = order.getId();`	767	`settledOrderId = order.getId();`
768	`paymentSettlementsMap.put(order.getId(), pmtSettlement);`	768	`paymentSettlementsMap.put(order.getId(), pmtSettlement);`
769	`}`	769	`}`
Line 782...		Line 782...
782	`Payment payment = paymentClient.getSuccessfulPaymentForTxnId(orders.get(0).getTransactionId());`	782	`Payment payment = paymentClient.getSuccessfulPaymentForTxnId(orders.get(0).getTransactionId());`
783		783
784	`// Checking if this payment settlement has already been fetched`	784	`// Checking if this payment settlement has already been fetched`
785	`if(! paymentSettlementsMap.containsKey(payment.getPaymentId())) {`	785	`if(! paymentSettlementsMap.containsKey(payment.getPaymentId())) {`
786		786
787	`pmtSettlement = transactionClient.getSettlementForReferenceId(payment.getPaymentId(), false);`	787	`pmtSettlement = transactionClient.getSettlementForReferenceId(payment.getPaymentId(), payment.getGatewayId(), false);`
788		788
789	`if(pmtSettlement.getReferenceId() > 0) {`	789	`if(pmtSettlement.getReferenceId() > 0) {`
790	`paymentSettlementsMap.put(payment.getPaymentId(), pmtSettlement);`	790	`paymentSettlementsMap.put(payment.getPaymentId(), pmtSettlement);`
791	`} else {`	791	`} else {`
792	`unsettledOrders.addAll(orders);`	792	`unsettledOrders.addAll(orders);`
Line 956...		Line 956...
956	`}`	956	`}`
957	`logger.info("Getting Successful Payment for Txn Id: " + order.getTransactionId());`	957	`logger.info("Getting Successful Payment for Txn Id: " + order.getTransactionId());`
958		958
959	`} catch (TApplicationException e) {`	959	`} catch (TApplicationException e) {`
960	`orderIdsWithoutSuccess.add(order.getId());`	960	`orderIdsWithoutSuccess.add(order.getId());`
961	`String errMsg = "Exception while getting successfull payment for transaction Id, " + order.getTransactionId();`	961	`String errMsg = "Exception while getting successfull payment for transaction Id, " + order.getTransactionId() + "(Order: " + order.getId() + ")";`
962	`logger.error(errMsg, e);`	962	`logger.error(errMsg, e);`
963	`addActionError(errMsg);`	963	`addActionError(errMsg);`
964	`}`	964	`}`
965		965
966	`Transaction txn = transactionClient.getTransaction(order.getTransactionId());`	966	`Transaction txn = transactionClient.getTransaction(order.getTransactionId());`
Line 1209...		Line 1209...
1209		1209
1210	`for (Order order: refundedOrders) {`	1210	`for (Order order: refundedOrders) {`
1211	`try {`	1211	`try {`
1212	`Transaction txn = transactionClient.getTransaction(order.getTransactionId());`	1212	`Transaction txn = transactionClient.getTransaction(order.getTransactionId());`
1213	`Payment payment = paymentClient.getSuccessfulPaymentForTxnId(txn.getId());`	1213	`Payment payment = paymentClient.getSuccessfulPaymentForTxnId(txn.getId());`
1214	`PaymentSettlement paymentSettlement = transactionClient.getSettlementForReferenceId(payment.getPaymentId(), true);`	1214	`PaymentSettlement paymentSettlement = transactionClient.getSettlementForReferenceId(payment.getPaymentId(), payment.getGatewayId(), true);`
1215		1215
1216	`outputRefundRows(sheet, vendorId, paymentSettlement, txn, payment);`	1216	`outputRefundRows(sheet, vendorId, paymentSettlement, txn, payment);`
1217	`} catch (TransactionServiceException e) {`	1217	`} catch (TransactionServiceException e) {`
1218	`logger.error("TransactionServiceException " + e);`	1218	`logger.error("TransactionServiceException " + e);`
1219	`} catch (TException e) {`	1219	`} catch (TException e) {`