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

     private RoleManager roleManager;
     @Autowired
     private FofoStoreRepository fofoStoreRepository;
     @Autowired
     private ManualPaymentRequestRepository manualPaymentRequestRepository;
-    @Autowired
-    AddWalletRequestRepository addWalletRequestRepository;
     @Autowired
     private CreditAccountRepository creditAccountRepository;
     @Autowired
     private NotificationService notificationService;
     private LoanStatementRepository loanStatementRepository;
     @Autowired
     SDCreditRequirementRepository sdCreditRequirementRepository;
     @PostMapping(value = "/wallet/upload")
-    public String uploadWalletBulk(HttpServletRequest request, @RequestPart("file") MultipartFile file, Model model)
+    public String uploadWalletBulk(HttpServletRequest request, @RequestPart("file") MultipartFile file, Model model) throws Exception {
-            throws Exception {
         List<WalletHistoryModel> walletHistoryModelList = ExcelUtils.parseWalletBulkCredit(file.getInputStream());
         for (WalletHistoryModel walletHistoryModel : walletHistoryModelList) {
             if (walletHistoryModel.getReference() == 0) {
-                ManualPaymentType paymentType = manualPaymentRequestRepository
-                        .selectByReferenceType(walletHistoryModel.getWalletReferenceType());
+                ManualPaymentType paymentType = manualPaymentRequestRepository.selectByReferenceType(walletHistoryModel.getWalletReferenceType());
                 if (paymentType == null) {
                     paymentType = new ManualPaymentType();
                     paymentType.setReferenceType(walletHistoryModel.getWalletReferenceType());
                     manualPaymentRequestRepository.persist(paymentType);
+                }
                 paymentType.setCounter(paymentType.getCounter() + 1);
                 int reference = paymentType.getCounter();
-                walletService.addAmountToWallet(walletHistoryModel.getFofoId(), reference,
-                        walletHistoryModel.getWalletReferenceType(), walletHistoryModel.getDescription(),
+                walletService.addAmountToWallet(walletHistoryModel.getFofoId(), reference, walletHistoryModel.getWalletReferenceType(), walletHistoryModel.getDescription(), (float) walletHistoryModel.getAmount(), walletHistoryModel.getBusinessDate());
-                        (float) walletHistoryModel.getAmount(), walletHistoryModel.getBusinessDate());
             } else {
-                walletService.addAmountToWallet(walletHistoryModel.getFofoId(), walletHistoryModel.getReference(),
+                walletService.addAmountToWallet(walletHistoryModel.getFofoId(), walletHistoryModel.getReference(), walletHistoryModel.getWalletReferenceType(), walletHistoryModel.getDescription(), (float) walletHistoryModel.getAmount(), walletHistoryModel.getBusinessDate());
-                        walletHistoryModel.getWalletReferenceType(), walletHistoryModel.getDescription(),
-                        (float) walletHistoryModel.getAmount(), walletHistoryModel.getBusinessDate());
+            }
+        }
         model.addAttribute("response1", mvcResponseSender.createResponseString(true));
         return "response";
+    }
     @RequestMapping(value = "/walletDetails", method = RequestMethod.GET)
-    public String dashboard(HttpServletRequest request,
+    public String dashboard(HttpServletRequest request, @RequestParam(name = ProfitMandiConstants.START_TIME, required = false) String startTimeString, @RequestParam(name = ProfitMandiConstants.END_TIME, required = false) String endTimeString, @RequestParam(name = "offset", defaultValue = "0") int offset, @RequestParam(name = "limit", defaultValue = "100") int limit, Model model) throws ProfitMandiBusinessException {
-                            @RequestParam(name = ProfitMandiConstants.START_TIME, required = false) String startTimeString,
-                            @RequestParam(name = ProfitMandiConstants.END_TIME, required = false) String endTimeString,
-                            @RequestParam(name = "offset", defaultValue = "0") int offset,
-                            @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"); }
          */
         LocalDateTime startDateTime = StringUtils.toDateTime(startTimeString);
         LocalDateTime endDateTime = StringUtils.toDateTime(endTimeString);
         List<UserWalletHistory> userWalletHistories = new ArrayList<>();
         try {
-            userWalletHistories = walletService.getPaginatedUserWalletHistoryByRetailerId(fofoId,
+            userWalletHistories = walletService.getPaginatedUserWalletHistoryByRetailerId(fofoId, startDateTime, endDateTime, offset, limit);
-                    startDateTime, endDateTime, offset, limit);
         } catch (ProfitMandiBusinessException profitMandiBusinessException) {
             LOGGER.error("UserWallet History not found : ", profitMandiBusinessException);
+        }
         long countItems = 0;
+        }
         return "wallet-details";
+    }
     @RequestMapping(value = "/getPaginatedWalletHistory")
-    public String getSaleHistoryPaginated(HttpServletRequest request,
+    public String getSaleHistoryPaginated(HttpServletRequest request, @RequestParam(name = ProfitMandiConstants.START_TIME, required = false) String startTimeString, @RequestParam(name = ProfitMandiConstants.END_TIME, required = false) String endTimeString, @RequestParam(name = "offset", defaultValue = "0") int offset, @RequestParam(name = "limit", defaultValue = "10") int limit, Model model) throws ProfitMandiBusinessException {
-                                          @RequestParam(name = ProfitMandiConstants.START_TIME, required = false) String startTimeString,
-                                          @RequestParam(name = ProfitMandiConstants.END_TIME, required = false) String endTimeString,
-                                          @RequestParam(name = "offset", defaultValue = "0") int offset,
-                                          @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);
         List<UserWalletHistory> userWalletHistories = new ArrayList<>();
         try {
-            userWalletHistories = walletService.getPaginatedUserWalletHistoryByRetailerId(loginDetails.getFofoId(),
+            userWalletHistories = walletService.getPaginatedUserWalletHistoryByRetailerId(loginDetails.getFofoId(), startDateTime, endDateTime, offset, limit);
-                    startDateTime, endDateTime, offset, limit);
         } catch (ProfitMandiBusinessException profitMandiBusinessException) {
             LOGGER.error("UserWallet History not found : ", profitMandiBusinessException);
+        }
         model.addAttribute("walletHistories", userWalletHistories);
         return "wallet-history-paginated";
+    }
     @RequestMapping(value = "/getAddWalletRequest", method = RequestMethod.GET)
-    public String getAddwalletRequest(HttpServletRequest request,
-                                      @RequestParam(name = "offset", defaultValue = "0") int offset,
-                                      @RequestParam(name = "limit", defaultValue = "10") int limit, Model model) throws Exception {
+    public String getAddwalletRequest(HttpServletRequest request, @RequestParam(name = "offset", defaultValue = "0") int offset, @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);
         if (!walletRequest.isEmpty()) {
             List<Integer> fofoIds = this.getFofoIdsFromWalletRequest(walletRequest);
             Map<Integer, CustomRetailer> customRetailerMap = retailerService.getAllFofoRetailers();
-            Map<Integer, CustomRetailer> fofoIdsAndRetailerName = fofoIds.stream().map(x -> customRetailerMap.get(x))
+            Map<Integer, CustomRetailer> fofoIdsAndRetailerName = fofoIds.stream().map(x -> customRetailerMap.get(x)).filter(x -> x != null).collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
-                    .filter(x -> x != null).collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
             model.addAttribute("fofoIdsAndRetailerName", fofoIdsAndRetailerName);
             model.addAttribute("walletRequest", walletRequest);
             model.addAttribute("rStatus", "pending");
             model.addAttribute("start", offset + 1);
+        }
         return "add-wallet-request";
+    }
     @RequestMapping(value = "/getPaginatedWalletRequest", method = RequestMethod.GET)
-    public String getPaginatedWalletRequest(HttpServletRequest request,
-                                            @RequestParam(name = "offset", defaultValue = "0") int offset,
-                                            @RequestParam(name = "limit", defaultValue = "10") int limit, Model model) throws Exception {
+    public String getPaginatedWalletRequest(HttpServletRequest request, @RequestParam(name = "offset", defaultValue = "0") int offset, @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()) {
             List<Integer> fofoIds = this.getFofoIdsFromWalletRequest(walletRequest);
             Map<Integer, CustomRetailer> customRetailerMap = retailerService.getAllFofoRetailers();
-            Map<Integer, CustomRetailer> fofoIdsAndRetailerName = fofoIds.stream().map(x -> customRetailerMap.get(x))
+            Map<Integer, CustomRetailer> fofoIdsAndRetailerName = fofoIds.stream().map(x -> customRetailerMap.get(x)).filter(x -> x != null).collect(Collectors.toList()).stream().collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
-                    .filter(x -> x != null).collect(Collectors.toList()).stream()
-                    .collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
             model.addAttribute("fofoIdsAndRetailerName", fofoIdsAndRetailerName);
             model.addAttribute("walletRequest", walletRequest);
             model.addAttribute("rStatus", "pending");
             model.addAttribute("url", "/getPaginatedWalletRequest");
         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 = "limit", defaultValue = "10") int limit, Model model)
+    public String getAddwalletRequestApproved(HttpServletRequest request, @RequestParam(name = "offset", defaultValue = "0") int offset, @RequestParam(name = "limit", defaultValue = "10") int limit, Model model) throws ProfitMandiBusinessException {
-            throws ProfitMandiBusinessException {
         List<AddWalletRequest> walletRequest = null;
         long size = 0;
         walletRequest = addWalletRequestRepository.selectAllByStatus(offset, limit, AddWalletRequestStatus.approved);
         size = addWalletRequestRepository.selectCountByStatus(AddWalletRequestStatus.approved);
         LOGGER.info("walletRequest" + walletRequest);
         if (!walletRequest.isEmpty()) {
             List<Integer> fofoIds = this.getFofoIdsFromWalletRequest(walletRequest);
             Map<Integer, CustomRetailer> customRetailerMap = retailerService.getAllFofoRetailers();
-            Map<Integer, CustomRetailer> fofoIdsAndRetailerName = fofoIds.stream().map(x -> customRetailerMap.get(x))
+            Map<Integer, CustomRetailer> fofoIdsAndRetailerName = fofoIds.stream().map(x -> customRetailerMap.get(x)).filter(x -> x != null).collect(Collectors.toList()).stream().collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
-                    .filter(x -> x != null).collect(Collectors.toList()).stream()
-                    .collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
             model.addAttribute("fofoIdsAndRetailerName", fofoIdsAndRetailerName);
             model.addAttribute("walletRequest", walletRequest);
             model.addAttribute("start", offset + 1);
             model.addAttribute("size", size);
+        }
         return "add-wallet-request";
+    }
     @RequestMapping(value = "/getPaginatedWalletApproved", method = RequestMethod.GET)
-    public String getPaginatedWalletApproved(HttpServletRequest request,
-                                             @RequestParam(name = "offset", defaultValue = "0") int offset,
-                                             @RequestParam(name = "limit", defaultValue = "10") int limit, Model model)
+    public String getPaginatedWalletApproved(HttpServletRequest request, @RequestParam(name = "offset", defaultValue = "0") int offset, @RequestParam(name = "limit", defaultValue = "10") int limit, Model model) throws ProfitMandiBusinessException {
-            throws ProfitMandiBusinessException {
         LOGGER.info("requested offset=[{}], limit = [{}]", offset, limit);
         List<AddWalletRequest> walletRequest = null;
         walletRequest = addWalletRequestRepository.selectAllByStatus(offset, limit, AddWalletRequestStatus.approved);
         LOGGER.info("walletRequest" + walletRequest);
         if (!walletRequest.isEmpty()) {
             List<Integer> fofoIds = this.getFofoIdsFromWalletRequest(walletRequest);
             Map<Integer, CustomRetailer> customRetailerMap = retailerService.getAllFofoRetailers();
-            Map<Integer, CustomRetailer> fofoIdsAndRetailerName = fofoIds.stream().map(x -> customRetailerMap.get(x))
+            Map<Integer, CustomRetailer> fofoIdsAndRetailerName = fofoIds.stream().map(x -> customRetailerMap.get(x)).filter(x -> x != null).collect(Collectors.toList()).stream().collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
-                    .filter(x -> x != null).collect(Collectors.toList()).stream()
-                    .collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
             model.addAttribute("fofoIdsAndRetailerName", fofoIdsAndRetailerName);
             model.addAttribute("walletRequest", walletRequest);
             model.addAttribute("url", "/getPaginatedWalletApproved");
         } else {
+        }
         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 = "limit", defaultValue = "10") int limit, Model model)
+    public String getAddwalletRequestRejected(HttpServletRequest request, @RequestParam(name = "offset", defaultValue = "0") int offset, @RequestParam(name = "limit", defaultValue = "10") int limit, Model model) throws ProfitMandiBusinessException {
-            throws ProfitMandiBusinessException {
         List<AddWalletRequest> walletRequest = null;
         long size = 0;
         walletRequest = addWalletRequestRepository.selectAllByStatus(offset, limit, AddWalletRequestStatus.rejected);
         size = addWalletRequestRepository.selectCountByStatus(AddWalletRequestStatus.rejected);
         LOGGER.info("walletRequest" + walletRequest);
         if (!walletRequest.isEmpty()) {
             List<Integer> fofoIds = this.getFofoIdsFromWalletRequest(walletRequest);
             Map<Integer, CustomRetailer> customRetailerMap = retailerService.getAllFofoRetailers();
-            Map<Integer, CustomRetailer> fofoIdsAndRetailerName = fofoIds.stream().map(x -> customRetailerMap.get(x))
+            Map<Integer, CustomRetailer> fofoIdsAndRetailerName = fofoIds.stream().map(x -> customRetailerMap.get(x)).filter(x -> x != null).collect(Collectors.toList()).stream().collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
-                    .filter(x -> x != null).collect(Collectors.toList()).stream()
-                    .collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
             model.addAttribute("fofoIdsAndRetailerName", fofoIdsAndRetailerName);
             model.addAttribute("walletRequest", walletRequest);
             model.addAttribute("start", offset + 1);
             model.addAttribute("size", size);
         return "add-wallet-request";
+    }
     @RequestMapping(value = "/getPaginatedWalletRequestRejected", method = RequestMethod.GET)
-    public String getPaginatedWalletRequestRejected(HttpServletRequest request,
+    public String getPaginatedWalletRequestRejected(HttpServletRequest request, @RequestParam(name = "offset", defaultValue = "0") int offset, @RequestParam(name = "limit", defaultValue = "10") int limit, Model model) throws ProfitMandiBusinessException {
-                                                    @RequestParam(name = "offset", defaultValue = "0") int offset,
-                                                    @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);
         if (!walletRequest.isEmpty()) {
             List<Integer> fofoIds = this.getFofoIdsFromWalletRequest(walletRequest);
             Map<Integer, CustomRetailer> customRetailerMap = retailerService.getAllFofoRetailers();
-            Map<Integer, CustomRetailer> fofoIdsAndRetailerName = fofoIds.stream().map(x -> customRetailerMap.get(x))
+            Map<Integer, CustomRetailer> fofoIdsAndRetailerName = fofoIds.stream().map(x -> customRetailerMap.get(x)).filter(x -> x != null).collect(Collectors.toList()).stream().collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
-                    .filter(x -> x != null).collect(Collectors.toList()).stream()
-                    .collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
             model.addAttribute("fofoIdsAndRetailerName", fofoIdsAndRetailerName);
             model.addAttribute("walletRequest", walletRequest);
             model.addAttribute("url", "/getPaginatedWalletRequestRejected");
         } else {
             model.addAttribute("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,
+    public String addAmountToWallet(HttpServletRequest request, @RequestParam(name = "id", defaultValue = "0") int id, @RequestParam(name = "walletRequestid", defaultValue = "0") int walletRequestid, Model model) throws Exception {
-                                    @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,
+            walletService.addAmountToWallet(addWalletRequest.getRetailerId(), walletRequestid, WalletReferenceType.ADVANCE_AMOUNT, "ntfs/rgfs", addWalletRequest.getAmount(), addWalletRequest.getCreateTimestamp());
-                    WalletReferenceType.ADVANCE_AMOUNT, "ntfs/rgfs", addWalletRequest.getAmount(),
-                    addWalletRequest.getCreateTimestamp());
             addWalletRequest.setStatus(AddWalletRequestStatus.approved);
             addWalletRequest.setUpdateTimestamp(LocalDateTime.now());
             addWalletRequestRepository.persist(addWalletRequest);
             unsettledPaymentsRepository.deleteById(id);
             model.addAttribute("response1", mvcResponseSender.createResponseString(true));
             CustomRetailer customRetailer = retailerService.getFofoRetailer(addWalletRequest.getRetailerId());
-            String subject = "Request Approved for " + customRetailer.getBusinessName() + " of Rs."
+            String subject = "Request Approved for " + customRetailer.getBusinessName() + " of Rs." + addWalletRequest.getAmount();
-                    + addWalletRequest.getAmount();
-            String messageText = MessageFormat.format(
-                    "User Id - {0}\n Name -{1}\n Email -{2}\n mobile -{3}\n Reference - {4}\n Amount - Rs.{5}",
+            String messageText = MessageFormat.format("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()));
-                    new Integer(addWalletRequest.getRetailerId()), customRetailer.getBusinessName(),
-                    customRetailer.getEmail(), customRetailer.getMobileNumber(),
-                    addWalletRequest.getTransaction_reference(), new Float(addWalletRequest.getAmount()));
             //	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 {
+    public String addAmountToWalletRequestRejected(HttpServletRequest request, @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());
             addWalletRequestRepository.persist(addWalletRequest);
             model.addAttribute("response1", mvcResponseSender.createResponseString(true));
             CustomRetailer customRetailer = retailerService.getFofoRetailer(addWalletRequest.getRetailerId());
-            String subject = "Request Rejected for " + customRetailer.getBusinessName() + " of Rs."
+            String subject = "Request Rejected for " + customRetailer.getBusinessName() + " of Rs." + addWalletRequest.getAmount();
-                    + addWalletRequest.getAmount();
-            String messageText = MessageFormat.format(
-                    "User Id - {0}\n Name -{1}\n Email -{2}\n mobile -{3}\n Reference - {4}\n Amount - Rs.{5}",
+            String messageText = MessageFormat.format("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()));
-                    new Integer(addWalletRequest.getRetailerId()), customRetailer.getBusinessName(),
-                    customRetailer.getEmail(), customRetailer.getMobileNumber(),
-                    addWalletRequest.getTransaction_reference(), new Float(addWalletRequest.getAmount()));
             //this.sendMailWithAttachments(subject, messageText);
             return "response";
         } else {
             model.addAttribute("response1", mvcResponseSender.createResponseString(false));
+    }
     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",
-                "kamini.sharma@smartdukaan.com", "care@smartdukaan.com", "mohinder.mutreja@smartdukaan.com"};
+        String[] email = {"neerajgupta2021@gmail.com", "adeel.yazdani@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);
     private List<Integer> getFofoIdsFromWalletRequest(List<AddWalletRequest> walletRequest) {
         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 = "limit", defaultValue = "15") int limit, Model model) throws Exception {
+    public String getcreateUnsettledPayment(HttpServletRequest request, @RequestParam(name = "offset", defaultValue = "0") int offset, @RequestParam(name = "limit", defaultValue = "15") int limit, Model model) throws Exception {
         List<UnsettledPayment> up = null;
         long size = 0;
         up = unsettledPaymentsRepository.selectAllById(offset, limit);
         LOGGER.info("unsettledPaymentList" + up);
         return "unsettled-payments";
+    }
     @RequestMapping(value = "/getUnsettledPaymentsByAmount", method = RequestMethod.GET)
-    public String getUnsettledPaymentByAmount(HttpServletRequest request,
+    public String getUnsettledPaymentByAmount(HttpServletRequest request, @RequestParam(name = "amount", defaultValue = "0") float amount, @RequestParam(name = "offset", defaultValue = "0") int offset, @RequestParam(name = "limit", defaultValue = "10") int limit, Model model) throws Exception {
-                                              @RequestParam(name = "amount", defaultValue = "0") float amount,
-                                              @RequestParam(name = "offset", defaultValue = "0") int offset,
-                                              @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 {
+    public String createUnsettledPaymentsEntries(HttpServletRequest request, @RequestBody UnsettledPaymentModel unsettledPaymentModel, Model model) throws Exception {
         UnsettledPayment up = new UnsettledPayment();
         up.setTransaction_reference(unsettledPaymentModel.getTransactionReference());
         up.setAmount(unsettledPaymentModel.getAmount());
         up.setDescription(unsettledPaymentModel.getDescription());
         model.addAttribute("response1", mvcResponseSender.createResponseString(true));
         return "response";
+    }
     @RequestMapping(value = "/removeUnsettledPaymentsEntries", method = RequestMethod.DELETE)
-    public String removeUnsettledPaymentsEntries(HttpServletRequest request,
-                                                 @RequestParam(name = "id", defaultValue = "0") int id, Model model) throws Exception {
+    public String removeUnsettledPaymentsEntries(HttpServletRequest request, @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)
+    public String getWalletStatement(HttpServletRequest request, @RequestParam LocalDateTime startDate, @RequestParam LocalDateTime endDate, Model model, @RequestParam(defaultValue = "0") int fofoId) throws Exception {
-            throws Exception {
         boolean isAdmin = roleManager.isAdmin(cookiesProcessor.getCookiesObject(request).getRoleIds());
         if (fofoId > 0) {
             if (!isAdmin) {
                 throw new ProfitMandiBusinessException("Unauthorised access", "PartnerId", "Permission Denied");
+            }
         } else {
             fofoId = cookiesProcessor.getCookiesObject(request).getFofoId();
+        }
         float openingBalance = walletService.getOpeningTill(fofoId, startDate);
         float closingBalance = walletService.getOpeningTill(fofoId, endDate);
-        List<UserWalletHistory> uwhList = walletService.getPaginatedUserWalletHistoryByRetailerId(fofoId, startDate,
+        List<UserWalletHistory> uwhList = walletService.getPaginatedUserWalletHistoryByRetailerId(fofoId, startDate, endDate, 0, 0);
-                endDate, 0, 0);
         Collections.reverse(uwhList);
         model.addAttribute("opening", openingBalance);
         model.addAttribute("closing", closingBalance);
         model.addAttribute("history", uwhList);
         model.addAttribute("startDate", startDate);
         model.addAttribute("endDate", endDate);
         return "walletStatement";
+    }
     @RequestMapping(value = "/account/reco", method = RequestMethod.GET)
-    public ResponseEntity<?> accountReco(HttpServletRequest request, @RequestParam LocalDate closingDate, Model model)
+    public ResponseEntity<?> accountReco(HttpServletRequest request, @RequestParam LocalDate closingDate, Model model) throws Exception {
-            throws Exception {
         boolean isAdmin = roleManager.isAdmin(cookiesProcessor.getCookiesObject(request).getRoleIds());
         if (!isAdmin) {
             throw new ProfitMandiBusinessException("Unauthorised access", "PartnerId", "Permission Denied");
+        }
         LocalDateTime closingDateTime = LocalDate.now().atStartOfDay().plusDays(1);
         Set<Integer> retailersSet = customRetailerMap.keySet();
         Map<Integer, Float> closingPurchaseMap = orderRepository.selectOpeningAmount(closingDateTime, retailersSet);
         Map<Integer, UserWallet> retailerWalletMap = walletService.getRetailerIdUserWalletMap(retailersSet);
-        Map<Integer, Integer> walletRetailerMap = retailerWalletMap.entrySet().stream()
+        Map<Integer, Integer> walletRetailerMap = retailerWalletMap.entrySet().stream().collect(Collectors.toMap(x -> x.getValue().getId(), x -> x.getKey()));
-                .collect(Collectors.toMap(x -> x.getValue().getId(), x -> x.getKey()));
         Set<Integer> walletSet = walletRetailerMap.keySet();
-        Map<Integer, Float> closingBalanceMap = userWalletHistoryRepository
+        Map<Integer, Float> closingBalanceMap = userWalletHistoryRepository.getSumTillDateExcludingPurchase(closingDateTime, walletSet);
-                .getSumTillDateExcludingPurchase(closingDateTime, walletSet);
         Map<Integer, Float> closingWalletMap = userWalletHistoryRepository.getSumTillDate(closingDateTime, walletSet);
         Map<Integer, Float> peindingIndentMap = transactionService.getPendingIndentValueMap();
         List<List<?>> rows = new ArrayList<>();
         for (Map.Entry<Integer, Float> closingBalance : closingBalanceMap.entrySet()) {
                 accountClosing = closingBalance.getValue() - closingPurchaseMap.get(retailerId);
+            }
             CustomRetailer cr = customRetailerMap.get(retailerId);
-            rows.add(Arrays.asList(retailerId, cr.getBusinessName(), cr.getAddress().getCity(),
+            rows.add(Arrays.asList(retailerId, cr.getBusinessName(), cr.getAddress().getCity(), cr.getAddress().getState(), accountClosing, closingWalletMap.get(walletId), peindingIndentMap.get(retailerId)));
-                    cr.getAddress().getState(), accountClosing, closingWalletMap.get(walletId),
-                    peindingIndentMap.get(retailerId)));
+        }
-        org.apache.commons.io.output.ByteArrayOutputStream byteArrayOutputStream = FileUtil.getCSVByteStream(
-                Arrays.asList("Id", "Partner Name", "City", "State", "Closing Balance", "Closing Wallet", "In Transit"),
+        org.apache.commons.io.output.ByteArrayOutputStream byteArrayOutputStream = FileUtil.getCSVByteStream(Arrays.asList("Id", "Partner Name", "City", "State", "Closing Balance", "Closing Wallet", "In Transit"), rows);
-                rows);
         final HttpHeaders headers = new HttpHeaders();
         headers.set("Content-Type", "text/csv");
-        headers.set("Content-disposition",
-                "inline; filename=account-statement-closing-." + StringUtils.toHyphenatedString(closingDate) + ".csv");
+        headers.set("Content-disposition", "inline; filename=account-statement-closing-." + StringUtils.toHyphenatedString(closingDate) + ".csv");
         headers.setContentLength(byteArrayOutputStream.toByteArray().length);
         final InputStream inputStream = new ByteArrayInputStream(byteArrayOutputStream.toByteArray());
         final InputStreamResource inputStreamResource = new InputStreamResource(inputStream);
         return new ResponseEntity<InputStreamResource>(inputStreamResource, headers, HttpStatus.OK);
+    }
     @RequestMapping(value = "/account/closing-statements", method = RequestMethod.GET)
-    public ResponseEntity<?> getAccountStatement(HttpServletRequest request, @RequestParam LocalDate closingDate,
+    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);
         Set<Integer> retailersSet = customRetailerMap.keySet();
         Map<Integer, Float> closingPurchaseMap = orderRepository.selectOpeningAmount(closingDateTime, retailersSet);
         Map<Integer, UserWallet> retailerWalletMap = walletService.getRetailerIdUserWalletMap(retailersSet);
-        Map<Integer, Integer> walletRetailerMap = retailerWalletMap.entrySet().stream()
+        Map<Integer, Integer> walletRetailerMap = retailerWalletMap.entrySet().stream().collect(Collectors.toMap(x -> x.getValue().getId(), x -> x.getKey()));
-                .collect(Collectors.toMap(x -> x.getValue().getId(), x -> x.getKey()));
         Set<Integer> walletSet = walletRetailerMap.keySet();
-        Map<Integer, Float> closingBalanceMap = userWalletHistoryRepository
+        Map<Integer, Float> closingBalanceMap = userWalletHistoryRepository.getSumTillDateExcludingPurchase(closingDateTime, walletSet);
-                .getSumTillDateExcludingPurchase(closingDateTime, walletSet);
         List<List<?>> rows = new ArrayList<>();
         for (Map.Entry<Integer, Float> closingWalletBalance : closingBalanceMap.entrySet()) {
             int walletId = closingWalletBalance.getKey();
             int retailerId = walletRetailerMap.get(walletId);
             if (!closingPurchaseMap.containsKey(retailerId)) {
                 closingPurchaseMap.put(retailerId, closingWalletBalance.getValue());
             } else {
-                closingPurchaseMap.put(retailerId,
-                        closingWalletBalance.getValue() - closingPurchaseMap.get(retailerId));
+                closingPurchaseMap.put(retailerId, closingWalletBalance.getValue() - closingPurchaseMap.get(retailerId));
+            }
             float closingValue = closingPurchaseMap.get(retailerId);
             CustomRetailer cr = customRetailerMap.get(retailerId);
-            rows.add(Arrays.asList(retailerId, cr.getBusinessName(), cr.getAddress().getCity(),
+            rows.add(Arrays.asList(retailerId, cr.getBusinessName(), cr.getAddress().getCity(), cr.getAddress().getState(), closingValue));
-                    cr.getAddress().getState(), closingValue));
+        }
-        org.apache.commons.io.output.ByteArrayOutputStream byteArrayOutputStream = FileUtil
-                .getCSVByteStream(Arrays.asList("Id", "Partner Name", "City", "State", "Closing Balance"), rows);
+        org.apache.commons.io.output.ByteArrayOutputStream byteArrayOutputStream = FileUtil.getCSVByteStream(Arrays.asList("Id", "Partner Name", "City", "State", "Closing Balance"), rows);
         final HttpHeaders headers = new HttpHeaders();
         headers.set("Content-Type", "text/csv");
-        headers.set("Content-disposition",
-                "inline; filename=account-statement-closing-." + StringUtils.toHyphenatedString(closingDate) + ".csv");
+        headers.set("Content-disposition", "inline; filename=account-statement-closing-." + StringUtils.toHyphenatedString(closingDate) + ".csv");
         headers.setContentLength(byteArrayOutputStream.toByteArray().length);
         final InputStream inputStream = new ByteArrayInputStream(byteArrayOutputStream.toByteArray());
         final InputStreamResource inputStreamResource = new InputStreamResource(inputStream);
         return new ResponseEntity<InputStreamResource>(inputStreamResource, headers, HttpStatus.OK);
+    }
     @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)
+    public ResponseEntity<?> getAccountStatement(HttpServletRequest request, @RequestParam LocalDateTime startDate, @RequestParam LocalDateTime endDate, Model model, @RequestParam(defaultValue = "0") int fofoId) throws Exception {
-            throws Exception {
         boolean isAdmin = roleManager.isAdmin(cookiesProcessor.getCookiesObject(request).getRoleIds());
         if (fofoId > 0) {
             if (!isAdmin) {
                 throw new ProfitMandiBusinessException("Unauthorised access", "PartnerId", "Permission Denied");
+            }
             fofoId = cookiesProcessor.getCookiesObject(request).getFofoId();
+        }
         float openingBalance = walletService.getOpeningTillExcludingPurchase(fofoId, startDate);
         float closingBalance = walletService.getOpeningTillExcludingPurchase(fofoId, endDate);
         UserWallet uw = walletService.getUserWallet(fofoId);
-        List<UserWalletHistory> history = userWalletHistoryRepository.selectPaginatedByWalletId(uw.getId(), startDate,
+        List<UserWalletHistory> history = userWalletHistoryRepository.selectPaginatedByWalletId(uw.getId(), startDate, endDate, 0, 0);
-                endDate, 0, 0);
-        history = history.stream().filter(x -> !x.getReferenceType().equals(WalletReferenceType.PURCHASE))
+        history = history.stream().filter(x -> !x.getReferenceType().equals(WalletReferenceType.PURCHASE)).collect(Collectors.toList());
-                .collect(Collectors.toList());
         InputStream is = getClass().getClassLoader().getResourceAsStream("account-statement.xlsx");
         String partnerName = retailerService.getAllFofoRetailerIdNameMap().get(fofoId);
         List<StatementDetailModel> details = orderRepository.selectDetailsBetween(fofoId, startDate, endDate);
         float openingAmount = orderRepository.selectOpeningAmount(fofoId, startDate);
         float closingAmount = orderRepository.selectOpeningAmount(fofoId, endDate);
         LOGGER.info("Opening - {}, Closing - {}", openingAmount, closingAmount);
-        ByteArrayOutputStream byteArrayOutputStream = this.populateData(is, openingBalance - openingAmount,
+        ByteArrayOutputStream byteArrayOutputStream = this.populateData(is, openingBalance - openingAmount, closingBalance - closingAmount, partnerName, history, startDate, endDate, details);
-                closingBalance - closingAmount, partnerName, history, startDate, endDate, details);
         final HttpHeaders headers = new HttpHeaders();
         headers.set("Content-Type", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
-        headers.set("Content-disposition",
-                "inline; filename=account-statement." + StringUtils.toHyphenatedString(startDate.toLocalDate()) + "-"
+        headers.set("Content-disposition", "inline; filename=account-statement." + StringUtils.toHyphenatedString(startDate.toLocalDate()) + "-" + StringUtils.toHyphenatedString(endDate.toLocalDate()) + ".xlsx");
-                        + StringUtils.toHyphenatedString(endDate.toLocalDate()) + ".xlsx");
         headers.setContentLength(byteArrayOutputStream.toByteArray().length);
         final InputStream inputStream = new ByteArrayInputStream(byteArrayOutputStream.toByteArray());
         final InputStreamResource inputStreamResource = new InputStreamResource(inputStream);
         return new ResponseEntity<InputStreamResource>(inputStreamResource, headers, HttpStatus.OK);
+    }
-    private ByteArrayOutputStream populateData(InputStream is, float openingBalance, float closingBalance,
+    private ByteArrayOutputStream populateData(InputStream is, float openingBalance, float closingBalance, String partnerName, List<UserWalletHistory> history, LocalDateTime startDate, LocalDateTime endDate, List<StatementDetailModel> invoiceDetails) throws Exception {
-                                               String partnerName, List<UserWalletHistory> history, LocalDateTime startDate, LocalDateTime endDate,
-                                               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"));
         ByteArrayOutputStream bos = new ByteArrayOutputStream();
         Sheet sheet = workbook.getSheetAt(0);
         sheet.getRow(0).getCell(0).setCellValue(partnerName);
-        sheet.getRow(1).getCell(1)
-                .setCellValue(new Date(startDate.atZone(ZoneId.systemDefault()).toInstant().toEpochMilli()));
+        sheet.getRow(1).getCell(1).setCellValue(new Date(startDate.atZone(ZoneId.systemDefault()).toInstant().toEpochMilli()));
-        sheet.getRow(1).getCell(2)
-                .setCellValue(new Date(endDate.atZone(ZoneId.systemDefault()).toInstant().toEpochMilli()));
+        sheet.getRow(1).getCell(2).setCellValue(new Date(endDate.atZone(ZoneId.systemDefault()).toInstant().toEpochMilli()));
         sheet.getRow(2).getCell(2).setCellValue(openingBalance);
         long grandTotalDebit = 0l;
         long grandTotalCredit = 0l;
         int row = 4;
         for (UserWalletHistory walletEntry : history) {
             Cell dateCell = sheet.createRow(row).createCell(0);
-            dateCell.setCellValue(
-                    new Date(walletEntry.getTimestamp().atZone(ZoneId.systemDefault()).toInstant().toEpochMilli()));
+            dateCell.setCellValue(new Date(walletEntry.getTimestamp().atZone(ZoneId.systemDefault()).toInstant().toEpochMilli()));
             dateCell.setCellStyle(style2);
             sheet.getRow(row).createCell(1).setCellValue(walletEntry.getReferenceType().toString());
             if (walletEntry.getAmount() > 0) {
                 sheet.getRow(row).createCell(2).setCellValue(0);
                 sheet.getRow(row).createCell(3).setCellValue(walletEntry.getAmount());
+    }
     @RequestMapping(value = "/manualPayment", method = RequestMethod.GET)
     public String ManualPayment(HttpServletRequest request, Model model) throws Exception {
-        List<Integer> fofoIds = fofoStoreRepository.selectAll().stream().map(x -> x.getId())
+        List<Integer> fofoIds = fofoStoreRepository.selectAll().stream().map(x -> x.getId()).collect(Collectors.toList());
-                .collect(Collectors.toList());
         Map<Integer, CustomRetailer> customRetailerMap = retailerService.getAllFofoRetailers();
-        Map<Integer, CustomRetailer> customRetailersMap = fofoIds.stream().map(x -> customRetailerMap.get(x))
+        Map<Integer, CustomRetailer> customRetailersMap = fofoIds.stream().map(x -> customRetailerMap.get(x)).filter(x -> x != null).collect(Collectors.toList()).stream().collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
-                .filter(x -> x != null).collect(Collectors.toList()).stream()
-                .collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
         String customRetailers = JSONObject.valueToString(customRetailersMap.values());
         model.addAttribute("customRetailers", customRetailers);
         model.addAttribute("referenceTypes", WalletReferenceType.referenceType);
         model.addAttribute("transactionTypes", TransactionType.values());
         return "wallet-edit";
+    }
     @RequestMapping(value = "/getWalletHistory", method = RequestMethod.GET)
-    public String getWalletHistory(HttpServletRequest request,
-                                   @RequestParam(name = "reference", defaultValue = "0") int reference,
-                                   @RequestParam WalletReferenceType referenceType, Model model) throws Exception {
+    public String getWalletHistory(HttpServletRequest request, @RequestParam(name = "reference", defaultValue = "0") int reference, @RequestParam WalletReferenceType referenceType, Model model) throws Exception {
         LOGGER.info("type" + referenceType);
-        List<UserWalletHistory> userWalletHistory = userWalletHistoryRepository
+        List<UserWalletHistory> userWalletHistory = userWalletHistoryRepository.selectAllByreferenceIdandreferenceType(reference, referenceType);
-                .selectAllByreferenceIdandreferenceType(reference, referenceType);
         if (userWalletHistory.isEmpty()) {
             throw new ProfitMandiBusinessException("RefrenceId", reference, "Reference Id not found");
+        }
         return "wallet-history";
+    }
     @RequestMapping(value = "/getWalletHistoryByPartner", method = RequestMethod.GET)
-    public String getWalletHistoryByPartner(HttpServletRequest request, int fofoId,
+    public String getWalletHistoryByPartner(HttpServletRequest request, int fofoId, @RequestParam(name = "referenceType", required = false) WalletReferenceType referenceType, @RequestParam(name = "offset", required = false, defaultValue = "0") int offset, @RequestParam(name = "limit", required = false, defaultValue = "30") int limit, Model model) throws Exception {
-                                            @RequestParam(name = "referenceType", required = false) WalletReferenceType referenceType,
-                                            @RequestParam(name = "offset", required = false, defaultValue = "0") int offset,
-                                            @RequestParam(name = "limit", required = false, defaultValue = "30") int limit, Model model)
-            throws Exception {
         UserWallet userWallet = userWalletRepository.selectByRetailerId(fofoId);
-        List<UserWalletHistory> userWalletHistory = userWalletHistoryRepository.selectPaginatedByWalletIdReferenceType(
+        List<UserWalletHistory> userWalletHistory = userWalletHistoryRepository.selectPaginatedByWalletIdReferenceType(userWallet.getId(), referenceType, SortOrder.DESCENDING, offset, limit);
-                userWallet.getId(), referenceType, SortOrder.DESCENDING, offset, limit);
         CustomRetailer customretailer = retailerService.getFofoRetailer(fofoId);
         SDCreditRequirement sdCreditRequirement = sdCreditRequirementRepository.selectByFofoId(fofoId);
         List<Loan> loans = loanRepository.selectActiveLoan(fofoId);
         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 {
+    public String getPartnerName(HttpServletRequest request, @RequestParam(name = "reference", defaultValue = "0") int reference, @RequestParam WalletReferenceType referenceType, Model model) throws Exception {
-        List<UserWalletHistory> userWalletHistory = userWalletHistoryRepository
+        List<UserWalletHistory> userWalletHistory = userWalletHistoryRepository.selectAllByreferenceIdandreferenceType(reference, referenceType);
-                .selectAllByreferenceIdandreferenceType(reference, referenceType);
         if (userWalletHistory.isEmpty()) {
             throw new ProfitMandiBusinessException("RefrenceId", reference, "Reference Id not found");
+        }
         UserWallet userWallet = userWalletRepository.selectById(userWalletHistory.get(0).getWalletId());
         model.addAttribute("response1", mvcResponseSender.createResponseString(true));
         return "response";
+    }
     @RequestMapping(value = "/walletUpdate", method = RequestMethod.POST)
-    public String walletUpdate(HttpServletRequest request,
+    public String walletUpdate(HttpServletRequest request, @RequestParam(name = "reference", defaultValue = "0") int reference, @RequestParam int referenceTypeValue, @RequestParam TransactionType transactiontype, @RequestParam int amount, @RequestParam String description, @RequestParam int retailerId, Model model, @RequestParam LocalDateTime businessTimestamp) throws Exception {
-                               @RequestParam(name = "reference", defaultValue = "0") int reference, @RequestParam int referenceTypeValue,
-                               @RequestParam TransactionType transactiontype, @RequestParam int amount, @RequestParam String description,
-                               @RequestParam int retailerId, Model model, @RequestParam LocalDateTime businessTimestamp) throws Exception {
         WalletReferenceType referenceType = WalletReferenceType.findByValue(referenceTypeValue);
         if (reference == 0 && referenceType.getValue() >= WalletReferenceType.INCENTIVES.getValue()) {
             LOGGER.error("referenceType: " + referenceType);
             ManualPaymentType paymentType = manualPaymentRequestRepository.selectByReferenceType(referenceType);
             paymentType.setCounter(paymentType.getCounter() + 1);
             manualPaymentRequestRepository.persist(paymentType);
             reference = paymentType.getCounter();
         } else if (reference == 0) {
-            throw new ProfitMandiBusinessException("RefrenceId", reference,
+            throw new ProfitMandiBusinessException("RefrenceId", reference, "System specific reference type cant be used manually");
-                    "System specific reference type cant be used manually");
+        }
-        List<UserWalletHistory> userWalletHistoryList = userWalletHistoryRepository
+        List<UserWalletHistory> userWalletHistoryList = userWalletHistoryRepository.selectAllByreferenceIdandreferenceType(reference, referenceType);
-                .selectAllByreferenceIdandreferenceType(reference, referenceType);
         UserWallet userWallet = userWalletRepository.selectByRetailerId(retailerId);
         int walletId = userWallet.getId();
         int walletAmount = walletService.getWalletAmount(retailerId);
         int returnReference = 0;
         UserWalletHistory newUserWalletHistory = new UserWalletHistory();
         if (!userWalletHistoryList.isEmpty()) {
             long validRetailerEntries = userWalletHistoryList.stream().filter(x -> x.getWalletId() == walletId).count();
             if (validRetailerEntries == 0) {
-                throw new ProfitMandiBusinessException("RefrenceId", reference,
+                throw new ProfitMandiBusinessException("RefrenceId", reference, "Reference Id assign to Other  partner");
-                        "Reference Id assign to Other  partner");
+            }
+        }
         if (TransactionType.DEBIT.equals(transactiontype)) {
             amount = -amount;
         return "response";
+    }
     @RequestMapping(value = "/addMoney", method = RequestMethod.POST)
-    public String addMoney(HttpServletRequest request, @RequestParam float amount,
+    public String addMoney(HttpServletRequest request, @RequestParam float amount, @RequestParam String transactionReference, @RequestParam LocalDateTime referenceTime, @RequestParam String bankName, @RequestParam int fofoId, Model model) throws Exception {
-                           @RequestParam String transactionReference, @RequestParam LocalDateTime referenceTime,
-                           @RequestParam String bankName, @RequestParam int fofoId, Model model) throws Exception {
         AddWalletRequest addWalletRequest = new AddWalletRequest();
         addWalletRequest.setRetailerId(fofoId);
         addWalletRequest.setAmount(amount);
         addWalletRequest.setTransaction_reference(transactionReference);
     @RequestMapping(value = "/getCreditDetail", method = RequestMethod.GET)
     public String getCreditDetail(HttpServletRequest request, Model model) throws Exception {
         List<CreditAccount> creditAccounts = creditAccountRepository.selectAll();
         Map<Integer, CustomRetailer> customRetailers = retailerService.getAllFofoRetailers();
-        Map<Integer, FofoStore> fofoStoreMap = fofoStoreRepository
-                .selectByRetailerIds(new ArrayList<>(customRetailers.keySet())).stream()
+        Map<Integer, FofoStore> fofoStoreMap = fofoStoreRepository.selectByRetailerIds(new ArrayList<>(customRetailers.keySet())).stream().collect(Collectors.toMap(x -> x.getId(), x -> x));
-                .collect(Collectors.toMap(x -> x.getId(), x -> x));
         model.addAttribute("creditAccounts", creditAccounts);
         model.addAttribute("fofoStoreMap", fofoStoreMap);
         model.addAttribute("customRetailers", customRetailers);
         return "partner-credit-detail";
         Map<Integer, CustomRetailer> customRetailers = retailerService.getAllFofoRetailers();
         String title = "Loan Approved";
         String url = "http://app.smartdukaan.com/pages/home/credit";
-        String message = "Congratulations! Your Credit Limit is approved for Rs."
-                + FormattingUtils.formatDecimal(creditAccount.getSanctionedAmount());
+        String message = "Congratulations! Your Credit Limit is approved for Rs." + FormattingUtils.formatDecimal(creditAccount.getSanctionedAmount());
-        notificationService.sendNotification(creditAccount.getFofoId(), "Loan", MessageType.notification, title,
+        notificationService.sendNotification(creditAccount.getFofoId(), "Loan", MessageType.notification, title, message, url);
-                message, url);
         model.addAttribute("creditAccount", creditAccount);
         model.addAttribute("customRetailers", customRetailers);
         return "partner-credit-detail-row";
+    }

Subversion Repositories SmartDukaan

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