Subversion Repositories SmartDukaan

Rev

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

Rev 24826 Rev 24828
Line 185... Line 185...
185
			totalSchemeInWalletCredited += transactionsOnThatDate.get(transactionId);
185
			totalSchemeInWalletCredited += transactionsOnThatDate.get(transactionId);
186
			for (SchemeInOut sio : sios) {
186
			for (SchemeInOut sio : sios) {
187
				if (sio.getCreateTimestamp().toLocalDate().equals(localDate)) {
187
				if (sio.getCreateTimestamp().toLocalDate().equals(localDate)) {
188
					schemeInAmountAdded += sio.getAmount();
188
					schemeInAmountAdded += sio.getAmount();
189
				}
189
				}
190
				if (sio.getRolledBackTimestamp().toLocalDate().equals(localDate)) {
190
				if (sio.getRolledBackTimestamp() != null && sio.getRolledBackTimestamp().toLocalDate().equals(localDate)) {
191
					schemeInAmountRolledBack += sio.getAmount();
191
					schemeInAmountRolledBack += sio.getAmount();
192
				}
192
				}
193
			}
193
			}
194
 
194
 
195
		}
195
		}
Line 217... Line 217...
217
			totalSchemeOutWalletCredited += transactionsOnThatDate.get(fofoOrderId);
217
			totalSchemeOutWalletCredited += transactionsOnThatDate.get(fofoOrderId);
218
			for (SchemeInOut sio : sios) {
218
			for (SchemeInOut sio : sios) {
219
				if (sio.getCreateTimestamp().toLocalDate().equals(localDate)) {
219
				if (sio.getCreateTimestamp().toLocalDate().equals(localDate)) {
220
					schemeOutAmountAdded += sio.getAmount();
220
					schemeOutAmountAdded += sio.getAmount();
221
				}
221
				}
222
				if (sio.getRolledBackTimestamp().toLocalDate().equals(localDate)) {
222
				if (sio.getRolledBackTimestamp() != null && sio.getRolledBackTimestamp().toLocalDate().equals(localDate)) {
223
					schemeOutAmountRolledBack += sio.getAmount();
223
					schemeOutAmountRolledBack += sio.getAmount();
224
				}
224
				}
225
			}
225
			}
226
		}
226
		}
227
		boolean reconciled = Math
227
		boolean reconciled = Math