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



        		try	{
        			if(row.equals(firstRow))	continue;
        			orderId = (long) row.getCell(indexOrderId).getNumericCellValue();
        			
        			double amount = row.getCell(indexAmount).getNumericCellValue();
        			transactionClient.savePaymentSettlements(settlementDate, 4, orderId, 0.0, 0.0, amount);
        			logger.info("SettlementDate: " + settlementDate + ", OrderId: " + orderId + ", Amount: " + amount);
        			countSuccessfulSaves += 1;
        			
        		} catch (NullPointerException e) {
        			logger.error("For OrderId: " + orderId + " " + e);

		List<Order> settledOrders = null;
		
		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();
			
			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());
			
			settledOrders = new ArrayList<Order>();
			
			for (PaymentSettlement paymentSettlement: paymentSettlements)	{
				Payment payment = paymentClient.getPayment(paymentSettlement.getReferenceId());
				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) {

			logger.info(refundSettlements.toString());
			
			Map<Long, PaymentSettlement> refunds = new HashMap<Long, PaymentSettlement>();
			
			for (PaymentSettlement settlement: refundSettlements)	{
				refunds.put(settlement.getReferenceId(), settlement);
			}
			
		    // Refunds belonging to orders billed before the start date of supplied billing date range
		    for (long paymentId: refunds.keySet())	{
		    	Payment payment = paymentClient.getPayment(paymentId);

Subversion Repositories SmartDukaan

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

Rev 4875		Rev 4905
Line 565...		Line 565...
565	`try {`	565	`try {`
566	`if(row.equals(firstRow)) continue;`	566	`if(row.equals(firstRow)) continue;`
567	`orderId = (long) row.getCell(indexOrderId).getNumericCellValue();`	567	`orderId = (long) row.getCell(indexOrderId).getNumericCellValue();`
568		568
569	`double amount = row.getCell(indexAmount).getNumericCellValue();`	569	`double amount = row.getCell(indexAmount).getNumericCellValue();`
570	`transactionClient.saveCODPaymentSettlement(orderId, settlementDate, amount);`	570	`transactionClient.savePaymentSettlements(settlementDate, 4, orderId, 0.0, 0.0, amount);`
571	`logger.info("SettlementDate: " + settlementDate + ", OrderId: " + orderId + ", Amount: " + amount);`	571	`logger.info("SettlementDate: " + settlementDate + ", OrderId: " + orderId + ", Amount: " + amount);`
572	`countSuccessfulSaves += 1;`	572	`countSuccessfulSaves += 1;`
573		573
574	`} catch (NullPointerException e) {`	574	`} catch (NullPointerException e) {`
575	`logger.error("For OrderId: " + orderId + " " + e);`	575	`logger.error("For OrderId: " + orderId + " " + e);`
Line 669...		Line 669...
669	`List<Order> settledOrders = null;`	669	`List<Order> settledOrders = null;`
670		670
671	`try {`	671	`try {`
672	`TransactionClient tsc = new TransactionClient();`	672	`TransactionClient tsc = new TransactionClient();`
673	`in.shop2020.model.v1.order.TransactionService.Client transactionClient = tsc.getClient();`	673	`in.shop2020.model.v1.order.TransactionService.Client transactionClient = tsc.getClient();`
674		674
675	`PaymentClient psc = new PaymentClient();`	675	`PaymentClient psc = new PaymentClient();`
676	`in.shop2020.payments.PaymentService.Client paymentClient = psc.getClient();`	676	`in.shop2020.payments.PaymentService.Client paymentClient = psc.getClient();`
677		677
678	`billedOrders = transactionClient.getBilledOrdersForVendor(vendorId, startDate.getTime(), endDate.getTime());`	678	`billedOrders = transactionClient.getBilledOrdersForVendor(vendorId, startDate.getTime(), endDate.getTime());`
679	`logger.info("Billed Orders count: " + billedOrders.size());`	679	`logger.info("Billed Orders count: " + billedOrders.size());`
680		680
681	`List<PaymentSettlement> paymentSettlements = transactionClient.getSettlementsByDate(startDate.getTime(), endDate.getTime(), false);`	681	`List<PaymentSettlement> paymentSettlements = transactionClient.getSettlementsByDate(startDate.getTime(), endDate.getTime(), false);`
682	`logger.info("Settlement Count: " + paymentSettlements.size());`	682	`logger.info("Settlement Count: " + paymentSettlements.size());`
683		683
684	`settledOrders = new ArrayList<Order>();`	684	`settledOrders = new ArrayList<Order>();`
685		685
686	`for (PaymentSettlement paymentSettlement: paymentSettlements) {`	686	`for (PaymentSettlement paymentSettlement: paymentSettlements) {`
687	`Payment payment = paymentClient.getPayment(paymentSettlement.getPaymentId());`	687	`Payment payment = paymentClient.getPayment(paymentSettlement.getReferenceId());`
688	`Transaction txn = transactionClient.getTransaction(payment.getMerchantTxnId());`	688	`Transaction txn = transactionClient.getTransaction(payment.getMerchantTxnId());`
689	`settledOrders.addAll(txn.getOrders());`	689	`settledOrders.addAll(txn.getOrders());`
690	`}`	690	`}`
691	`logger.info("Settled Orders count: " + settledOrders.size());`	691	`logger.info("Settled Orders count: " + settledOrders.size());`
692		692
693	`} catch (TransactionServiceException e) {`	693	`} catch (TransactionServiceException e) {`
694	`String errMsg = "Transaction Service Exception occured";`	694	`String errMsg = "Transaction Service Exception occured";`
695	`logger.error(errMsg, e);`	695	`logger.error(errMsg, e);`
696	`addActionError(errMsg);`	696	`addActionError(errMsg);`
697	`} catch (TTransportException e) {`	697	`} catch (TTransportException e) {`
Line 1163...		Line 1163...
1163	`logger.info(refundSettlements.toString());`	1163	`logger.info(refundSettlements.toString());`
1164		1164
1165	`Map<Long, PaymentSettlement> refunds = new HashMap<Long, PaymentSettlement>();`	1165	`Map<Long, PaymentSettlement> refunds = new HashMap<Long, PaymentSettlement>();`
1166		1166
1167	`for (PaymentSettlement settlement: refundSettlements) {`	1167	`for (PaymentSettlement settlement: refundSettlements) {`
1168	`refunds.put(settlement.getPaymentId(), settlement);`	1168	`refunds.put(settlement.getReferenceId(), settlement);`
1169	`}`	1169	`}`
1170		1170
1171	`// Refunds belonging to orders billed before the start date of supplied billing date range`	1171	`// Refunds belonging to orders billed before the start date of supplied billing date range`
1172	`for (long paymentId: refunds.keySet()) {`	1172	`for (long paymentId: refunds.keySet()) {`
1173	`Payment payment = paymentClient.getPayment(paymentId);`	1173	`Payment payment = paymentClient.getPayment(paymentId);`