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

 import java.text.MessageFormat;
 import java.time.*;
 import java.util.*;
 import java.util.stream.Collectors;
+import static com.spice.profitmandi.dao.enumuration.transaction.AddWalletRequestStatus.approved;
 @Controller
 @Transactional(rollbackOn = Throwable.class)
 public class WalletController {
     private static final int IDX_PERIOD = 1;
         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) throws ProfitMandiBusinessException {
+    public String walletAddnAccept(HttpServletRequest request, Model model) throws Exception {
-        List<AddWalletRequest> walletRequest = null;
+        return "add-wallet-req";
+    }
+    @RequestMapping(value = "/getAddWalletApprovedByDate", method = RequestMethod.GET)
+    public String getAddwalletRequestApproved(HttpServletRequest request, @RequestParam(name = "offset", defaultValue = "0") int offset, @RequestParam(name = "limit", defaultValue = "10") int limit, @RequestParam(name = "startDate") LocalDateTime startDate,
+                                              @RequestParam(name = "endDate") LocalDateTime endDate, Model model) throws ProfitMandiBusinessException {
+        LOGGER.info("requested startDate=[{}], EndDate = [{}]", startDate, endDate);
+        List<AddWalletRequest> walletRequest = null;
         long size = 0;
-        walletRequest = addWalletRequestRepository.selectAllByStatus(offset, limit, AddWalletRequestStatus.approved);
+        walletRequest = addWalletRequestRepository.selectAllRetailerIdByDateAndStatus(startDate, endDate, AddWalletRequestStatus.approved);
-        size = addWalletRequestRepository.selectCountByStatus(AddWalletRequestStatus.approved);
+//        walletRequest = addWalletRequestRepository.selectAllByStatus(offset, limit, approved);
-        LOGGER.info("walletRequest" + walletRequest);
+        size = addWalletRequestRepository.selectCountByStatus(approved);
         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)).filter(x -> x != null).collect(Collectors.toList()).stream().collect(Collectors.toMap(x -> x.getPartnerId(), x -> x));
             model.addAttribute("walletRequest", walletRequest);
             model.addAttribute("size", size);
+        }
-        return "add-wallet-request";
+        return "add-wallet-request-paginated";
+    }
     @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) throws ProfitMandiBusinessException {
+    public String getPaginatedWalletApproved(HttpServletRequest request, @RequestParam(name = "offset", defaultValue = "0") int offset, @RequestParam(name = "limit", defaultValue = "10") int limit, @RequestParam(name = "startDate") LocalDateTime startDate,
+                                             @RequestParam(name = "endDate") LocalDateTime endDate, Model model) throws ProfitMandiBusinessException {
         LOGGER.info("requested offset=[{}], limit = [{}]", offset, limit);
         List<AddWalletRequest> walletRequest = null;
+        long size = 0;
+        walletRequest = addWalletRequestRepository.selectAllRetailerIdByDateAndStatus(startDate, endDate, AddWalletRequestStatus.approved);
-        walletRequest = addWalletRequestRepository.selectAllByStatus(offset, limit, AddWalletRequestStatus.approved);
+//        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();
+        }
         return "add-wallet-request-paginated";
+    }
     @RequestMapping(value = "/getAddWalletRequestRejected", method = RequestMethod.GET)
+    public String walletAddnReject(HttpServletRequest request, Model model) throws Exception {
+        return "add-wallet-rejected";
+    }
+    @RequestMapping(value = "/getAddWalletRequestRejectedByDate", method = RequestMethod.GET)
-    public String getAddwalletRequestRejected(HttpServletRequest request, @RequestParam(name = "offset", defaultValue = "0") int offset, @RequestParam(name = "limit", defaultValue = "10") int limit, Model model) throws ProfitMandiBusinessException {
+    public String getAddwalletRequestRejected(HttpServletRequest request, @RequestParam(name = "offset", defaultValue = "0") int offset, @RequestParam(name = "limit", defaultValue = "10") int limit, @RequestParam(name = "startDate") LocalDateTime startDate,
+                                              @RequestParam(name = "endDate") LocalDateTime endDate, Model model) throws ProfitMandiBusinessException {
         List<AddWalletRequest> walletRequest = null;
         long size = 0;
-        walletRequest = addWalletRequestRepository.selectAllByStatus(offset, limit, AddWalletRequestStatus.rejected);
+        walletRequest = addWalletRequestRepository.selectAllRetailerIdByDateAndStatus(startDate, endDate, 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();
         } else {
             model.addAttribute("walletRequest", walletRequest);
             model.addAttribute("size", size);
+        }
-        return "add-wallet-request";
+        return "add-wallet-request-paginated";
+    }
     @RequestMapping(value = "/getPaginatedWalletRequestRejected", method = RequestMethod.GET)
-    public String getPaginatedWalletRequestRejected(HttpServletRequest request, @RequestParam(name = "offset", defaultValue = "0") int offset, @RequestParam(name = "limit", defaultValue = "10") int limit, Model model) throws ProfitMandiBusinessException {
+    public String getPaginatedWalletRequestRejected(HttpServletRequest request, @RequestParam(name = "offset", defaultValue = "0") int offset, @RequestParam(name = "limit", defaultValue = "10") int limit, @RequestParam(name = "startDate") LocalDateTime startDate,
+                                                    @RequestParam(name = "endDate") LocalDateTime endDate, Model model) throws ProfitMandiBusinessException {
         LOGGER.info("requested offset=[{}], limit = [{}]", offset, limit);
         List<AddWalletRequest> walletRequest = null;
-        walletRequest = addWalletRequestRepository.selectAllByStatus(offset, limit, AddWalletRequestStatus.rejected);
+        walletRequest = addWalletRequestRepository.selectAllRetailerIdByDateAndStatus(startDate, endDate, AddWalletRequestStatus.rejected);
         LOGGER.info("walletRequest" + walletRequest);
         if (!walletRequest.isEmpty()) {
             List<Integer> fofoIds = this.getFofoIdsFromWalletRequest(walletRequest);
             Map<Integer, CustomRetailer> customRetailerMap = retailerService.getAllFofoRetailers();
     @RequestMapping(value = "/addMoney", method = RequestMethod.POST)
     public String addMoney(HttpServletRequest request, @RequestParam float amount, @RequestParam String transactionReference, @RequestParam LocalDateTime referenceTime, @RequestParam String bankName, @RequestParam int fofoId, Model model) throws Exception {
         transactionReference = transactionReference.toUpperCase().trim();
         List<AddWalletRequest> addWalletRequests = addWalletRequestRepository.selectByReference(transactionReference);
-        addWalletRequests = addWalletRequests.stream().filter(x -> Arrays.asList(AddWalletRequestStatus.approved, AddWalletRequestStatus.pending).contains(x.getStatus())).collect(Collectors.toList());
+        addWalletRequests = addWalletRequests.stream().filter(x -> Arrays.asList(approved, AddWalletRequestStatus.pending).contains(x.getStatus())).collect(Collectors.toList());
         if (addWalletRequests.size() > 0) {
             throw new ProfitMandiBusinessException("Transaction Reference (UTR)", transactionReference, "Already added");
+        }
         HdfcPayment hdfcPayment = hdfcPaymentRepository.selectByUtrNo(transactionReference);
         if (hdfcPayment != null) {

Subversion Repositories SmartDukaan

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