WebSVN – SmartDukaan – Diff – /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WalletController.java

 import com.spice.profitmandi.common.util.*;
 import com.spice.profitmandi.dao.entity.dtr.CreditAccount;
 import com.spice.profitmandi.dao.entity.fofo.FofoStore;
 import com.spice.profitmandi.dao.entity.transaction.*;
 import com.spice.profitmandi.dao.enumuration.transaction.AddWalletRequestStatus;
+import com.spice.profitmandi.dao.enumuration.transaction.LoanReferenceType;
+import com.spice.profitmandi.dao.enumuration.transaction.LoanSummaryType;
 import com.spice.profitmandi.dao.enumuration.transaction.TransactionType;
+import com.spice.profitmandi.dao.model.SDCreditResponseOut;
 import com.spice.profitmandi.dao.repository.catalog.AddWalletRequestRepository;
 import com.spice.profitmandi.dao.repository.catalog.ManualPaymentRequestRepository;
 import com.spice.profitmandi.dao.repository.catalog.UnsettledPaymentsRepository;
 import com.spice.profitmandi.dao.repository.dtr.CreditAccountRepository;
 import com.spice.profitmandi.dao.repository.dtr.FofoStoreRepository;
 import com.spice.profitmandi.dao.repository.dtr.UserAccountRepository;
-import com.spice.profitmandi.dao.repository.transaction.OrderRepository;
+import com.spice.profitmandi.dao.repository.transaction.*;
-import com.spice.profitmandi.dao.repository.transaction.StatementDetailModel;
-import com.spice.profitmandi.dao.repository.transaction.UserWalletHistoryRepository;
-import com.spice.profitmandi.dao.repository.transaction.UserWalletRepository;
 import com.spice.profitmandi.service.NotificationService;
 import com.spice.profitmandi.service.authentication.RoleManager;
 import com.spice.profitmandi.service.transaction.TransactionService;
 import com.spice.profitmandi.service.user.RetailerService;
 import com.spice.profitmandi.service.wallet.WalletService;
 import javax.swing.*;
 import javax.transaction.Transactional;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
+import java.math.BigDecimal;
 import java.text.MessageFormat;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
+import java.time.temporal.ChronoUnit;
 import java.util.*;
 import java.util.stream.Collectors;
 @Controller
 @Transactional(rollbackOn = Throwable.class)
 	private static final int RECHARGE = 16;
 	private static final int REFUND = 17;
 	private static final int SCHEME_IN = 18;
 	private static final int SCHEME_OUT = 19;
 	private static final Map<WalletReferenceType, Integer> walletReferenceMap = new HashMap<>();
 	static {
 		walletReferenceMap.put(WalletReferenceType.ACTIVATION_SCHEME, ACTIVATION_SCHEME);
 		walletReferenceMap.put(WalletReferenceType.ADVANCE_AMOUNT, ADVANCE_AMOUNT);
 		walletReferenceMap.put(WalletReferenceType.AUTOMATED_ADVANCE, AUTOMATED_ADVANCE);
 		walletReferenceMap.put(WalletReferenceType.BRAND_PAYOUT, BRAND_PAYOUT);
 		walletReferenceMap.put(WalletReferenceType.REFUND, REFUND);
 		walletReferenceMap.put(WalletReferenceType.SCHEME_IN, SCHEME_IN);
 		walletReferenceMap.put(WalletReferenceType.SCHEME_OUT, SCHEME_OUT);
+	}
 	private static final int GRAND_TOTAL = 20;
 	private static final int CLOSING_BALANCE = 22;
 	private static final int PENDING_GRN = 23;
 	private static final int ACTIVATED_IMEIS = 24;
 	@Autowired
 	private CreditAccountRepository creditAccountRepository;
 	@Autowired
 	private NotificationService notificationService;
+	@Autowired
+	LoanRepository loanRepository;
+	@Autowired
+	private LoanStatementRepository loanStatementRepository;
+	@Autowired
+	SDCreditRequirementRepository sdCreditRequirementRepository;
 	private static final Logger LOGGER = LogManager.getLogger(WalletController.class);
 	@PostMapping(value = "/wallet/upload")
 	public String uploadWalletBulk(HttpServletRequest request, @RequestPart("file") MultipartFile file, Model model)
 			throws Exception {
 		return "response";
+	}
 	@RequestMapping(value = "/walletDetails", method = RequestMethod.GET)
 	public String dashboard(HttpServletRequest request,
-			@RequestParam(name = ProfitMandiConstants.START_TIME, required = false) String startTimeString,
+							@RequestParam(name = ProfitMandiConstants.START_TIME, required = false) String startTimeString,
-			@RequestParam(name = ProfitMandiConstants.END_TIME, required = false) String endTimeString,
+							@RequestParam(name = ProfitMandiConstants.END_TIME, required = false) String endTimeString,
-			@RequestParam(name = "offset", defaultValue = "0") int offset,
+							@RequestParam(name = "offset", defaultValue = "0") int offset,
-			@RequestParam(name = "limit", defaultValue = "100") int limit, Model model)
+							@RequestParam(name = "limit", defaultValue = "100") int limit, Model model)
 			throws ProfitMandiBusinessException {
 		/*
 		 * boolean underMaintainance = true; if(underMaintainance) { throw new
 		 * ProfitMandiBusinessException("Wallet", "Wallet",
 		 * "Wallet is under Maintenance"); }
 		 */
 		LoginDetails fofoDetails = cookiesProcessor.getCookiesObject(request);
+		int fofoId = fofoDetails.getFofoId();
 		boolean isAdmin = roleManager.isAdmin(fofoDetails.getRoleIds());
-		UserWallet userWallet = walletService.getUserWallet(fofoDetails.getFofoId());
+		UserWallet userWallet = walletService.getUserWallet(fofoId);
 		LocalDateTime startDateTime = StringUtils.toDateTime(startTimeString);
 		LocalDateTime endDateTime = StringUtils.toDateTime(endTimeString);
 		List<UserWalletHistory> userWalletHistories = new ArrayList<>();
 		try {
-			userWalletHistories = walletService.getPaginatedUserWalletHistoryByRetailerId(fofoDetails.getFofoId(),
+			userWalletHistories = walletService.getPaginatedUserWalletHistoryByRetailerId(fofoId,
 					startDateTime, endDateTime, offset, limit);
 		} catch (ProfitMandiBusinessException profitMandiBusinessException) {
 			LOGGER.error("UserWallet History not found : ", profitMandiBusinessException);
+		}
 		try {
 			countItems = walletService.getSizeByRetailerId(fofoDetails.getFofoId(), startDateTime, endDateTime);
 		} catch (ProfitMandiBusinessException profitMandiBusinessException) {
 			LOGGER.error("UserWallet not found : ", profitMandiBusinessException);
+		}
+		List<Loan> loans = loanRepository.selectAllActiveLoan();
+		for (Loan loan : loans) {
+			int loanId = loan.getId();
+			BigDecimal pendingAmount = loan.getPendingAmount();
+			BigDecimal interestAccrued = loan.getInterestAccrued();
+			BigDecimal interestPaid = loan.getInterestPaid();
+			BigDecimal totalAmount = interestAccrued.subtract(interestPaid).add(pendingAmount);
+			SDCreditRequirement sdCreditRequirement = sdCreditRequirementRepository.selectByFofoId(fofoId);
+			if (sdCreditRequirement != null) {
+				BigDecimal availableLimit = sdCreditRequirement.getAvailableLimit();
+				BigDecimal creditlimit = sdCreditRequirement.getLimit();
-		model.addAttribute("userWallet", userWallet);
+				model.addAttribute("userWallet", userWallet);
-		model.addAttribute("walletHistories", userWalletHistories);
+				model.addAttribute("walletHistories", userWalletHistories);
-		model.addAttribute("start", offset + 1);
+				model.addAttribute("start", offset + 1);
-		model.addAttribute("size", countItems);
+				model.addAttribute("size", countItems);
-		model.addAttribute("isAdmin", isAdmin);
+				model.addAttribute("isAdmin", isAdmin);
+				model.addAttribute("loans", loans);
+				model.addAttribute("totalAmount", totalAmount);
+				model.addAttribute("availableLimit", availableLimit);
+				model.addAttribute("creditlimit", creditlimit);
-		model.addAttribute(ProfitMandiConstants.START_TIME, startTimeString);
+				model.addAttribute(ProfitMandiConstants.START_TIME, startTimeString);
-		model.addAttribute(ProfitMandiConstants.END_TIME, endTimeString);
+				model.addAttribute(ProfitMandiConstants.END_TIME, endTimeString);
+			}
+		}
 		if (userWalletHistories.size() < limit) {
 			model.addAttribute("end", offset + userWalletHistories.size());
 		} else {
 			model.addAttribute("end", offset + limit);
+		}
 		return "wallet-details";
+	}
 	@RequestMapping(value = "/getPaginatedWalletHistory")
 	public String getSaleHistoryPaginated(HttpServletRequest request,
-			@RequestParam(name = ProfitMandiConstants.START_TIME, required = false) String startTimeString,
+										  @RequestParam(name = ProfitMandiConstants.START_TIME, required = false) String startTimeString,
-			@RequestParam(name = ProfitMandiConstants.END_TIME, required = false) String endTimeString,
+										  @RequestParam(name = ProfitMandiConstants.END_TIME, required = false) String endTimeString,
-			@RequestParam(name = "offset", defaultValue = "0") int offset,
+										  @RequestParam(name = "offset", defaultValue = "0") int offset,
-			@RequestParam(name = "limit", defaultValue = "10") int limit, Model model)
+										  @RequestParam(name = "limit", defaultValue = "10") int limit, Model model)
 			throws ProfitMandiBusinessException {
 		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
 		LocalDateTime startDateTime = StringUtils.toDateTime(startTimeString);
 		LocalDateTime endDateTime = StringUtils.toDateTime(endTimeString);
 		return "wallet-history-paginated";
+	}
 	@RequestMapping(value = "/getAddWalletRequest", method = RequestMethod.GET)
 	public String getAddwalletRequest(HttpServletRequest request,
-			@RequestParam(name = "offset", defaultValue = "0") int offset,
+									  @RequestParam(name = "offset", defaultValue = "0") int offset,
-			@RequestParam(name = "limit", defaultValue = "10") int limit, Model model) throws Exception {
+									  @RequestParam(name = "limit", defaultValue = "10") int limit, Model model) throws Exception {
 		List<AddWalletRequest> walletRequest = null;
 		long size = 0;
 		walletRequest = addWalletRequestRepository.selectAllByStatus(offset, limit, AddWalletRequestStatus.pending);
 		LOGGER.info("walletRequest" + walletRequest);
 		size = addWalletRequestRepository.selectCountByStatus(AddWalletRequestStatus.pending);
 		return "add-wallet-request";
+	}
 	@RequestMapping(value = "/getPaginatedWalletRequest", method = RequestMethod.GET)
 	public String getPaginatedWalletRequest(HttpServletRequest request,
-			@RequestParam(name = "offset", defaultValue = "0") int offset,
+											@RequestParam(name = "offset", defaultValue = "0") int offset,
-			@RequestParam(name = "limit", defaultValue = "10") int limit, Model model) throws Exception {
+											@RequestParam(name = "limit", defaultValue = "10") int limit, Model model) throws Exception {
 		LOGGER.info("requested offset=[{}], limit = [{}]", offset, limit);
 		List<AddWalletRequest> walletRequest = null;
 		walletRequest = addWalletRequestRepository.selectAllByStatus(offset, limit, AddWalletRequestStatus.pending);
 		LOGGER.info("walletRequest" + walletRequest);
 		if (!walletRequest.isEmpty()) {
 		return "add-wallet-request-paginated";
+	}
 	@RequestMapping(value = "/getAddWalletApproved", method = RequestMethod.GET)
 	public String getAddwalletRequestApproved(HttpServletRequest request,
-			@RequestParam(name = "offset", defaultValue = "0") int offset,
+											  @RequestParam(name = "offset", defaultValue = "0") int offset,
-			@RequestParam(name = "limit", defaultValue = "10") int limit, Model model)
+											  @RequestParam(name = "limit", defaultValue = "10") int limit, Model model)
 			throws ProfitMandiBusinessException {
 		List<AddWalletRequest> walletRequest = null;
 		long size = 0;
 		walletRequest = addWalletRequestRepository.selectAllByStatus(offset, limit, AddWalletRequestStatus.approved);
 		return "add-wallet-request";
+	}
 	@RequestMapping(value = "/getPaginatedWalletApproved", method = RequestMethod.GET)
 	public String getPaginatedWalletApproved(HttpServletRequest request,
-			@RequestParam(name = "offset", defaultValue = "0") int offset,
+											 @RequestParam(name = "offset", defaultValue = "0") int offset,
-			@RequestParam(name = "limit", defaultValue = "10") int limit, Model model)
+											 @RequestParam(name = "limit", defaultValue = "10") int limit, Model model)
 			throws ProfitMandiBusinessException {
 		LOGGER.info("requested offset=[{}], limit = [{}]", offset, limit);
 		List<AddWalletRequest> walletRequest = null;
 		walletRequest = addWalletRequestRepository.selectAllByStatus(offset, limit, AddWalletRequestStatus.approved);
 		LOGGER.info("walletRequest" + walletRequest);
 		return "add-wallet-request-paginated";
+	}
 	@RequestMapping(value = "/getAddWalletRequestRejected", method = RequestMethod.GET)
 	public String getAddwalletRequestRejected(HttpServletRequest request,
-			@RequestParam(name = "offset", defaultValue = "0") int offset,
+											  @RequestParam(name = "offset", defaultValue = "0") int offset,
-			@RequestParam(name = "limit", defaultValue = "10") int limit, Model model)
+											  @RequestParam(name = "limit", defaultValue = "10") int limit, Model model)
 			throws ProfitMandiBusinessException {
 		List<AddWalletRequest> walletRequest = null;
 		long size = 0;
 		walletRequest = addWalletRequestRepository.selectAllByStatus(offset, limit, AddWalletRequestStatus.rejected);
 		return "add-wallet-request";
+	}
 	@RequestMapping(value = "/getPaginatedWalletRequestRejected", method = RequestMethod.GET)
 	public String getPaginatedWalletRequestRejected(HttpServletRequest request,
-			@RequestParam(name = "offset", defaultValue = "0") int offset,
+													@RequestParam(name = "offset", defaultValue = "0") int offset,
-			@RequestParam(name = "limit", defaultValue = "10") int limit, Model model)
+													@RequestParam(name = "limit", defaultValue = "10") int limit, Model model)
 			throws ProfitMandiBusinessException {
 		LOGGER.info("requested offset=[{}], limit = [{}]", offset, limit);
 		List<AddWalletRequest> walletRequest = null;
 		walletRequest = addWalletRequestRepository.selectAllByStatus(offset, limit, AddWalletRequestStatus.rejected);
 		LOGGER.info("walletRequest" + walletRequest);
 		return "add-wallet-request-paginated";
+	}
 	@RequestMapping(value = "/addAmountToWallet", method = RequestMethod.PUT)
 	public String addAmountToWallet(HttpServletRequest request, @RequestParam(name = "id", defaultValue = "0") int id,
-			@RequestParam(name = "walletRequestid", defaultValue = "0") int walletRequestid, Model model)
+									@RequestParam(name = "walletRequestid", defaultValue = "0") int walletRequestid, Model model)
 			throws Exception {
 		AddWalletRequest addWalletRequest = addWalletRequestRepository.selectById(walletRequestid);
 		if (addWalletRequest.getStatus().equals(AddWalletRequestStatus.pending)) {
 			walletService.addAmountToWallet(addWalletRequest.getRetailerId(), walletRequestid,
 					"User Id - {0}\n Name -{1}\n Email -{2}\n mobile -{3}\n Reference - {4}\n Amount - Rs.{5}",
 					new Integer(addWalletRequest.getRetailerId()), customRetailer.getBusinessName(),
 					customRetailer.getEmail(), customRetailer.getMobileNumber(),
 					addWalletRequest.getTransaction_reference(), new Float(addWalletRequest.getAmount()));
-		//	this.sendMailWithAttachments(subject, messageText);
+			//	this.sendMailWithAttachments(subject, messageText);
 			return "response";
 		} else {
 			model.addAttribute("response1", mvcResponseSender.createResponseString(false));
 			return "response";
+		}
+	}
 	@RequestMapping(value = "/addAmountToWalletRequestRejected", method = RequestMethod.PUT)
 	public String addAmountToWalletRequestRejected(HttpServletRequest request,
-			@RequestParam(name = "id", defaultValue = "0") int id, Model model) throws Exception {
+												   @RequestParam(name = "id", defaultValue = "0") int id, Model model) throws Exception {
 		AddWalletRequest addWalletRequest = addWalletRequestRepository.selectById(id);
 		if (addWalletRequest.getStatus().equals(AddWalletRequestStatus.pending)) {
 			addWalletRequest.setStatus(AddWalletRequestStatus.rejected);
 			addWalletRequest.setUpdateTimestamp(LocalDateTime.now());
+	}
 	private void sendMailWithAttachments(String subject, String messageText) throws Exception {
 		MimeMessage message = mailSender.createMimeMessage();
 		MimeMessageHelper helper = new MimeMessageHelper(message, true);
-		String[] email = { "neerajgupta2021@gmail.com", "adeel.yazdani@smartdukaan.com",
+		String[] email = {"neerajgupta2021@gmail.com", "adeel.yazdani@smartdukaan.com",
-				"kamini.sharma@smartdukaan.com", "care@smartdukaan.com", "mohinder.mutreja@smartdukaan.com" };
+				"kamini.sharma@smartdukaan.com", "care@smartdukaan.com", "mohinder.mutreja@smartdukaan.com"};
 		helper.setSubject(subject);
 		helper.setText(messageText);
 		helper.setTo(email);
 		InternetAddress senderAddress = new InternetAddress("noreply@smartdukaan.com", "Smartdukaan Alerts");
 		helper.setFrom(senderAddress);
 		return walletRequest.stream().map(x -> x.getRetailerId()).distinct().collect(Collectors.toList());
+	}
 	@RequestMapping(value = "/getcreateUnsettledPayments", method = RequestMethod.GET)
 	public String getcreateUnsettledPayment(HttpServletRequest request,
-			@RequestParam(name = "offset", defaultValue = "0") int offset,
+											@RequestParam(name = "offset", defaultValue = "0") int offset,
-			@RequestParam(name = "limit", defaultValue = "15") int limit, Model model) throws Exception {
+											@RequestParam(name = "limit", defaultValue = "15") int limit, Model model) throws Exception {
 		List<UnsettledPayment> up = null;
 		long size = 0;
 		up = unsettledPaymentsRepository.selectAllById(offset, limit);
 		return "unsettled-payments";
+	}
 	@RequestMapping(value = "/getUnsettledPaymentsByAmount", method = RequestMethod.GET)
 	public String getUnsettledPaymentByAmount(HttpServletRequest request,
-			@RequestParam(name = "amount", defaultValue = "0") float amount,
+											  @RequestParam(name = "amount", defaultValue = "0") float amount,
-			@RequestParam(name = "offset", defaultValue = "0") int offset,
+											  @RequestParam(name = "offset", defaultValue = "0") int offset,
-			@RequestParam(name = "limit", defaultValue = "10") int limit, Model model) throws Exception {
+											  @RequestParam(name = "limit", defaultValue = "10") int limit, Model model) throws Exception {
 		List<UnsettledPayment> up = null;
 		long size = 0;
 		up = unsettledPaymentsRepository.selectAllByAmount(amount, offset, limit);
 		return "unsettle-payment-modal";
+	}
 	@RequestMapping(value = "/createUnsettledPaymentsEntries", method = RequestMethod.POST)
 	public String createUnsettledPaymentsEntries(HttpServletRequest request,
-			@RequestBody UnsettledPaymentModel unsettledPaymentModel, Model model) throws Exception {
+												 @RequestBody UnsettledPaymentModel unsettledPaymentModel, Model model) throws Exception {
 		UnsettledPayment up = new UnsettledPayment();
 		up.setTransaction_reference(unsettledPaymentModel.getTransactionReference());
 		up.setAmount(unsettledPaymentModel.getAmount());
 		up.setDescription(unsettledPaymentModel.getDescription());
 		return "response";
+	}
 	@RequestMapping(value = "/removeUnsettledPaymentsEntries", method = RequestMethod.DELETE)
 	public String removeUnsettledPaymentsEntries(HttpServletRequest request,
-			@RequestParam(name = "id", defaultValue = "0") int id, Model model) throws Exception {
+												 @RequestParam(name = "id", defaultValue = "0") int id, Model model) throws Exception {
 		unsettledPaymentsRepository.deleteById(id);
 		model.addAttribute("response1", mvcResponseSender.createResponseString(true));
 		return "response";
+	}
 	@RequestMapping(value = "/wallet/statement", method = RequestMethod.GET)
 	public String getWalletStatement(HttpServletRequest request, @RequestParam LocalDateTime startDate,
-			@RequestParam LocalDateTime endDate, Model model, @RequestParam(defaultValue = "0") int fofoId)
+									 @RequestParam LocalDateTime endDate, Model model, @RequestParam(defaultValue = "0") int fofoId)
 			throws Exception {
 		boolean isAdmin = roleManager.isAdmin(cookiesProcessor.getCookiesObject(request).getRoleIds());
 		if (fofoId > 0) {
 			if (!isAdmin) {
 				throw new ProfitMandiBusinessException("Unauthorised access", "PartnerId", "Permission Denied");
 		return new ResponseEntity<InputStreamResource>(inputStreamResource, headers, HttpStatus.OK);
+	}
 	@RequestMapping(value = "/account/closing-statements", method = RequestMethod.GET)
 	public ResponseEntity<?> getAccountStatement(HttpServletRequest request, @RequestParam LocalDate closingDate,
-			Model model) throws Exception {
+												 Model model) throws Exception {
 		boolean isAdmin = roleManager.isAdmin(cookiesProcessor.getCookiesObject(request).getRoleIds());
 		if (!isAdmin) {
 			throw new ProfitMandiBusinessException("Unauthorised access", "PartnerId", "Permission Denied");
+		}
 		LocalDateTime closingDateTime = closingDate.atStartOfDay().plusDays(1);
+	}
 	@RequestMapping(value = "/account/statement", method = RequestMethod.GET)
 	public ResponseEntity<?> getAccountStatement(HttpServletRequest request, @RequestParam LocalDateTime startDate,
-			@RequestParam LocalDateTime endDate, Model model, @RequestParam(defaultValue = "0") int fofoId)
+												 @RequestParam LocalDateTime endDate, Model model, @RequestParam(defaultValue = "0") int fofoId)
 			throws Exception {
 		boolean isAdmin = roleManager.isAdmin(cookiesProcessor.getCookiesObject(request).getRoleIds());
 		if (fofoId > 0) {
 			if (!isAdmin) {
 				throw new ProfitMandiBusinessException("Unauthorised access", "PartnerId", "Permission Denied");
 		return new ResponseEntity<InputStreamResource>(inputStreamResource, headers, HttpStatus.OK);
+	}
 	private ByteArrayOutputStream populateData(InputStream is, float openingBalance, float closingBalance,
-			String partnerName, List<UserWalletHistory> history, LocalDateTime startDate, LocalDateTime endDate,
+											   String partnerName, List<UserWalletHistory> history, LocalDateTime startDate, LocalDateTime endDate,
-			List<StatementDetailModel> invoiceDetails) throws Exception {
+											   List<StatementDetailModel> invoiceDetails) throws Exception {
 		XSSFWorkbook workbook = new XSSFWorkbook(is);
 		CreationHelper creationHelper = workbook.getCreationHelper();
 		CellStyle style2 = workbook.createCellStyle();
 		style2.setDataFormat(creationHelper.createDataFormat().getFormat("mm/dd/yyyy hh:mm:ss"));
+	}
 	@RequestMapping(value = "/getWalletHistory", method = RequestMethod.GET)
 	public String getWalletHistory(HttpServletRequest request,
-			@RequestParam(name = "reference", defaultValue = "0") int reference,
+								   @RequestParam(name = "reference", defaultValue = "0") int reference,
-			@RequestParam WalletReferenceType referenceType, Model model) throws Exception {
+								   @RequestParam WalletReferenceType referenceType, Model model) throws Exception {
 		LOGGER.info("type" + referenceType);
 		List<UserWalletHistory> userWalletHistory = userWalletHistoryRepository
 				.selectAllByreferenceIdandreferenceType(reference, referenceType);
 		model.addAttribute("response1", mvcResponseSender.createResponseString(true));
 		return "wallet-history";
+	}
 	@RequestMapping(value = "/getWalletHistoryByPartner", method = RequestMethod.GET)
 	public String getWalletHistoryByPartner(HttpServletRequest request, int fofoId,
-			@RequestParam(name = "referenceType", required = false) WalletReferenceType referenceType,
+											@RequestParam(name = "referenceType", required = false) WalletReferenceType referenceType,
-			@RequestParam(name = "offset", required = false, defaultValue = "0") int offset,
+											@RequestParam(name = "offset", required = false, defaultValue = "0") int offset,
-			@RequestParam(name = "limit", required = false, defaultValue = "30") int limit, Model model)
+											@RequestParam(name = "limit", required = false, defaultValue = "30") int limit,
+											Model model)
 			throws Exception {
 		UserWallet userWallet = userWalletRepository.selectByRetailerId(fofoId);
 		List<UserWalletHistory> userWalletHistory = userWalletHistoryRepository.selectPaginatedByWalletIdReferenceType(
 				userWallet.getId(), referenceType, SortOrder.DESCENDING, offset, limit);
 		CustomRetailer customretailer = retailerService.getFofoRetailer(fofoId);
+		List<Loan> loans = loanRepository.selectAllActiveLoan();
+		for (Loan loan : loans) {
+			int loanId = loan.getId();
+			BigDecimal pendingAmount = loan.getPendingAmount();
+			BigDecimal interestAccrued = loan.getInterestAccrued();
+			BigDecimal interestPaid = loan.getInterestPaid();
+			BigDecimal totalAmount = interestAccrued.subtract(interestPaid).add(pendingAmount);
+			SDCreditRequirement sdCreditRequirement = sdCreditRequirementRepository.selectByFofoId(fofoId);
+				if (sdCreditRequirement != null) {
+			BigDecimal availableLimit = sdCreditRequirement.getAvailableLimit();
+			BigDecimal creditlimit = sdCreditRequirement.getLimit();
-		model.addAttribute("userWallet", userWallet);
+			model.addAttribute("userWallet", userWallet);
-		model.addAttribute("customretailer", customretailer);
+			model.addAttribute("customretailer", customretailer);
-		model.addAttribute("wallethistory", userWalletHistory);
+			model.addAttribute("wallethistory", userWalletHistory);
+			model.addAttribute("loans", loans);
+			model.addAttribute("totalAmount", totalAmount);
+			model.addAttribute("availableLimit", availableLimit);
+			model.addAttribute("creditlimit", creditlimit);
+			model.addAttribute("response1", mvcResponseSender.createResponseString(true));
+			}
+		}
+			return "wallet-history";
+	}
-		model.addAttribute("response1", mvcResponseSender.createResponseString(true));
-		return "wallet-history";
-	}
 	@RequestMapping(value = "/getPartnerName", method = RequestMethod.GET)
 	public String getPartnerName(HttpServletRequest request,
 			@RequestParam(name = "reference", defaultValue = "0") int reference,
 			@RequestParam WalletReferenceType referenceType, Model model) throws Exception {

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/WalletController.java – Rev 31647 → 32490