Subversion Repositories SmartDukaan

Rev

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

Rev 24779 Rev 24780
Line 334... Line 334...
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
						totalDeductedAmount += o.getWalletAmount();
-
 
340
					}
339
					}
-
 
340
					totalDeductedAmount += o.getWalletAmount();
-
 
341
					
341
				} else if (o.getRefundTimestamp() != null && o.getRefundTimestamp().toLocalDate().equals(localDate)) {
342
				} else if (o.getRefundTimestamp() != null && o.getRefundTimestamp().toLocalDate().equals(localDate)) {
342
					ReturnOrder returnedOrder = returnOrderRepository.selectByOrderId(o.getId());
343
					ReturnOrder returnedOrder = returnOrderRepository.selectByOrderId(o.getId());
343
					if (returnedOrder == null) {
344
					if (returnedOrder == null) {
344
						cancelledAmount += o.getWalletAmount();
345
						cancelledAmount += o.getWalletAmount();
345
					} else {
346
					} else {