Subversion Repositories SmartDukaan

Rev

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

Rev 24772 Rev 24776
Line 329... Line 329...
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) {
- 
 
 335 
							cancelledAmount +=  o.getWalletAmount();
- 
 
 336 
						} else {
334 
						returnedAmount += returnedOrder.getTotalPrice();
 337 
							returnedAmount += returnedOrder.getTotalPrice();
- 
 
 338 
						}
335 
				}
 339 
				}
336 
				totalDeductedAmount += o.getWalletAmount();
 340 
				totalDeductedAmount += o.getWalletAmount();
337 
			}
 341 
			}
338 
			totalWallet += transactionsOnThatDate.get(transactionId);
 342 
			totalWallet += transactionsOnThatDate.get(transactionId);
339 
		}
 343 
		}