Subversion Repositories SmartDukaan

Rev

Rev 24777 | Rev 24779 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 24777 Rev 24778
Line 322... Line 322...
322
		float returnedAmount = 0;
322
		float returnedAmount = 0;
323
		float totalDeductedAmount = 0;
323
		float totalDeductedAmount = 0;
324
		for (int transactionId : transactionsOnThatDate.keySet()) {
324
		for (int transactionId : transactionsOnThatDate.keySet()) {
325
			List<Order> orders = orderRepository.selectAllByTransactionId(transactionId);
325
			List<Order> orders = orderRepository.selectAllByTransactionId(transactionId);
326
			for (Order o : orders) {
326
			for (Order o : orders) {
327
				if (o.getRefundTimestamp() == null) {
327
				if (o.getRefundTimestamp() == null && o.getCreateTimestamp().toLocalDate().equals(localDate)) {
328
					if (Arrays.asList(OrderStatus.PAYMENT_PENDING, OrderStatus.PAYMENT_FAILED)
328
					if (Arrays.asList(OrderStatus.PAYMENT_PENDING, OrderStatus.PAYMENT_FAILED)
329
							.contains(o.getStatus())) {
329
							.contains(o.getStatus())) {
330
						cancelledAmount += o.getWalletAmount();
330
						cancelledAmount += o.getWalletAmount();
331
					} 
331
					}
332
				} else if (o.getRefundTimestamp().toLocalDate().equals(localDate)) {
332
				} else if (o.getRefundTimestamp().toLocalDate().equals(localDate)) {
333
						ReturnOrder returnedOrder = returnOrderRepository.selectByOrderId(o.getId());
333
						ReturnOrder returnedOrder = returnOrderRepository.selectByOrderId(o.getId());
334
						if(returnedOrder==null) {
334
						if(returnedOrder==null) {
335
							cancelledAmount +=  o.getWalletAmount();
335
							cancelledAmount +=  o.getWalletAmount();
336
						} else {
336
						} else {
337
							returnedAmount += returnedOrder.getTotalPrice();
337
							returnedAmount += returnedOrder.getTotalPrice();
338
						}
338
						}
339
				}
339
				}
340
				totalDeductedAmount += o.getWalletAmount();
-
 
341
			}
340
			}
342
			totalWalletConsumed -= transactionsOnThatDate.get(transactionId);
341
			totalWalletConsumed -= transactionsOnThatDate.get(transactionId);
343
		}
342
		}
344
 
343
 
345
		return Arrays.asList(localDate, totalWalletConsumed, totalDeductedAmount, cancelledAmount, returnedAmount);
344
		return Arrays.asList(localDate, totalWalletConsumed, totalDeductedAmount, cancelledAmount, returnedAmount);