WebSVN – SmartDukaan – Diff – /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java

     private ServiceConfigRepository serviceConfigRepository;
     @Value("${delhivery.tracking.token}")
     private String token;
-    private static final String[] STOCK_AGEING_MAIL_LIST = new String[]{"uday.singh@smartudkaan.com",
+    private static final String[] STOCK_AGEING_MAIL_LIST = new String[]{"uday.singh@smartudkaan.com", "mohinder.mutreja@smartdukaan.com", "ankit.bhatia@smartdukaan.com", "tarun.verma@smartdukaan.com", "kuldeep.kumar@smartdukaan.com", "manish.gupta@smartdukaan.com"};
-            "mohinder.mutreja@smartdukaan.com", "ankit.bhatia@smartdukaan.com", "tarun.verma@smartdukaan.com",
-            "kuldeep.kumar@smartdukaan.com", "manish.gupta@smartdukaan.com"};
-    private static final String[] ITEMWISE_PENDING_INDENT_MAIL_LIST = new String[]{"kamini.sharma@smartdukaan.com",
-            "tarun.verma@smartdukaan.com", "uday.singh@smartdukaan.com", "kuldeep.kumar@smartdukaan.com",
-            "niranjan.kala@smartdukaan.com"};
-    private static final String[] INDENT_TERTIARY_MAIL_LIST = new String[]{"uday.singh@smartdukaan.com",
+    private static final String[] ITEMWISE_PENDING_INDENT_MAIL_LIST = new String[]{"kamini.sharma@smartdukaan.com", "tarun.verma@smartdukaan.com", "uday.singh@smartdukaan.com", "kuldeep.kumar@smartdukaan.com", "niranjan.kala@smartdukaan.com"};
-            "kuldeep.kumar@smartdukaan.com"};
-    private static final String[] EMPLOYEE_ATTENDANCE_MAIL_LIST = new String[]{"sm@smartdukaan.com",
+    private static final String[] INDENT_TERTIARY_MAIL_LIST = new String[]{"uday.singh@smartdukaan.com", "kuldeep.kumar@smartdukaan.com"};
-            "sm@smartdukaan.com"};
+    private static final String[] EMPLOYEE_ATTENDANCE_MAIL_LIST = new String[]{"sm@smartdukaan.com", "sm@smartdukaan.com"};
     private List<OrderStatus> orderStatusList = Arrays.asList(OrderStatus.SUBMITTED_FOR_PROCESSING);
     @Autowired
     private ReporticoService reporticoService;
     @Autowired
     private TagListingRepository tagListingRepository;
     public void generateDailyRecharge() {
-        List<RechargeProviderCreditWalletHistory> allCreditHistory = rechargeProviderCreditWalletHistoryRepository
+        List<RechargeProviderCreditWalletHistory> allCreditHistory = rechargeProviderCreditWalletHistoryRepository.selectAll(0, 2000);
-                .selectAll(0, 2000);
         List<RechargeProvider> rechargeProviders = rechargeProviderRepository.selectAll();
         rechargeProviders.stream().forEach(x -> x.setAmount(0));
         rechargeProviders.stream().forEach(x -> {
-            Map<LocalDate, List<RechargeProviderCreditWalletHistory>> dateWiseProviderCreditsMap = allCreditHistory
+            Map<LocalDate, List<RechargeProviderCreditWalletHistory>> dateWiseProviderCreditsMap = allCreditHistory.stream().filter(z -> z.getProviderId() == x.getId()).collect(groupingBy(x1 -> x1.getReceiveTimestamp().toLocalDate()));
-                    .stream().filter(z -> z.getProviderId() == x.getId())
-                    .collect(groupingBy(x1 -> x1.getReceiveTimestamp().toLocalDate()));
             LOGGER.info("dateWiseProviderCreditsMap -{}", dateWiseProviderCreditsMap);
             LocalDate endDate = LocalDate.now().plusDays(1);
             float previousDayClosing = 0;
             LocalDate date = LocalDate.of(2018, 4, 6);
             while (date.isBefore(endDate)) {
-                List<RechargeTransaction> dateWiseRechargeTransactions = rechargeTransactionRepository
-                        .selectAllBetweenTimestamp(Arrays.asList(RechargeStatus.values()), date.atStartOfDay(),
+                List<RechargeTransaction> dateWiseRechargeTransactions = rechargeTransactionRepository.selectAllBetweenTimestamp(Arrays.asList(RechargeStatus.values()), date.atStartOfDay(), date.plusDays(1).atStartOfDay());
-                                date.plusDays(1).atStartOfDay());
-                List<RechargeTransaction> successfulTransactions = dateWiseRechargeTransactions.stream()
-                        .filter(y -> y.getStatus().equals(RechargeStatus.SUCCESS)).collect(Collectors.toList());
+                List<RechargeTransaction> successfulTransactions = dateWiseRechargeTransactions.stream().filter(y -> y.getStatus().equals(RechargeStatus.SUCCESS)).collect(Collectors.toList());
                 float dailyAmount = 0;
                 float totalCommission = 0;
                 for (RechargeTransaction rechargeTransaction : successfulTransactions) {
                     if (rechargeTransaction.getProviderId() == x.getId()) {
         thinkWalnutDigitalRechargeEnquiryCredential.setRechargeUrl(thinkWalnutDigitalRechargeEnquiryUrl);
         thinkWalnutDigitalRechargeEnquiryCredential.setRechargeUserName(thinkWalnutDigitalRechargeUserName);
         thinkWalnutDigitalRechargeEnquiryCredential.setRechargePassword(thinkWalnutDigitalRechargePassword);
         thinkWalnutDigitalRechargeEnquiryCredential.setRechargeAuthKey(thinkWalnutDigitalRechargeAuthKey);
         Map<String, RechargeStatus> requestRechargeStatusChanged = new HashMap<>();
-        List<RechargeTransaction> rechargeTransactions = rechargeTransactionRepository
+        List<RechargeTransaction> rechargeTransactions = rechargeTransactionRepository.selectAllBetweenTimestamp(nonSuccessRechargeStatuses, fromDate, toDate);
-                .selectAllBetweenTimestamp(nonSuccessRechargeStatuses, fromDate, toDate);
         for (RechargeTransaction rechargeTransaction : rechargeTransactions) {
             try {
                 int providerId = rechargeTransaction.getProviderId();
                 if (providerId == 1) {
-                    oxigenRechargeProviderService.doCheckStatusRequest(oxigenRechargeEnquiryUrl, oxigenRechargeAuthKey,
+                    oxigenRechargeProviderService.doCheckStatusRequest(oxigenRechargeEnquiryUrl, oxigenRechargeAuthKey, rechargeTransaction);
-                            rechargeTransaction);
                 } else if (providerId == 2) {
-                    thinkWalnutDigitalRechargeProviderService
-                            .doCheckStatusRequest(thinkWalnutDigitalRechargeEnquiryCredential, rechargeTransaction);
+                    thinkWalnutDigitalRechargeProviderService.doCheckStatusRequest(thinkWalnutDigitalRechargeEnquiryCredential, rechargeTransaction);
+                }
-                if (rechargeTransaction.getStatus().equals(RechargeStatus.SUCCESS)
-                        || rechargeTransaction.getStatus().equals(RechargeStatus.FAILED)) {
+                if (rechargeTransaction.getStatus().equals(RechargeStatus.SUCCESS) || rechargeTransaction.getStatus().equals(RechargeStatus.FAILED)) {
-                    requestRechargeStatusChanged.put(rechargeTransaction.getRequestId(),
+                    requestRechargeStatusChanged.put(rechargeTransaction.getRequestId(), rechargeTransaction.getStatus());
-                            rechargeTransaction.getStatus());
+                }
             } catch (Exception e) {
                 LOGGER.info("Could not check status for Request {}", rechargeTransaction.getRequestId());
+            }
+        }
     // TemporaryMethod
     public void migrateInvoice() {
         List<FofoOrder> fofoOrders = fofoOrderRepository.selectFromSaleDate(LocalDateTime.now().minusDays(3));
         Map<Integer, List<FofoOrder>> partnerOrdersMap = new HashMap<>();
-        partnerOrdersMap = fofoOrders.stream()
-                .collect(groupingBy(FofoOrder::getFofoId, Collectors.toList()));
+        partnerOrdersMap = fofoOrders.stream().collect(groupingBy(FofoOrder::getFofoId, Collectors.toList()));
         for (List<FofoOrder> orderList : partnerOrdersMap.values()) {
             int sequence = 0;
             String prefix = "";
-            List<FofoOrder> sortedList = orderList.stream().sorted((x1, x2) -> x1.getId() - x2.getId())
+            List<FofoOrder> sortedList = orderList.stream().sorted((x1, x2) -> x1.getId() - x2.getId()).collect(Collectors.toList());
-                    .collect(Collectors.toList());
             for (FofoOrder order : sortedList) {
                 LOGGER.info("Order Id is {}, partner Id is {}", order.getId(), order.getFofoId());
                 if (!order.getInvoiceNumber().contains("SEC")) {
                     sequence = Integer.parseInt(order.getInvoiceNumber().split("/")[1]);
+            }
         } catch (Exception e) {
             e.printStackTrace();
             throw e;
+        }
-        List<UserWalletHistory> uwhs = userWalletHistoryRepository.selectAllByDateType(LocalDate.now().atStartOfDay(),
+        List<UserWalletHistory> uwhs = userWalletHistoryRepository.selectAllByDateType(LocalDate.now().atStartOfDay(), endDate, Arrays.asList(WalletReferenceType.SCHEME_IN, WalletReferenceType.SCHEME_OUT));
-                endDate, Arrays.asList(WalletReferenceType.SCHEME_IN, WalletReferenceType.SCHEME_OUT));
         System.out.println("Amount\tReference\tReferenceType\tTimestamp\tDescription");
         for (UserWalletHistory uwh : uwhs) {
-            System.out.println(String.format("%d\t%d\t%s\t%s\t%s", uwh.getAmount(), uwh.getReference(),
+            System.out.println(String.format("%d\t%d\t%s\t%s\t%s", uwh.getAmount(), uwh.getReference(), uwh.getReferenceType(), uwh.getTimestamp().toString(), uwh.getDescription()));
-                    uwh.getReferenceType(), uwh.getTimestamp().toString(), uwh.getDescription()));
+        }
         LOGGER.info("Schemes processed successfully.");
         if (dryRun) {
             throw new Exception();
+        }
+    }
     public void processRechargeCashback() throws Throwable {
         LocalDateTime cashbackTime = LocalDateTime.now();
         int referenceId = (int) Timestamp.valueOf(cashbackTime).getTime() / 1000;
-        List<RechargeTransaction> pendingTransactions = rechargeTransactionRepository
+        List<RechargeTransaction> pendingTransactions = rechargeTransactionRepository.getPendingCashBackRehargeTransactions();
-                .getPendingCashBackRehargeTransactions();
         Map<Object, Double> totalRetailerCashbacks = pendingTransactions.stream().collect(
                 groupingBy(x -> x.getRetailerId(), Collectors.summingDouble(x -> x.getCommission())));
         for (Map.Entry<Object, Double> totalRetailerCashback : totalRetailerCashbacks.entrySet()) {
             int retailerId = (Integer) totalRetailerCashback.getKey();
             float amount = totalRetailerCashback.getValue().floatValue();
             if (Math.round(amount) > 0) {
-                walletService.addAmountToWallet(retailerId, referenceId, WalletReferenceType.CASHBACK,
+                walletService.addAmountToWallet(retailerId, referenceId, WalletReferenceType.CASHBACK, "Recharge Cashback", Math.round(amount), LocalDateTime.now());
-                        "Recharge Cashback", Math.round(amount), LocalDateTime.now());
+            }
+        }
         for (RechargeTransaction rt : pendingTransactions) {
             rt.setCashbackTimestamp(cashbackTime);
             rt.setCashbackReference(referenceId);
         List<FofoStore> stores = fofoStoreRepository.selectActiveStores();
         for (FofoStore store : stores) {
             int fofoId = store.getId();
-            PartnerType startOfPreviousMonthPartnerType = partnerTypeChangeService.getTypeOnDate(fofoId,
+            PartnerType startOfPreviousMonthPartnerType = partnerTypeChangeService.getTypeOnDate(fofoId, startOfPreviousMonth);
-                    startOfPreviousMonth);
-            PartnerType todayPartnerType = partnerTypeChangeService.getTypeOnMonth(fofoId,
+            PartnerType todayPartnerType = partnerTypeChangeService.getTypeOnMonth(fofoId, YearMonth.from(startOfPreviousMonth.atStartOfDay()));
-                    YearMonth.from(startOfPreviousMonth.atStartOfDay()));
             if (!startOfPreviousMonthPartnerType.nextPartnerTypes().contains(todayPartnerType)) {
                 continue;
+            }
             if (!startOfPreviousMonthPartnerType.equals(todayPartnerType)) {
-                LOGGER.info("Partner Type has been changed for code {} from {} to {}", store.getCode(),
+                LOGGER.info("Partner Type has been changed for code {} from {} to {}", store.getCode(), startOfPreviousMonthPartnerType, todayPartnerType);
-                        startOfPreviousMonthPartnerType, todayPartnerType);
-                List<FofoOrder> fofoOrders = fofoOrderRepository.selectByFofoId(fofoId,
-                        startOfPreviousMonth.atStartOfDay(), startOfPreviousMonth.plusMonths(1).atStartOfDay(), 0, 0);
+                List<FofoOrder> fofoOrders = fofoOrderRepository.selectByFofoId(fofoId, startOfPreviousMonth.atStartOfDay(), startOfPreviousMonth.plusMonths(1).atStartOfDay(), 0, 0);
                 for (FofoOrder fofoOrder : fofoOrders) {
                     schemeService.processSchemeOut(fofoOrder.getId(), fofoId);
+                }
+            }
             if (!yesterdayPartnerType.nextPartnerTypes().contains(todayPartnerType)) {
                 continue;
+            }
             if (!yesterdayPartnerType.equals(todayPartnerType)) {
                 upgradedCount++;
-                sb.append(String.format("Partner Type has been changed for code %s from %s to %s", store.getCode(),
+                sb.append(String.format("Partner Type has been changed for code %s from %s to %s", store.getCode(), yesterdayPartnerType.toString(), todayPartnerType.toString()));
-                        yesterdayPartnerType.toString(), todayPartnerType.toString()));
                 sb.append("<br>");
-                LOGGER.info("Partner Type has been changed for code {} from {} to {}", store.getCode(),
+                LOGGER.info("Partner Type has been changed for code {} from {} to {}", store.getCode(), yesterdayPartnerType, todayPartnerType);
-                        yesterdayPartnerType, todayPartnerType);
-                List<FofoOrder> fofoOrders = fofoOrderRepository.selectByFofoId(fofoId,
-                        yesterday.withDayOfMonth(1).atStartOfDay(), yesterday.atStartOfDay(), 0, 0);
+                List<FofoOrder> fofoOrders = fofoOrderRepository.selectByFofoId(fofoId, yesterday.withDayOfMonth(1).atStartOfDay(), yesterday.atStartOfDay(), 0, 0);
                 for (FofoOrder fofoOrder : fofoOrders) {
                     schemeService.processSchemeOut(fofoOrder.getId(), fofoId);
+                }
+            }
+        }
         if (upgradedCount > 0) {
             sendMailHtmlFormat(
-                    new String[]{"amit.gupta@smartdukaan.com", "tarun.verma@smartdukaan.com",
+                    new String[]{"amit.gupta@smartdukaan.com", "tarun.verma@smartdukaan.com", "neeraj.gupta@smartdukaan.com"}, sb.toString(), null, "Few Partners Category have been Upgraded");
-                            "neeraj.gupta@smartdukaan.com"},
-                    sb.toString(), null, "Few Partners Category have been Upgraded");
         } else {
             sendMailHtmlFormat(
-                    new String[]{"amit.gupta@smartdukaan.com", "tarun.verma@smartdukaan.com",
+                    new String[]{"amit.gupta@smartdukaan.com", "tarun.verma@smartdukaan.com", "neeraj.gupta@smartdukaan.com"}, sb.toString(), null, "No partners Category have been upgraded today");
-                            "neeraj.gupta@smartdukaan.com"},
-                    sb.toString(), null, "No partners Category have been upgraded today");
+        }
+    }
     @Autowired
     private PartnerStatsService partnerStatsService;
     public void evaluateExcessSchemeOut() throws Exception {
         Map<Integer, String> userNameMap = retailerService.getAllFofoRetailerIdNameMap();
         Map<Integer, Float> userAmountMap = new HashMap<>();
         List<List<?>> rows = new ArrayList<>();
-        List<String> headers = Arrays.asList("Scheme", "Item", "Partner", "Amount", "Credited On", "Invoice Number",
+        List<String> headers = Arrays.asList("Scheme", "Item", "Partner", "Amount", "Credited On", "Invoice Number", "Sale On", "Scheme Start", "Scheme End", "Active On", "Expired On");
-                "Sale On", "Scheme Start", "Scheme End", "Active On", "Expired On");
         schemeRepository.selectAll().stream().forEach(x -> {
             if (x.getType().equals(SchemeType.OUT)) {
-                List<SchemeInOut> sioList = schemeInOutRepository
-                        .selectBySchemeIds(new HashSet<>(Arrays.asList(x.getId())));
+                List<SchemeInOut> sioList = schemeInOutRepository.selectBySchemeIds(new HashSet<>(Arrays.asList(x.getId())));
                 if (x.getActiveTimestamp() != null) {
                     LocalDateTime endDateTime = x.getEndDateTime();
                     if (x.getExpireTimestamp() != null && x.getExpireTimestamp().isBefore(x.getEndDateTime())) {
                         endDateTime = x.getExpireTimestamp();
+                    }
                     for (SchemeInOut sio : sioList) {
                         InventoryItem inventoryItem = null;
                         inventoryItem = inventoryItemRepository.selectById(sio.getInventoryItemId());
                         FofoOrder fofoOrder = fofoOrderRepository.selectByFofoIdAndSerialNumber(
                                 inventoryItem.getFofoId(), inventoryItem.getSerialNumber(), null, null, 0, 1).get(0);
-                        Optional<ScanRecord> record = scanRecordRepository
-                                .selectByInventoryItemId(sio.getInventoryItemId()).stream()
-                                .filter(y -> y.getType().equals(ScanType.SALE)).findFirst();
+                        Optional<ScanRecord> record = scanRecordRepository.selectByInventoryItemId(sio.getInventoryItemId()).stream().filter(y -> y.getType().equals(ScanType.SALE)).findFirst();
                         if (record.isPresent()) {
                             int fofoId = record.get().getFofoId();
-                            if (record.get().getCreateTimestamp().isAfter(endDateTime)
-                                    || record.get().getCreateTimestamp().isBefore(x.getStartDateTime())) {
+                            if (record.get().getCreateTimestamp().isAfter(endDateTime) || record.get().getCreateTimestamp().isBefore(x.getStartDateTime())) {
                                 if (!userAmountMap.containsKey(fofoId)) {
                                     userAmountMap.put(fofoId, 0f);
+                                }
                                 userAmountMap.put(fofoId, sio.getAmount() + userAmountMap.get(fofoId));
                                 try {
-                                    rows.add(Arrays.asList(x.getDescription(),
+                                    rows.add(Arrays.asList(x.getDescription(), itemRepository.selectById(inventoryItem.getItemId()).getItemDescription(), userNameMap.get(fofoId), sio.getAmount(), FormattingUtils.formatDate(sio.getCreateTimestamp()), fofoOrder.getInvoiceNumber(), FormattingUtils.formatDate(record.get().getCreateTimestamp()), FormattingUtils.formatDate(x.getStartDateTime()), FormattingUtils.formatDate(x.getEndDateTime()), FormattingUtils.formatDate(x.getActiveTimestamp()), FormattingUtils.formatDate(x.getExpireTimestamp())));
-                                            itemRepository.selectById(inventoryItem.getItemId()).getItemDescription(),
-                                            userNameMap.get(fofoId), sio.getAmount(),
-                                            FormattingUtils.formatDate(sio.getCreateTimestamp()),
-                                            fofoOrder.getInvoiceNumber(),
-                                            FormattingUtils.formatDate(record.get().getCreateTimestamp()),
-                                            FormattingUtils.formatDate(x.getStartDateTime()),
-                                            FormattingUtils.formatDate(x.getEndDateTime()),
-                                            FormattingUtils.formatDate(x.getActiveTimestamp()),
-                                            FormattingUtils.formatDate(x.getExpireTimestamp())));
                                 } catch (Exception e) {
                                     e.printStackTrace();
+                                }
+                            }
+                        }
+                    }
+                }
+            }
         });
-        userAmountMap.entrySet().stream()
-                .forEach(x -> LOGGER.info("{} to be deducted from {}({}) for wrongly disbursed due to technical error.",
+        userAmountMap.entrySet().stream().forEach(x -> LOGGER.info("{} to be deducted from {}({}) for wrongly disbursed due to technical error.", x.getValue(), userNameMap.get(x.getKey())));
-                        x.getValue(), userNameMap.get(x.getKey())));
         ByteArrayOutputStream baos = FileUtil.getCSVByteStream(headers, rows);
-        Utils.sendMailWithAttachment(googleMailSender,
-                new String[]{"amit.gupta@shop2020.in"}, null,
-                "Partner Excess Amount", "PFA", "ListofSchemes.csv", new ByteArrayResource(baos.toByteArray()));
+        Utils.sendMailWithAttachment(googleMailSender, new String[]{"amit.gupta@shop2020.in"}, null, "Partner Excess Amount", "PFA", "ListofSchemes.csv", new ByteArrayResource(baos.toByteArray()));
+    }
     public void fetchParnterStats() throws Exception {
         Map<Integer, PartnerDetailModel> partnerStats = partnerStatsService.getAllPartnerStats();
             rct.setLastCreatedTimestamp(LocalDateTime.now());
+        }
+    }
     public void processPriceDrop() throws Exception {
-        List<PriceDrop> priceDrops = priceDropRepository.selectAllByDatesBetween(LocalDateTime.now(),
+        List<PriceDrop> priceDrops = priceDropRepository.selectAllByDatesBetween(LocalDateTime.now(), LocalDateTime.now().minusYears(1));
-                LocalDateTime.now().minusYears(1));
         for (PriceDrop priceDrop : priceDrops) {
             if (priceDrop.getDropAmount() > 0) {
                 priceDropService.processPriceDrop(priceDrop.getId(), true);
+            }
+        }
             return ScheduledTasks.this;
+        }
         @Override
         public String toString() {
-            return "FofoReportingModel{" +
-                    "code='" + code + '\'' +
-                    ", fofoId=" + fofoId +
-                    ", businessName='" + businessName + '\'' +
-                    ", territoryManager='" + territoryManager + '\'' +
+            return "FofoReportingModel{" + "code='" + code + '\'' + ", fofoId=" + fofoId + ", businessName='" + businessName + '\'' + ", territoryManager='" + territoryManager + '\'' + ", regionalManager='" + regionalManager + '\'' + ", businessManager='" + businessManager + '\'' + '}';
-                    ", regionalManager='" + regionalManager + '\'' +
-                    ", businessManager='" + businessManager + '\'' +
-                    '}';
+        }
         @Override
         public boolean equals(Object o) {
             if (this == o) return true;
         samsungModels = samsungModels.stream().sorted(Comparator.comparing(x -> x.getPcmDate() == null ? -1 : 1)).collect(Collectors.toList());
         if (samsungModels.size() > 0) {
             List<String> headers = Arrays.asList("Partner Id", "Code", "Name", "City", "Brand", "Model Name", "Model Number", "Color", "Serial Number", "Remarks");
             List<List<?>> rows = new ArrayList<>();
             for (BilledImeiModel billedImeiModel : samsungModels) {
-                List<Serializable> row = Arrays.asList(billedImeiModel.getFofoId(), billedImeiModel.getStoreCode(), billedImeiModel.getStoreName(),
+                List<Serializable> row = Arrays.asList(billedImeiModel.getFofoId(), billedImeiModel.getStoreCode(), billedImeiModel.getStoreName(), billedImeiModel.getStoreCity(), billedImeiModel.getBrand(), billedImeiModel.getModelName(), billedImeiModel.getModelNumber(), billedImeiModel.getColor(), billedImeiModel.getSerialNumber(), billedImeiModel.getPcmDate() == null ? "PCM date Missing" : "Rebill Imeis");
-                        billedImeiModel.getStoreCity(), billedImeiModel.getBrand(), billedImeiModel.getModelName(), billedImeiModel.getModelNumber(),
-                        billedImeiModel.getColor(), billedImeiModel.getSerialNumber(), billedImeiModel.getPcmDate() == null ? "PCM date Missing" : "Rebill Imeis");
                 rows.add(row);
+            }
             ByteArrayOutputStream baos = FileUtil.getCSVByteStream(headers, rows);
             String[] sendToArray = new String[]{"kamini.sharma@smartdukaan.com", "praveen.sharma@smartdukaan.com"};
             String fileName = "Imeis need Rebilling -" + FormattingUtils.formatDate(LocalDateTime.now()) + ".csv";
-            Utils.sendMailWithAttachment(googleMailSender, sendToArray, new String[]{"tarun.verma@smartdukaan.com"}, "Samsung Rebilling IMEI Summary", "PFA",
+            Utils.sendMailWithAttachment(googleMailSender, sendToArray, new String[]{"tarun.verma@smartdukaan.com"}, "Samsung Rebilling IMEI Summary", "PFA", fileName, new ByteArrayResource(baos.toByteArray()));
-                    fileName, new ByteArrayResource(baos.toByteArray()));
+        }
+    }
     public void sendPartnerInvestmentDetails(List<String> sendTo) throws Exception {
         LocalDate yesterDay = LocalDate.now().minusDays(1);
         List<FofoStore> fofoStores = fofoStoreRepository.selectActiveStores();
-        Map<Integer, CustomRetailer> customRetailerMap = retailerService
-                .getFofoRetailers(fofoStores.stream().map(x -> x.getId()).collect(Collectors.toList()));
+        Map<Integer, CustomRetailer> customRetailerMap = retailerService.getFofoRetailers(fofoStores.stream().map(x -> x.getId()).collect(Collectors.toList()));
-        List<String> headers = Arrays.asList("Code", "Outlet name", "State Manager", "Teritory/Team Lead",
+        List<String> headers = Arrays.asList("Code", "Outlet name", "State Manager", "Teritory/Team Lead", "Wallet Amount", "In Stock Amount", "Activated Stock", "Return In Transit Stock", "Unbilled Amount", "Grn Pending Amount", "Min Investment", "Investment Amount", "Investment Short", "Unbilled Qty", "Short Days");
-                "Wallet Amount", "In Stock Amount", "Activated Stock", "Return In Transit Stock", "Unbilled Amount",
-                "Grn Pending Amount", "Min Investment", "Investment Amount", "Investment Short", "Unbilled Qty",
-                "Short Days");
         List<List<?>> rows = new ArrayList<>();
         Map<Integer, List<?>> partnerRowsMap = new HashMap<>();
         Map<Integer, FofoReportingModel> partnerIdSalesHeaderMap = this.getPartnerIdSalesHeaders();
-        Map<Integer, Integer> shortDaysMap = partnerDailyInvestmentRepository
-                .selectAll(LocalDate.now().withDayOfMonth(1), LocalDate.now()).stream().collect(groupingBy(
+        Map<Integer, Integer> shortDaysMap = partnerDailyInvestmentRepository.selectAll(LocalDate.now().withDayOfMonth(1), LocalDate.now()).stream().collect(groupingBy(
-                        x -> x.getFofoId(), Collectors.summingInt(x -> x.getShortPercentage() > 10 ? 1 : 0)));
+                x -> x.getFofoId(), Collectors.summingInt(x -> x.getShortPercentage() > 10 ? 1 : 0)));
         for (FofoStore fofoStore : fofoStores) {
             LOGGER.info("Fofo Store {},  {}", fofoStore.getId(), fofoStore.getCode());
             int fofoId = fofoStore.getId();
             PartnerDailyInvestment partnerDailyInvestment = partnerInvestmentService.getInvestment(fofoId, 1);
             partnerDailyInvestment.setDate(yesterDay);
             try {
                 partnerDailyInvestmentRepository.persist(partnerDailyInvestment);
-                shortDaysMap.put(fofoId,
-                        shortDaysMap.get(fofoId) + (partnerDailyInvestment.getShortPercentage() > 10 ? 1 : 0));
+                shortDaysMap.put(fofoId, shortDaysMap.get(fofoId) + (partnerDailyInvestment.getShortPercentage() > 10 ? 1 : 0));
             } catch (Exception e) {
                 // ignore the exceptions during persist
+            }
             CustomRetailer retailer = customRetailerMap.get(fofoStore.getId());
                 LOGGER.info("Could not find retailer with retailer Id {}", fofoStore.getId());
                 continue;
+            }
             FofoReportingModel reportingModel = partnerIdSalesHeaderMap.get(fofoStore.getId());
             List<Serializable> row = new ArrayList<>();
-            row.addAll(Arrays.asList(reportingModel.getCode(), reportingModel.getBusinessName(),
+            row.addAll(Arrays.asList(reportingModel.getCode(), reportingModel.getBusinessName(), reportingModel.getRegionalManager(), reportingModel.getTerritoryManager()));
-                    reportingModel.getRegionalManager(), reportingModel.getTerritoryManager()));
             row.addAll(
-                    Arrays.asList(partnerDailyInvestment.getWalletAmount(), partnerDailyInvestment.getInStockAmount(),
+                    Arrays.asList(partnerDailyInvestment.getWalletAmount(), partnerDailyInvestment.getInStockAmount(), partnerDailyInvestment.getActivatedStockAmount() == 0 ? "-" : "(" + partnerDailyInvestment.getActivatedStockAmount() + ")", 0, partnerDailyInvestment.getUnbilledAmount(), partnerDailyInvestment.getGrnPendingAmount(), partnerDailyInvestment.getMinInvestment(), partnerDailyInvestment.getTotalInvestment(), partnerDailyInvestment.getShortInvestment(), partnerDailyInvestment.getUnbilledQty(), shortDaysMap.get(fofoId)));
-                            partnerDailyInvestment.getActivatedStockAmount() == 0 ? "-"
-                                    : "(" + partnerDailyInvestment.getActivatedStockAmount() + ")",
-, partnerDailyInvestment.getUnbilledAmount(), partnerDailyInvestment.getGrnPendingAmount(),
-                            partnerDailyInvestment.getMinInvestment(), partnerDailyInvestment.getTotalInvestment(),
-                            partnerDailyInvestment.getShortInvestment(), partnerDailyInvestment.getUnbilledQty(),
-                            shortDaysMap.get(fofoId)));
             partnerRowsMap.put(fofoStore.getId(), row);
             rows.add(row);
+        }
         String fileName = "InvestmentSummary-" + FormattingUtils.formatDate(LocalDateTime.now()) + ".csv";
         if (sendTo == null) {
             for (Map.Entry<String, Set<Integer>> storeGuyEntry : csService.getAuthUserPartnerIdMapping().entrySet()) {
-                List<List<?>> filteredRows = storeGuyEntry.getValue().stream().map(x -> partnerRowsMap.get(x))
+                List<List<?>> filteredRows = storeGuyEntry.getValue().stream().map(x -> partnerRowsMap.get(x)).filter(x -> x != null).collect(Collectors.toList());
-                        .filter(x -> x != null).collect(Collectors.toList());
                 ByteArrayOutputStream baos = FileUtil.getCSVByteStream(headers, filteredRows);
                 String[] sendToArray = new String[]{storeGuyEntry.getKey()};
-                Utils.sendMailWithAttachment(googleMailSender, sendToArray, null, "Franchise Investment Summary", "PFA",
+                Utils.sendMailWithAttachment(googleMailSender, sendToArray, null, "Franchise Investment Summary", "PFA", fileName, new ByteArrayResource(baos.toByteArray()));
-                        fileName, new ByteArrayResource(baos.toByteArray()));
+            }
-            sendTo = Arrays.asList("tarun.verma@smartdukaan.com", "kamini.sharma@smartdukaan.com",
-                    "neeraj.gupta@smartdukaan.com", "amit.gupta@shop2020.in", "manish.gupta@smartdukaan.com",
+            sendTo = Arrays.asList("tarun.verma@smartdukaan.com", "kamini.sharma@smartdukaan.com", "neeraj.gupta@smartdukaan.com", "amit.gupta@shop2020.in", "manish.gupta@smartdukaan.com", "niranjan.kala@smartdukaan.com");
-                    "niranjan.kala@smartdukaan.com");
+        }
         ByteArrayOutputStream baos = FileUtil.getCSVByteStream(headers, rows);
         String[] sendToArray = sendTo.toArray(new String[sendTo.size()]);
-        Utils.sendMailWithAttachment(googleMailSender, sendToArray, null, "Franchise Investment Summary", "PFA",
+        Utils.sendMailWithAttachment(googleMailSender, sendToArray, null, "Franchise Investment Summary", "PFA", fileName, new ByteArrayResource(baos.toByteArray()));
-                fileName, new ByteArrayResource(baos.toByteArray()));
+    }
     private Map<Integer, FofoReportingModel> getPartnerIdSalesHeaders() {
         Map<String, SaleRoles> partnerEmailSalesMap = new HashMap<>();
         Map<String, SaleRoles> partnerEmailRBMMap = new HashMap<>();
-        List<Position> positions = positionRepository
-                .selectPositionByCategoryIds(Arrays.asList(ProfitMandiConstants.TICKET_CATEGORY_SALES, ProfitMandiConstants.TICKET_CATEGORY_RBM));
+        List<Position> positions = positionRepository.selectPositionByCategoryIds(Arrays.asList(ProfitMandiConstants.TICKET_CATEGORY_SALES, ProfitMandiConstants.TICKET_CATEGORY_RBM));
-        Map<Integer, AuthUser> authUsersMap = authRepository.selectAllActiveUser().stream()
+        Map<Integer, AuthUser> authUsersMap = authRepository.selectAllActiveUser().stream().collect(Collectors.toMap(x -> x.getId(), x -> x));
-                .collect(Collectors.toMap(x -> x.getId(), x -> x));
         Map<Integer, List<CustomRetailer>> positionIdRetailerMap = csService.getPositionCustomRetailerMap(positions);
         for (Position position : positions) {
             List<CustomRetailer> crList = positionIdRetailerMap.get(position.getId());
             if (crList == null)
                 continue;
         Set<CustomRetailer> allCrList = new HashSet<>();
         for (List<CustomRetailer> cr : positionIdRetailerMap.values()) {
             allCrList.addAll(cr);
+        }
-        Map<Integer, FofoStore> fofoStoresMap = fofoStoreRepository.selectActiveStores().stream()
+        Map<Integer, FofoStore> fofoStoresMap = fofoStoreRepository.selectActiveStores().stream().collect(Collectors.toMap(x -> x.getId(), x -> x));
-                .collect(Collectors.toMap(x -> x.getId(), x -> x));
         Map<Integer, FofoReportingModel> partnerIdSalesHeadersMap = new HashMap<>();
         for (CustomRetailer cr : allCrList) {
             FofoStore fofoStore = fofoStoresMap.get(cr.getPartnerId());
         this.sendPartnerInvestmentDetails(null);
+    }
     public void sendAgeingReport(String... sendTo) throws Exception {
-        InputStreamSource isr = reporticoService.getReportInputStreamSource(ReporticoProject.WAREHOUSENEW,
+        InputStreamSource isr = reporticoService.getReportInputStreamSource(ReporticoProject.WAREHOUSENEW, "itemstockageing.xml");
-                "itemstockageing.xml");
-        InputStreamSource isr1 = reporticoService.getReportInputStreamSource(ReporticoProject.FOCO,
+        InputStreamSource isr1 = reporticoService.getReportInputStreamSource(ReporticoProject.FOCO, "ItemwiseOverallPendingIndent.xml");
-                "ItemwiseOverallPendingIndent.xml");
         Attachment attachment = new Attachment(
                 "ageing-report-" + FormattingUtils.formatDate(LocalDateTime.now().minusDays(1)) + ".csv", isr);
         Attachment attachment1 = new Attachment(
                 "pending-indent-" + FormattingUtils.formatDate(LocalDateTime.now().minusDays(1)) + ".csv", isr1);
-        Utils.sendMailWithAttachments(googleMailSender, STOCK_AGEING_MAIL_LIST, null, "Stock Ageing Report", "PFA",
+        Utils.sendMailWithAttachments(googleMailSender, STOCK_AGEING_MAIL_LIST, null, "Stock Ageing Report", "PFA", attachment);
-                attachment);
-        Utils.sendMailWithAttachments(googleMailSender, ITEMWISE_PENDING_INDENT_MAIL_LIST, null,
+        Utils.sendMailWithAttachments(googleMailSender, ITEMWISE_PENDING_INDENT_MAIL_LIST, null, "Itemwise Pending indent", "PFA", attachment1);
-                "Itemwise Pending indent", "PFA", attachment1);
         // Reports to be sent to mapped partners
         Map<String, Set<String>> storeGuysMap = csService.getAuthUserPartnerEmailMapping();
         for (Map.Entry<String, Set<String>> storeGuyEntry : storeGuysMap.entrySet()) {
             Map<String, String> params = new HashMap<>();
             if (storeGuyEntry.getValue().size() == 0)
                 continue;
             params.put("MANUAL_email", String.join(",", storeGuyEntry.getValue()));
-            InputStreamSource isr3 = reporticoService.getReportInputStreamSource(ReporticoProject.FOCO,
+            InputStreamSource isr3 = reporticoService.getReportInputStreamSource(ReporticoProject.FOCO, "focostockreport.xml", params);
-                    "focostockreport.xml", params);
             Attachment attache = new Attachment(
                     "Franchise-stock-report" + FormattingUtils.formatDate(LocalDateTime.now()) + ".csv", isr3);
             System.out.println(storeGuyEntry.getValue());
-            Utils.sendMailWithAttachments(googleMailSender, new String[]{storeGuyEntry.getKey()}, null,
+            Utils.sendMailWithAttachments(googleMailSender, new String[]{storeGuyEntry.getKey()}, null, "Franchise Stock Report", "PFA", attache);
-                    "Franchise Stock Report", "PFA", attache);
+        }
+    }
     public void sendIndentTertiary() throws Exception {
-        InputStreamSource isr = reporticoService.getReportInputStreamSource(ReporticoProject.FOCO,
+        InputStreamSource isr = reporticoService.getReportInputStreamSource(ReporticoProject.FOCO, "indentandtertiary.xml");
-                "indentandtertiary.xml");
         Attachment attachment = new Attachment(
                 "indentandtertiary-report-" + FormattingUtils.formatDate(LocalDateTime.now()) + ".csv", isr);
-        Utils.sendMailWithAttachments(googleMailSender, INDENT_TERTIARY_MAIL_LIST, null, "Indent Tertiary Report",
+        Utils.sendMailWithAttachments(googleMailSender, INDENT_TERTIARY_MAIL_LIST, null, "Indent Tertiary Report", "PFA", attachment);
-                "PFA", attachment);
+    }
     public void sendAttendanceMorningAlert() throws Exception {
         LocalDateTime moriningTime = LocalDate.now().atTime(10, 31);
         List<AuthUser> authUsers = authRepository.selectAllActiveUser();
-        Map<String, AuthUser> authUserEmailMap = authUsers.stream().filter(x -> x.isActive())
+        Map<String, AuthUser> authUserEmailMap = authUsers.stream().filter(x -> x.isActive()).collect(Collectors.toMap(x -> x.getEmailId(), x -> x));
-                .collect(Collectors.toMap(x -> x.getEmailId(), x -> x));
         List<User> users = dtrUserRepository.selectAllByEmailIds(new ArrayList<>(authUserEmailMap.keySet()));
         Map<String, User> userMap = users.stream().collect(Collectors.toMap(x -> x.getEmailId(), x -> x));
-        List<EmployeeAttendance> employeeAttendances = employeeAttendanceRepository
-                .selectAllByDatesBetween(LocalDate.now().atStartOfDay(), LocalDateTime.now());
+        List<EmployeeAttendance> employeeAttendances = employeeAttendanceRepository.selectAllByDatesBetween(LocalDate.now().atStartOfDay(), LocalDateTime.now());
-        Map<Integer, Optional<EmployeeAttendance>> employeeMorningAttendance = employeeAttendances.stream()
+        Map<Integer, Optional<EmployeeAttendance>> employeeMorningAttendance = employeeAttendances.stream().collect(groupingBy(EmployeeAttendance::getUserId, Collectors.minBy(Comparator.comparing(EmployeeAttendance::getCreateTimestamp))));
-                .collect(groupingBy(EmployeeAttendance::getUserId,
-                        Collectors.minBy(Comparator.comparing(EmployeeAttendance::getCreateTimestamp))));
         for (AuthUser authUser : authUsers) {
             User user = userMap.get(authUser.getEmailId());
             Optional<EmployeeAttendance> employeeAttendanceOptional = employeeMorningAttendance.get(user.getId());
             LOGGER.info("AuthUser - {}, employeeAttendanceOptional {}", authUser.getName(), employeeAttendanceOptional);
             if (employeeAttendanceOptional != null) {
                 LOGGER.info("employeeAttendanceOptional.orElse {}", employeeAttendanceOptional.orElse(null));
                 if (employeeAttendanceOptional.orElse(null) != null) {
-                    LOGGER.info("employeeAttendanceOptional.get().getCreateTimestamp() {}",
+                    LOGGER.info("employeeAttendanceOptional.get().getCreateTimestamp() {}", employeeAttendanceOptional.get().getCreateTimestamp());
-                            employeeAttendanceOptional.get().getCreateTimestamp());
+                }
+            }
-            if (employeeAttendanceOptional == null || employeeAttendanceOptional.orElse(null) == null
-                    || employeeAttendanceOptional.get().getCreateTimestamp().isAfter(moriningTime)) {
+            if (employeeAttendanceOptional == null || employeeAttendanceOptional.orElse(null) == null || employeeAttendanceOptional.get().getCreateTimestamp().isAfter(moriningTime)) {
                 LOGGER.info("Will Send Email to {}", authUser.getFullName());
                 String body = String.format(
-                        "Dear %s,\n Pls note that you haven't punched your attendance by 10:30am%s. You have been marked absent for half the day.\n\nRegards\nHR Team",
+                        "Dear %s,\n Pls note that you haven't punched your attendance by 10:30am%s. You have been marked absent for half the day.\n\nRegards\nHR Team", authUser.getFullName(), (employeeAttendanceOptional == null || employeeAttendanceOptional.orElse(null) == null) ? "" : "(Punched at " + FormattingUtils.format(employeeAttendanceOptional.get().getCreateTimestamp()) + ")");
-                        authUser.getFullName(),
-                        (employeeAttendanceOptional == null || employeeAttendanceOptional.orElse(null) == null) ? ""
-                                : "(Punched at "
-                                + FormattingUtils.format(employeeAttendanceOptional.get().getCreateTimestamp())
-                                + ")");
-                Utils.sendMailWithAttachments(googleMailSender, new String[]{authUser.getEmailId()},
+                Utils.sendMailWithAttachments(googleMailSender, new String[]{authUser.getEmailId()}, new String[]{"kangan.monga@smartdukaan.com"}, "Attendance Alert", body);
-                        new String[]{"kangan.monga@smartdukaan.com"}, "Attendance Alert", body);
+            }
+        }
+    }
     public void sendAttendanceEveningAlert() throws Exception {
         List<AuthUser> authUsers = authRepository.selectAllActiveUser();
-        Map<String, AuthUser> authUserEmailMap = authUsers.stream().filter(x -> x.isActive())
+        Map<String, AuthUser> authUserEmailMap = authUsers.stream().filter(x -> x.isActive()).collect(Collectors.toMap(x -> x.getEmailId(), x -> x));
-                .collect(Collectors.toMap(x -> x.getEmailId(), x -> x));
         List<User> users = dtrUserRepository.selectAllByEmailIds(new ArrayList<>(authUserEmailMap.keySet()));
         Map<String, User> userMap = users.stream().collect(Collectors.toMap(x -> x.getEmailId(), x -> x));
-        Map<Integer, List<EmployeeAttendance>> employeeAttendancesMap = employeeAttendanceRepository
+        Map<Integer, List<EmployeeAttendance>> employeeAttendancesMap = employeeAttendanceRepository.selectAllByDatesBetween(LocalDate.now().atStartOfDay(), LocalDateTime.now()).stream().collect(groupingBy(x -> x.getUserId()));
-                .selectAllByDatesBetween(LocalDate.now().atStartOfDay(), LocalDateTime.now()).stream()
-                .collect(groupingBy(x -> x.getUserId()));
         for (AuthUser authUser : authUsers) {
             User user = userMap.get(authUser.getEmailId());
             String body = null;
             List<EmployeeAttendance> employeeAttendances = employeeAttendancesMap.get(user.getId());
             if (employeeAttendances == null) {
                 body = String.format(
-                        "Dear %s,\n No attendance has been registered by you today. You have been marked absent for the day.\n\nRegards\nHR Team",
+                        "Dear %s,\n No attendance has been registered by you today. You have been marked absent for the day.\n\nRegards\nHR Team", authUser.getFullName());
-                        authUser.getFullName());
             } else {
-                List<LocalDateTime> punchTimes = employeeAttendances.stream()
-                        .sorted(Comparator.comparing(EmployeeAttendance::getCreateTimestamp))
+                List<LocalDateTime> punchTimes = employeeAttendances.stream().sorted(Comparator.comparing(EmployeeAttendance::getCreateTimestamp)).map(x -> x.getCreateTimestamp()).collect(Collectors.toList());
-                        .map(x -> x.getCreateTimestamp()).collect(Collectors.toList());
                 if (punchTimes.size() == 1) {
                     // body = String.format("Dear %s,\n Pls note that you haven't punched out yet.
                     // You have been marked absent for half the day. You may contact your manager
                     // and get it regularise.\n\nRegards\nHR Team", authUser.getFullName());
                 } else {
                     LocalDateTime lastPunch = punchTimes.get(punchTimes.size() - 1);
                     Duration duration = Duration.between(firstPunch, lastPunch);
                     boolean hoursCompleted = lastPunch.isAfter(firstPunch.plusHours(8).plusMinutes(30));
                     if (!hoursCompleted) {
                         body = String.format(
-                                "Dear %s,\n Pls note that you haven't completed 8.30 Hrs (%d.%d Hrs). You have been marked absent for half the day.\n\nRegards\nHR Team",
+                                "Dear %s,\n Pls note that you haven't completed 8.30 Hrs (%d.%d Hrs). You have been marked absent for half the day.\n\nRegards\nHR Team", authUser.getFullName(), duration.toHours(), duration.toMinutes() - duration.toHours() * 60);
-                                authUser.getFullName(), duration.toHours(),
-                                duration.toMinutes() - duration.toHours() * 60);
+                    }
+                }
+            }
             if (body != null) {
-                Utils.sendMailWithAttachments(googleMailSender, new String[]{authUser.getEmailId()},
+                Utils.sendMailWithAttachments(googleMailSender, new String[]{authUser.getEmailId()}, new String[]{"kangan.monga@smartdukaan.com"}, "Attendance Alert", body);
-                        new String[]{"kangan.monga@smartdukaan.com"}, "Attendance Alert", body);
+            }
+        }
         this.sendMailToHR();
     private void sendMailToHR() throws Exception {
         Map<String, String> map = new HashMap<>();
         String reporticoDate = FormattingUtils.formatReporitcoDate(LocalDateTime.now());
         map.put("MANUAL_datesBetween_FROMDATE", reporticoDate);
         map.put("MANUAL_datesBetween_FROMDATE", reporticoDate);
-        InputStreamSource isr = reporticoService.getReportInputStreamSource(ReporticoProject.FOCO,
+        InputStreamSource isr = reporticoService.getReportInputStreamSource(ReporticoProject.FOCO, "employeeattendance.xml");
-                "employeeattendance.xml");
-        Attachment attachment = new Attachment("attendance-" + FormattingUtils.formatDate(LocalDateTime.now()) + ".csv",
+        Attachment attachment = new Attachment("attendance-" + FormattingUtils.formatDate(LocalDateTime.now()) + ".csv", isr);
-                isr);
-        Utils.sendMailWithAttachments(googleMailSender, EMPLOYEE_ATTENDANCE_MAIL_LIST, null,
-                "Attendance - " + FormattingUtils.formatDate(LocalDateTime.now()), "PFA Attendance", attachment);
+        Utils.sendMailWithAttachments(googleMailSender, EMPLOYEE_ATTENDANCE_MAIL_LIST, null, "Attendance - " + FormattingUtils.formatDate(LocalDateTime.now()), "PFA Attendance", attachment);
+    }
     public void checkPartnerActiveStore() throws Exception {
         List<FofoStore> fofoStores = fofoStoreRepository.selectByStatus(true);
+        }
+    }
     public void sendAgeingReport() throws Exception {
-        sendAgeingReport("kamini.sharma@smartdukaan.com", "tarun.verma@smartdukaan.com",
-                "niranjan.kala@smartdukaan.com", "manish.gupta@smartdukaan.com", "kuldeep.kumar@smartdukaan.com");
+        sendAgeingReport("kamini.sharma@smartdukaan.com", "tarun.verma@smartdukaan.com", "niranjan.kala@smartdukaan.com", "manish.gupta@smartdukaan.com", "kuldeep.kumar@smartdukaan.com");
+    }
     public void moveImeisToPriceDropImeis() throws Exception {
         List<PriceDrop> priceDrops = priceDropRepository.selectAll();
         for (PriceDrop priceDrop : priceDrops) {
         LocalDate curDate = LocalDate.now();
         List<PartnerDailyInvestment> pdis = partnerDailyInvestmentRepository.selectAll(curDate.minusDays(2));
         System.out.println(pdis.size());
         for (PartnerDailyInvestment pdi : pdis) {
             int fofoId = pdi.getFofoId();
-            for (PartnerDailyInvestment investment : Lists
-                    .reverse(partnerDailyInvestmentRepository.selectAll(fofoId, null, null))) {
+            for (PartnerDailyInvestment investment : Lists.reverse(partnerDailyInvestmentRepository.selectAll(fofoId, null, null))) {
-                float statementAmount = walletService.getOpeningTill(fofoId,
-                        investment.getDate().plusDays(1).atTime(LocalTime.of(4, 0)));
+                float statementAmount = walletService.getOpeningTill(fofoId, investment.getDate().plusDays(1).atTime(LocalTime.of(4, 0)));
                 CustomRetailer retailer = retailerService.getFofoRetailer(fofoId);
-                LOGGER.info("{}\t{}\t{}\t{}\t{}", fofoId, retailer.getBusinessName(), retailer.getMobileNumber(),
+                LOGGER.info("{}\t{}\t{}\t{}\t{}", fofoId, retailer.getBusinessName(), retailer.getMobileNumber(), investment.getDate().toString(), investment.getWalletAmount(), statementAmount);
-                        investment.getDate().toString(), investment.getWalletAmount(), statementAmount);
+            }
+        }
+    }
     @Autowired
     StateRepository stateRepository;
     public void gst() throws Exception {
-        List<FofoOrder> fofoOrders = fofoOrderRepository.selectBetweenSaleDate(LocalDate.of(2021, 8, 16).atStartOfDay(),
+        List<FofoOrder> fofoOrders = fofoOrderRepository.selectBetweenSaleDate(LocalDate.of(2021, 8, 16).atStartOfDay(), LocalDateTime.now());
-                LocalDateTime.now());
         for (FofoOrder fofoOrder : fofoOrders) {
-            int retailerAddressId = retailerRegisteredAddressRepository
+            int retailerAddressId = retailerRegisteredAddressRepository.selectAddressIdByRetailerId(fofoOrder.getFofoId());
-                    .selectAddressIdByRetailerId(fofoOrder.getFofoId());
             Address retailerAddress = addressRepository.selectById(retailerAddressId);
             CustomerAddress customerAddress = customerAddressRepository.selectById(fofoOrder.getCustomerAddressId());
             Integer stateId = null;
             if (customerAddress.getState().equals(retailerAddress.getState())) {
                     foi.setSgstRate(0);
                     foi.setCgstRate(0);
                     foi.setIgstRate(itemIdIgstTaxRateMap.get(foi.getItemId()));
                     LOGGER.info("Invoice {}, Date {}", fofoOrder.getInvoiceNumber(), fofoOrder.getCreateTimestamp());
-                    LOGGER.info("customerAddress.getState() {}, retailerAddress.getState() {}",
+                    LOGGER.info("customerAddress.getState() {}, retailerAddress.getState() {}", customerAddress.getState(), retailerAddress.getState());
-                            customerAddress.getState(), retailerAddress.getState());
                     LOGGER.info("Rates getIgstRate() {}", itemIdIgstTaxRateMap.get(foi.getItemId()));
                 } else if (stateId != null && sgstRate == 0 && cgstRate == 0) {
                     foi.setIgstRate(0);
                     foi.setCgstRate(itemIdStateTaxRateMap.get(foi.getItemId()).getCgstRate());
                     foi.setSgstRate(itemIdStateTaxRateMap.get(foi.getItemId()).getSgstRate());
                     LOGGER.info("Invoice {}, Date {}", fofoOrder.getInvoiceNumber(), fofoOrder.getCreateTimestamp());
-                    LOGGER.info("customerAddress.getState() {}, retailerAddress.getState() {}",
+                    LOGGER.info("customerAddress.getState() {}, retailerAddress.getState() {}", customerAddress.getState(), retailerAddress.getState());
-                            customerAddress.getState(), retailerAddress.getState());
-                    LOGGER.info("Rates getCgstRate() {}, getSgstRate() {}",
-                            itemIdStateTaxRateMap.get(foi.getItemId()).getCgstRate(),
-                            itemIdStateTaxRateMap.get(foi.getItemId()).getSgstRate());
+                    LOGGER.info("Rates getCgstRate() {}, getSgstRate() {}", itemIdStateTaxRateMap.get(foi.getItemId()).getCgstRate(), itemIdStateTaxRateMap.get(foi.getItemId()).getSgstRate());
+                }
+            }
+        }
+    }
         List<SchemeInOut> siosCreated = schemeInOutRepository.selectAllByCreateDate(startDate, endDate);
         List<SchemeInOut> siosRefunded = schemeInOutRepository.selectAllByRefundDate(startDate, endDate);
         double totalSchemeDisbursed = siosCreated.stream().mapToDouble(x -> x.getAmount()).sum();
         double totalSchemeRolledback = siosRefunded.stream().mapToDouble(x -> x.getAmount()).sum();
         double netSchemeDisbursed = totalSchemeDisbursed - totalSchemeRolledback;
-        List<WalletReferenceType> walletReferenceTypes = Arrays.asList(WalletReferenceType.SCHEME_IN,
+        List<WalletReferenceType> walletReferenceTypes = Arrays.asList(WalletReferenceType.SCHEME_IN, WalletReferenceType.SCHEME_OUT);
-                WalletReferenceType.SCHEME_OUT);
-        List<UserWalletHistory> history = userWalletHistoryRepository.selectAllByDateType(startDate, endDate,
+        List<UserWalletHistory> history = userWalletHistoryRepository.selectAllByDateType(startDate, endDate, walletReferenceTypes);
-                walletReferenceTypes);
         double schemeAmountWalletTotal = history.stream().mapToDouble(x -> x.getAmount()).sum();
         if (Math.abs(netSchemeDisbursed - schemeAmountWalletTotal) > 10d) {
             LOGGER.info("Scheme Amount mismatched for Date {}", date);
             Map<Integer, Double> inventoryItemSchemeIO = siosCreated.stream().collect(groupingBy(x -> x.getInventoryItemId(), Collectors.summingDouble(SchemeInOut::getAmount)));
-            Map<Integer, Double> userSchemeMap = inventoryItemRepository.selectByIds(inventoryItemSchemeIO.keySet())
+            Map<Integer, Double> userSchemeMap = inventoryItemRepository.selectByIds(inventoryItemSchemeIO.keySet()).stream().collect(groupingBy(x -> x.getFofoId(), Collectors.summingDouble(x -> inventoryItemSchemeIO.get(x.getId()))));
-                    .stream().collect(groupingBy(x -> x.getFofoId(),
-                            Collectors.summingDouble(x -> inventoryItemSchemeIO.get(x.getId()))));
             Map<Integer, Double> inventoryItemSchemeIORefunded = siosRefunded.stream().collect(groupingBy(x -> x.getInventoryItemId(), Collectors.summingDouble(SchemeInOut::getAmount)));
-            Map<Integer, Double> userSchemeRefundedMap = inventoryItemRepository
+            Map<Integer, Double> userSchemeRefundedMap = inventoryItemRepository.selectByIds(inventoryItemSchemeIORefunded.keySet()).stream().collect(groupingBy(x -> x.getFofoId(), Collectors.summingDouble(x -> inventoryItemSchemeIORefunded.get(x.getId()))));
-                    .selectByIds(inventoryItemSchemeIORefunded.keySet()).stream()
-                    .collect(groupingBy(x -> x.getFofoId(),
-                            Collectors.summingDouble(x -> inventoryItemSchemeIORefunded.get(x.getId()))));
             Map<Integer, Double> finalUserSchemeAmountMap = new HashMap<>();
             for (Map.Entry<Integer, Double> schemeAmount : userSchemeRefundedMap.entrySet()) {
                 if (!finalUserSchemeAmountMap.containsKey(schemeAmount.getKey())) {
                     finalUserSchemeAmountMap.put(schemeAmount.getKey(), schemeAmount.getValue());
                 } else {
-                    finalUserSchemeAmountMap.put(schemeAmount.getKey(),
-                            finalUserSchemeAmountMap.get(schemeAmount.getKey()) + schemeAmount.getValue());
+                    finalUserSchemeAmountMap.put(schemeAmount.getKey(), finalUserSchemeAmountMap.get(schemeAmount.getKey()) + schemeAmount.getValue());
+                }
+            }
-            Map<Integer, Integer> userWalletMap = userWalletRepository
-                    .selectByRetailerIds(finalUserSchemeAmountMap.keySet()).stream()
-                    .collect(Collectors.toMap(UserWallet::getUserId, UserWallet::getId));
+            Map<Integer, Integer> userWalletMap = userWalletRepository.selectByRetailerIds(finalUserSchemeAmountMap.keySet()).stream().collect(Collectors.toMap(UserWallet::getUserId, UserWallet::getId));
             Map<Integer, Double> walletAmountMap = history.stream().collect(groupingBy(
                     UserWalletHistory::getWalletId, Collectors.summingDouble((UserWalletHistory::getAmount))));
             for (Map.Entry<Integer, Double> userAmount : walletAmountMap.entrySet()) {
                 double diff = Math.abs(finalUserSchemeAmountMap.get(userAmount.getKey()) - userAmount.getValue());
+        }
+    }
     public void dryRunSchemeReco() throws Exception {
-        Map<Integer, Integer> userWalletMap = userWalletRepository.selectAll().stream()
+        Map<Integer, Integer> userWalletMap = userWalletRepository.selectAll().stream().collect(Collectors.toMap(UserWallet::getUserId, UserWallet::getId));
-                .collect(Collectors.toMap(UserWallet::getUserId, UserWallet::getId));
         List<UserWalletHistory> userWalletHistory = new ArrayList<>();
         List<SchemeInOut> rolledbackSios = new ArrayList<>();
-        Map<Integer, SchemeType> schemeTypeMap = schemeRepository.selectAll().stream()
+        Map<Integer, SchemeType> schemeTypeMap = schemeRepository.selectAll().stream().collect(Collectors.toMap(Scheme::getId, Scheme::getType));
-                .collect(Collectors.toMap(Scheme::getId, Scheme::getType));
         Set<String> serialNumbersConsidered = new HashSet<>();
         LocalDateTime startDate = LocalDate.of(2018, 3, 1).atStartOfDay();
         LocalDateTime endDate = LocalDate.now().atStartOfDay();
         List<Purchase> purchases = purchaseRepository.selectAllBetweenPurchaseDate(startDate, endDate);
         Map<Integer, String> storeNameMap = fofoStoreRepository.getStoresMap();
         purchases.stream().forEach(purchase -> {
             float amountToRollback = 0;
-            String description = "Adjustment of Duplicate Scheme for Purchase Invoice "
+            String description = "Adjustment of Duplicate Scheme for Purchase Invoice " + purchase.getPurchaseReference();
-                    + purchase.getPurchaseReference();
-            Map<Integer, String> inventorySerialNumberMap = inventoryItemRepository.selectByPurchaseId(purchase.getId())
+            Map<Integer, String> inventorySerialNumberMap = inventoryItemRepository.selectByPurchaseId(purchase.getId()).stream().filter(ii -> ii.getSerialNumber() != null).collect(Collectors.toMap(InventoryItem::getId, InventoryItem::getSerialNumber));
-                    .stream().filter(ii -> ii.getSerialNumber() != null)
-                    .collect(Collectors.toMap(InventoryItem::getId, InventoryItem::getSerialNumber));
             if (inventorySerialNumberMap.size() > 0) {
                 for (Map.Entry<Integer, String> inventorySerialNumberEntry : inventorySerialNumberMap.entrySet()) {
                     String serialNumber = inventorySerialNumberEntry.getValue();
                     int inventoryItemId = inventorySerialNumberEntry.getKey();
                     if (serialNumbersConsidered.contains(serialNumber)) {
                         // This will rollback scheme for differenct orders for same serial
-                        List<SchemeInOut> sios = schemeInOutRepository
+                        List<SchemeInOut> sios = schemeInOutRepository.selectByInventoryItemIds(new HashSet<>(Arrays.asList(inventoryItemId))).stream().filter(x -> x.getRolledBackTimestamp() == null && schemeTypeMap.get(x.getSchemeId()).equals(SchemeType.IN)).collect(Collectors.toList());
-                                .selectByInventoryItemIds(new HashSet<>(Arrays.asList(inventoryItemId))).stream()
-                                .filter(x -> x.getRolledBackTimestamp() == null
-                                        && schemeTypeMap.get(x.getSchemeId()).equals(SchemeType.IN))
-                                .collect(Collectors.toList());
                         Collections.reverse(sios);
                         for (SchemeInOut sio : sios) {
                             sio.setRolledBackTimestamp(LocalDateTime.now());
                             amountToRollback += sio.getAmount();
                             // sio.setSchemeType(SchemeType.OUT);
+                        }
                         description = description.concat(" " + serialNumber + " ");
                     } else {
                         serialNumbersConsidered.add(serialNumber);
                         List<Integer> schemesConsidered = new ArrayList<>();
-                        List<SchemeInOut> sios = schemeInOutRepository
+                        List<SchemeInOut> sios = schemeInOutRepository.selectByInventoryItemIds(new HashSet<>(Arrays.asList(inventoryItemId))).stream().filter(x -> x.getRolledBackTimestamp() == null && schemeTypeMap.get(x.getSchemeId()).equals(SchemeType.IN)).collect(Collectors.toList());
-                                .selectByInventoryItemIds(new HashSet<>(Arrays.asList(inventoryItemId))).stream()
-                                .filter(x -> x.getRolledBackTimestamp() == null
-                                        && schemeTypeMap.get(x.getSchemeId()).equals(SchemeType.IN))
-                                .collect(Collectors.toList());
                         Collections.reverse(sios);
                         for (SchemeInOut sio : sios) {
                             if (!schemesConsidered.contains(sio.getSchemeId())) {
                                 schemesConsidered.add(sio.getSchemeId());
                                 continue;
                 uwh.setStoreCode(storeNameMap.get(purchase.getFofoId()));
                 userWalletHistory.add(uwh);
+            }
         });
         ByteArrayOutputStream baos = FileUtil.getCSVByteStream(
-                Arrays.asList("User Id", "Store Code", "Reference Type", "Reference", "Amount", "Description",
+                Arrays.asList("User Id", "Store Code", "Reference Type", "Reference", "Amount", "Description", "Timestamp"), userWalletHistory.stream().map(x -> Arrays.asList(x.getWalletId(), x.getStoreCode(), x.getReferenceType(), x.getReference(), x.getAmount(), x.getDescription(), x.getTimestamp())).collect(Collectors.toList()));
-                        "Timestamp"),
-                userWalletHistory.stream()
-                        .map(x -> Arrays.asList(x.getWalletId(), x.getStoreCode(), x.getReferenceType(),
-                                x.getReference(), x.getAmount(), x.getDescription(), x.getTimestamp()))
-                        .collect(Collectors.toList()));
         ByteArrayOutputStream baosOuts = FileUtil.getCSVByteStream(
-                Arrays.asList("Scheme ID", "SchemeType", "Reference", "Store Code", "Serial Number", "Amount",
+                Arrays.asList("Scheme ID", "SchemeType", "Reference", "Store Code", "Serial Number", "Amount", "Created", "Rolledback"), rolledbackSios.stream().map(x -> Arrays.asList(x.getSchemeId(), x.getSchemeType(), x.getReference(), x.getStoreCode(), x.getSerialNumber(), x.getAmount(), x.getCreateTimestamp(), x.getRolledBackTimestamp())).collect(Collectors.toList()));
-                        "Created", "Rolledback"),
-                rolledbackSios.stream()
-                        .map(x -> Arrays.asList(x.getSchemeId(), x.getSchemeType(), x.getReference(), x.getStoreCode(),
-                                x.getSerialNumber(), x.getAmount(), x.getCreateTimestamp(), x.getRolledBackTimestamp()))
-                        .collect(Collectors.toList()));
-        Utils.sendMailWithAttachments(googleMailSender, new String[]{"amit.gupta@shop2020.in"}, null,
+        Utils.sendMailWithAttachments(googleMailSender, new String[]{"amit.gupta@shop2020.in"}, null, "Partner Excess Amount Scheme In", "PFA", new Attachment[]{new Attachment("WalletSummary.csv", new ByteArrayResource(baos.toByteArray())), new Attachment("SchemeInRolledback.csv", new ByteArrayResource(baosOuts.toByteArray()))});
-                "Partner Excess Amount Scheme In", "PFA",
-                new Attachment[]{new Attachment("WalletSummary.csv", new ByteArrayResource(baos.toByteArray())),
-                        new Attachment("SchemeInRolledback.csv", new ByteArrayResource(baosOuts.toByteArray()))});
         throw new Exception();
+    }
     public void dryRunOutSchemeReco() throws Exception {
         List<UserWalletHistory> userWalletHistory = new ArrayList<>();
         List<SchemeInOut> rolledbackSios = new ArrayList<>();
-        Map<Integer, Integer> userWalletMap = userWalletRepository.selectAll().stream()
+        Map<Integer, Integer> userWalletMap = userWalletRepository.selectAll().stream().collect(Collectors.toMap(UserWallet::getUserId, UserWallet::getId));
-                .collect(Collectors.toMap(UserWallet::getUserId, UserWallet::getId));
-        Map<Integer, SchemeType> schemeTypeMap = schemeRepository.selectAll().stream()
+        Map<Integer, SchemeType> schemeTypeMap = schemeRepository.selectAll().stream().collect(Collectors.toMap(Scheme::getId, Scheme::getType));
-                .collect(Collectors.toMap(Scheme::getId, Scheme::getType));
         LocalDateTime startDate = LocalDate.of(2019, 5, 1).atStartOfDay();
         LocalDateTime endDate = LocalDate.now().atStartOfDay();
         List<FofoOrder> allOrders = fofoOrderRepository.selectBetweenSaleDate(startDate, endDate);
         // Collections.reverse(allOrders);
         // List<FofoOrder> allOrders =
             String description = "Adjustment of Duplicate Scheme for Sale Invoice " + fofoOrder.getInvoiceNumber();
             Map<Integer, String> inventorySerialNumberMap = new HashMap<>();
             float amountToRollback = 0;
             List<FofoOrderItem> orderItems = fofoOrderItemRepository.selectByOrderId(fofoOrder.getId());
             orderItems.forEach(x -> {
-                inventorySerialNumberMap.putAll(x.getFofoLineItems().stream().filter(li -> li.getSerialNumber() != null)
+                inventorySerialNumberMap.putAll(x.getFofoLineItems().stream().filter(li -> li.getSerialNumber() != null).collect(Collectors.toMap(FofoLineItem::getInventoryItemId, FofoLineItem::getSerialNumber)));
-                        .collect(Collectors.toMap(FofoLineItem::getInventoryItemId, FofoLineItem::getSerialNumber)));
             });
             if (inventorySerialNumberMap.size() > 0) {
                 for (Map.Entry<Integer, String> inventorySerialNumberEntry : inventorySerialNumberMap.entrySet()) {
                     String serialNumber = inventorySerialNumberEntry.getValue();
                     int inventoryItemId = inventorySerialNumberEntry.getKey();
                     if (serialNumbersConsidered.contains(serialNumber)) {
                         // This will rollback scheme for differenct orders for same serial
-                        List<SchemeInOut> sios = schemeInOutRepository
+                        List<SchemeInOut> sios = schemeInOutRepository.selectByInventoryItemIds(new HashSet<>(Arrays.asList(inventoryItemId))).stream().filter(x -> x.getRolledBackTimestamp() == null && schemeTypeMap.get(x.getSchemeId()).equals(SchemeType.OUT)).collect(Collectors.toList());
-                                .selectByInventoryItemIds(new HashSet<>(Arrays.asList(inventoryItemId))).stream()
-                                .filter(x -> x.getRolledBackTimestamp() == null
-                                        && schemeTypeMap.get(x.getSchemeId()).equals(SchemeType.OUT))
-                                .collect(Collectors.toList());
                         Collections.reverse(sios);
                         for (SchemeInOut sio : sios) {
                             sio.setRolledBackTimestamp(LocalDateTime.now());
                             amountToRollback += sio.getAmount();
                             // sio.setSchemeType(SchemeType.OUT);
+                        }
                         description = description.concat(" " + serialNumber + " ");
                     } else {
                         serialNumbersConsidered.add(serialNumber);
                         List<Integer> schemesConsidered = new ArrayList<>();
-                        List<SchemeInOut> sios = schemeInOutRepository
+                        List<SchemeInOut> sios = schemeInOutRepository.selectByInventoryItemIds(new HashSet<>(Arrays.asList(inventoryItemId))).stream().filter(x -> x.getRolledBackTimestamp() == null && schemeTypeMap.get(x.getSchemeId()).equals(SchemeType.OUT)).collect(Collectors.toList());
-                                .selectByInventoryItemIds(new HashSet<>(Arrays.asList(inventoryItemId))).stream()
-                                .filter(x -> x.getRolledBackTimestamp() == null
-                                        && schemeTypeMap.get(x.getSchemeId()).equals(SchemeType.OUT))
-                                .collect(Collectors.toList());
                         Collections.reverse(sios);
                         for (SchemeInOut sio : sios) {
                             if (!schemesConsidered.contains(sio.getSchemeId())) {
                                 schemesConsidered.add(sio.getSchemeId());
                                 continue;
                 userWalletHistory.add(uwh);
+            }
         });
         ByteArrayOutputStream baos = FileUtil.getCSVByteStream(
-                Arrays.asList("Wallet Id", "Store Code", "Reference Type", "Reference", "Amount", "Description",
+                Arrays.asList("Wallet Id", "Store Code", "Reference Type", "Reference", "Amount", "Description", "Timestamp"), userWalletHistory.stream().map(x -> Arrays.asList(x.getWalletId(), x.getStoreCode(), x.getReferenceType(), x.getReference(), x.getAmount(), x.getDescription(), x.getTimestamp())).collect(Collectors.toList()));
-                        "Timestamp"),
-                userWalletHistory.stream()
-                        .map(x -> Arrays.asList(x.getWalletId(), x.getStoreCode(), x.getReferenceType(),
-                                x.getReference(), x.getAmount(), x.getDescription(), x.getTimestamp()))
-                        .collect(Collectors.toList()));
         ByteArrayOutputStream baosOuts = FileUtil.getCSVByteStream(
-                Arrays.asList("Scheme ID", "SchemeType", "Store Code", "Serial Number", "Amount", "Created",
+                Arrays.asList("Scheme ID", "SchemeType", "Store Code", "Serial Number", "Amount", "Created", "Rolledback"), rolledbackSios.stream().map(x -> Arrays.asList(x.getSchemeId(), x.getSchemeType(), x.getStoreCode(), x.getSerialNumber(), x.getAmount(), x.getCreateTimestamp(), x.getRolledBackTimestamp())).collect(Collectors.toList()));
-                        "Rolledback"),
-                rolledbackSios.stream()
-                        .map(x -> Arrays.asList(x.getSchemeId(), x.getSchemeType(), x.getStoreCode(),
-                                x.getSerialNumber(), x.getAmount(), x.getCreateTimestamp(), x.getRolledBackTimestamp()))
-                        .collect(Collectors.toList()));
-        Utils.sendMailWithAttachments(googleMailSender, new String[]{"amit.gupta@shop2020.in"}, null,
+        Utils.sendMailWithAttachments(googleMailSender, new String[]{"amit.gupta@shop2020.in"}, null, "Partner Excess Amount Scheme Out", "PFA", new Attachment[]{new Attachment("WalletSummary.csv", new ByteArrayResource(baos.toByteArray())), new Attachment("SchemeOutRolledback.csv", new ByteArrayResource(baosOuts.toByteArray()))});
-                "Partner Excess Amount Scheme Out", "PFA",
-                new Attachment[]{new Attachment("WalletSummary.csv", new ByteArrayResource(baos.toByteArray())),
-                        new Attachment("SchemeOutRolledback.csv", new ByteArrayResource(baosOuts.toByteArray()))});
         throw new Exception();
+    }
     public void dryRunSchemeOutReco1() throws Exception {
         List<Integer> references = Arrays.asList(6744, 7347, 8320, 8891, 9124, 9217, 9263, 9379);
         List<UserWalletHistory> userWalletHistory = new ArrayList<>();
         List<SchemeInOut> rolledbackSios = new ArrayList<>();
-        Map<Integer, Integer> userWalletMap = userWalletRepository.selectAll().stream()
+        Map<Integer, Integer> userWalletMap = userWalletRepository.selectAll().stream().collect(Collectors.toMap(UserWallet::getUserId, UserWallet::getId));
-                .collect(Collectors.toMap(UserWallet::getUserId, UserWallet::getId));
-        Map<Integer, SchemeType> schemeTypeMap = schemeRepository.selectAll().stream()
+        Map<Integer, SchemeType> schemeTypeMap = schemeRepository.selectAll().stream().collect(Collectors.toMap(Scheme::getId, Scheme::getType));
-                .collect(Collectors.toMap(Scheme::getId, Scheme::getType));
         references.stream().forEach(reference -> {
             FofoOrder fofoOrder = null;
             try {
                 fofoOrder = fofoOrderRepository.selectByOrderId(reference);
             } catch (Exception e) {
             String description = "Adjustment of Duplicate Scheme for Sale Invoice " + fofoOrder.getInvoiceNumber();
             Map<Integer, String> inventorySerialNumberMap = new HashMap<>();
             float amountToRollback = 0;
             List<FofoOrderItem> orderItems = fofoOrderItemRepository.selectByOrderId(fofoOrder.getId());
             orderItems.forEach(x -> {
-                inventorySerialNumberMap.putAll(x.getFofoLineItems().stream().filter(li -> li.getSerialNumber() != null)
+                inventorySerialNumberMap.putAll(x.getFofoLineItems().stream().filter(li -> li.getSerialNumber() != null).collect(Collectors.toMap(FofoLineItem::getInventoryItemId, FofoLineItem::getSerialNumber)));
-                        .collect(Collectors.toMap(FofoLineItem::getInventoryItemId, FofoLineItem::getSerialNumber)));
             });
             if (inventorySerialNumberMap.size() > 0) {
-                List<SchemeInOut> sios = schemeInOutRepository
-                        .selectByInventoryItemIds(inventorySerialNumberMap.keySet()).stream()
-                        .filter(x -> schemeTypeMap.get(x.getSchemeId()).equals(SchemeType.OUT))
+                List<SchemeInOut> sios = schemeInOutRepository.selectByInventoryItemIds(inventorySerialNumberMap.keySet()).stream().filter(x -> schemeTypeMap.get(x.getSchemeId()).equals(SchemeType.OUT)).collect(Collectors.toList());
-                        .collect(Collectors.toList());
                 LOGGER.info("Found {} duplicate schemeouts for Orderid {}", sios.size(), fofoOrder.getId());
                 UserWalletHistory uwh = new UserWalletHistory();
-                Map<Integer, List<SchemeInOut>> inventoryIdSouts = sios.stream()
-                        .collect(groupingBy(SchemeInOut::getInventoryItemId, Collectors.toList()));
+                Map<Integer, List<SchemeInOut>> inventoryIdSouts = sios.stream().collect(groupingBy(SchemeInOut::getInventoryItemId, Collectors.toList()));
                 for (Map.Entry<Integer, List<SchemeInOut>> inventorySioEntry : inventoryIdSouts.entrySet()) {
                     List<SchemeInOut> outList = inventorySioEntry.getValue();
                     if (outList.size() > 1) {
+                    }
                 userWalletHistory.add(uwh);
+            }
         });
         ByteArrayOutputStream baos = FileUtil.getCSVByteStream(
-                Arrays.asList("User Id", "Reference Type", "Reference", "Amount", "Description", "Timestamp"),
+                Arrays.asList("User Id", "Reference Type", "Reference", "Amount", "Description", "Timestamp"), userWalletHistory.stream().map(x -> Arrays.asList(x.getWalletId(), x.getReferenceType(), x.getReference(), x.getAmount(), x.getDescription(), x.getTimestamp())).collect(Collectors.toList()));
-                userWalletHistory.stream().map(x -> Arrays.asList(x.getWalletId(), x.getReferenceType(),
-                                x.getReference(), x.getAmount(), x.getDescription(), x.getTimestamp()))
-                        .collect(Collectors.toList()));
         ByteArrayOutputStream baosOuts = FileUtil.getCSVByteStream(
-                Arrays.asList("Scheme ID", "SchemeType", "Store Code", "Serial Number", "Amount", "Created",
+                Arrays.asList("Scheme ID", "SchemeType", "Store Code", "Serial Number", "Amount", "Created", "Rolledback"), rolledbackSios.stream().map(x -> Arrays.asList(x.getSchemeId(), x.getSchemeType(), x.getStoreCode(), x.getSerialNumber(), x.getAmount(), x.getCreateTimestamp(), x.getRolledBackTimestamp())).collect(Collectors.toList()));
-                        "Rolledback"),
-                rolledbackSios.stream()
-                        .map(x -> Arrays.asList(x.getSchemeId(), x.getSchemeType(), x.getStoreCode(),
-                                x.getSerialNumber(), x.getAmount(), x.getCreateTimestamp(), x.getRolledBackTimestamp()))
-                        .collect(Collectors.toList()));
-        Utils.sendMailWithAttachments(googleMailSender,
+        Utils.sendMailWithAttachments(googleMailSender, new String[]{"amit.gupta@shop2020.in", "neeraj.gupta@smartdukaan.com"}, null, "Partner Excess Amount", "PFA", new Attachment[]{new Attachment("WalletSummary.csv", new ByteArrayResource(baos.toByteArray())), new Attachment("SchemeOutRolledback.csv", new ByteArrayResource(baosOuts.toByteArray()))});
-                new String[]{"amit.gupta@shop2020.in", "neeraj.gupta@smartdukaan.com"}, null,
-                "Partner Excess Amount", "PFA",
-                new Attachment[]{new Attachment("WalletSummary.csv", new ByteArrayResource(baos.toByteArray())),
-                        new Attachment("SchemeOutRolledback.csv", new ByteArrayResource(baosOuts.toByteArray()))});
         throw new Exception();
+    }
+         *
          * }
          */
         List<Integer> fofoIds = null;
-        Map<Integer, FofoStore> fofoStoreMap = fofoStoreRepository.selectAll().stream().filter(x -> x.isActive())
+        Map<Integer, FofoStore> fofoStoreMap = fofoStoreRepository.selectAll().stream().filter(x -> x.isActive()).collect(Collectors.toMap(x -> x.getId(), x -> x));
-                .collect(Collectors.toMap(x -> x.getId(), x -> x));
         if (fofoIdInt == null) {
             fofoIds = new ArrayList<>(fofoStoreMap.keySet());
         } else {
             fofoIds = Arrays.asList(fofoIdInt);
+        }
         DateTimeFormatter timeFormatter = DateTimeFormatter.ofPattern("h:m a");
-        Map<Integer, Float> partnerPolicyAmountMap = insurancePolicyRepository.selectAmountSumGroupByRetailerId(now,
+        Map<Integer, Float> partnerPolicyAmountMap = insurancePolicyRepository.selectAmountSumGroupByRetailerId(now, null);
-                null);
         Map<Integer, Long> partnerPolicyQtyMap = insurancePolicyRepository.selectQtyGroupByRetailerId(now, null);
-        Map<Integer, Double> spPartnerOrderValMap = fofoOrderItemRepository.selectSumAmountGroupByRetailer(from, now, 0,
+        Map<Integer, Double> spPartnerOrderValMap = fofoOrderItemRepository.selectSumAmountGroupByRetailer(from, now, 0, true);
-                true);
-        Map<Integer, Double> spPartner3DaysOrderValMap = fofoOrderItemRepository
+        Map<Integer, Double> spPartner3DaysOrderValMap = fofoOrderItemRepository.selectSumAmountGroupByRetailer(from.minusDays(3), now, 0, true);
-                .selectSumAmountGroupByRetailer(from.minusDays(3), now, 0, true);
         Map<Integer, Long> spPartnerOrderQtyMap = fofoOrderItemRepository.selectQtyGroupByRetailer(from, now, 0, true);
-        Map<Integer, Double> partnerOrderValMap = fofoOrderItemRepository.selectSumAmountGroupByRetailer(from, now, 0,
+        Map<Integer, Double> partnerOrderValMap = fofoOrderItemRepository.selectSumAmountGroupByRetailer(from, now, 0, false);
-                false);
         Map<Integer, Long> partnerOrderQtyMap = fofoOrderItemRepository.selectQtyGroupByRetailer(from, now, 0, false);
         //4 days + current day running
         Map<Integer, Double> partnerBilledValueMap = orderRepository.selectBillingDatesBetweenSumGroupByRetailerId(from.minusDays(4), now);
             // userUserRepository.selectById(fofoId);
             // Address address = addressRepository.selectById(user.getAddressId());
             String title = "Sale Update";
-            String messageTemplate = String.format("Smartphones Rs.%.0f, Insurance Rs.%.0f, Total Rs.%.0f till %s.",
+            String messageTemplate = String.format("Smartphones Rs.%.0f, Insurance Rs.%.0f, Total Rs.%.0f till %s.", model.getSmartphoneSale(), model.getInsuranceSale(), model.getTotalSale(), String.format(timeString, now.format(timeFormatter)));
-                    model.getSmartphoneSale(), model.getInsuranceSale(), model.getTotalSale(),
-                    String.format(timeString, now.format(timeFormatter)));
             SendNotificationModel sendNotificationModel = new SendNotificationModel();
             sendNotificationModel.setCampaignName("Sales update alert");
             sendNotificationModel.setTitle(title);
             sendNotificationModel.setMessage(messageTemplate);
             sendNotificationModel.setType("url");
             sendNotificationModel.setMessageType(MessageType.notification);
             int userId = userAccountRepository.selectUserIdByRetailerId(fofoId);
             sendNotificationModel.setUserIds(Arrays.asList(userId));
             notificationService.sendNotification(sendNotificationModel);
             String whatsappMessageTemplate = String.format(
-                    "Dear Partner, Your sale update is Smartphones Rs.%.0f, Insurance Rs.%.0f, Total Rs.%.0f till %s.",
+                    "Dear Partner, Your sale update is Smartphones Rs.%.0f, Insurance Rs.%.0f, Total Rs.%.0f till %s.", model.getSmartphoneSale(), model.getInsuranceSale(), model.getTotalSale(), String.format(timeString, now.format(timeFormatter)));
-                    model.getSmartphoneSale(), model.getInsuranceSale(), model.getTotalSale(),
-                    String.format(timeString, now.format(timeFormatter)));
             // notificationService.sendWhatsappMessage(whatsappMessageTemplate, title,
             // address.getPhoneNumber());
+        }
         // String saleReport = this.getDailySalesReportHtml(partnerSalesHeadersMap,
         // saleTargetReportModelMap);
         this.getStateWiseSales(saleTargetReportModelMap, partnerSalesHeadersMap);
+    }
     public void checkRazorPayPaymentStatus() throws Exception {
-        List<PendingOrder> pendingOrder = pendingOrderRepository
-                .selectAllByStatus(com.spice.profitmandi.dao.enumuration.transaction.OrderStatus.PENDING);
+        List<PendingOrder> pendingOrder = pendingOrderRepository.selectAllByStatus(com.spice.profitmandi.dao.enumuration.transaction.OrderStatus.PENDING);
         for (PendingOrder po : pendingOrder) {
             RazorPay razorPay = razorPayRepository.selectByOrdeId(po.getId());
             List<PendingOrderItem> poItems = pendingOrderItemRepository.selectByOrderId(po.getId());
                         Customer customer = customerRepository.selectById(po.getCustomerId());
                         String[] customerEmail = null;
                         if (customer.getEmailId() != null) {
                             customerEmail = new String[]{customer.getEmailId()};
+                        }
-                        List<String> bccTo = Arrays.asList("kamini.sharma@smartdukaan.com",
-                                "tarun.verma@smartdukaan.com", "niranjan.kala@smartdukaan.com", "sm@smartdukaan.com",
+                        List<String> bccTo = Arrays.asList("kamini.sharma@smartdukaan.com", "tarun.verma@smartdukaan.com", "niranjan.kala@smartdukaan.com", "sm@smartdukaan.com", "tejbeer.kaur@shop2020.in", customRetailer.getEmail());
-                                "tejbeer.kaur@shop2020.in", customRetailer.getEmail());
                         List<String> authUserEmails = csService.getAuthUserByPartnerId(customRetailer.getPartnerId());
                         if (authUserEmails != null) {
                             authUserEmails = new ArrayList<>();
+                        }
                         authUserEmails.addAll(bccTo);
             return fofoId;
+        }
         @Override
         public String toString() {
-            return "SaleTargetReportModel{" +
-                    "totalSale=" + totalSale +
-                    ", totalQty=" + totalQty +
-                    ", past3daysSale=" + past3daysSale +
-                    ", fofoId=" + fofoId +
-                    ", code='" + code + '\'' +
+            return "SaleTargetReportModel{" + "totalSale=" + totalSale + ", totalQty=" + totalQty + ", past3daysSale=" + past3daysSale + ", fofoId=" + fofoId + ", code='" + code + '\'' + ", secondary=" + secondary + ", smartphoneSale=" + smartphoneSale + ", smartphoneQty=" + smartphoneQty + ", insuranceSale=" + insuranceSale + ", insruanceQty=" + insruanceQty + '}';
-                    ", secondary=" + secondary +
-                    ", smartphoneSale=" + smartphoneSale +
-                    ", smartphoneQty=" + smartphoneQty +
-                    ", insuranceSale=" + insuranceSale +
-                    ", insruanceQty=" + insruanceQty +
-                    '}';
+        }
         public String getCode() {
             return code;
+        }
             this.insruanceQty = insruanceQty;
+        }
+    }
-    private void getStateWiseSales(Map<Integer, SaleTargetReportModel> saleTargetReportModelMap,
+    private void getStateWiseSales(Map<Integer, SaleTargetReportModel> saleTargetReportModelMap, Map<Integer, FofoReportingModel> partnerSalesHeadersMap) throws Exception {
-                                   Map<Integer, FofoReportingModel> partnerSalesHeadersMap) throws Exception {
         String timeString = "Today %s";
         LocalDateTime now = LocalDateTime.now();
         DateTimeFormatter timeFormatter = DateTimeFormatter.ofPattern("h:m a");
-        List<Integer> categoryIds = Arrays.asList(ProfitMandiConstants.TICKET_CATEGORY_LOGISTICS,
+        List<Integer> categoryIds = Arrays.asList(ProfitMandiConstants.TICKET_CATEGORY_LOGISTICS, ProfitMandiConstants.TICKET_CATEGORY_FINANCIAL_SERVICES, ProfitMandiConstants.TICKET_CATEGORY_CATEGORY, ProfitMandiConstants.TICKET_CATEGORY_RBM, ProfitMandiConstants.TICKET_CATEGORY_SALES, ProfitMandiConstants.TICKET_CATEGORY_MARKETING, ProfitMandiConstants.TICKET_CATEGORY_ACCOUNTS, ProfitMandiConstants.TICKET_CATEGORY_BUSINESSINTELLIGENT, ProfitMandiConstants.TICKET_CATEGORY_TECHNOLOGY);
-                ProfitMandiConstants.TICKET_CATEGORY_FINANCIAL_SERVICES, ProfitMandiConstants.TICKET_CATEGORY_CATEGORY,
-                ProfitMandiConstants.TICKET_CATEGORY_RBM, ProfitMandiConstants.TICKET_CATEGORY_SALES,
-                ProfitMandiConstants.TICKET_CATEGORY_MARKETING, ProfitMandiConstants.TICKET_CATEGORY_ACCOUNTS,
-                ProfitMandiConstants.TICKET_CATEGORY_BUSINESSINTELLIGENT,
-                ProfitMandiConstants.TICKET_CATEGORY_TECHNOLOGY);
         Map<String, Set<Integer>> storeGuyMap = csService.getAuthUserPartnerIdMappingByCategoryIds(categoryIds, false);
         for (Entry<String, Set<Integer>> storeGuyEntry : storeGuyMap.entrySet()) {
             String email = storeGuyEntry.getKey();
             Set<Integer> fofoIds = storeGuyEntry.getValue();
             LOGGER.info("fofoIds {}", fofoIds);
             if (!fofoIds.isEmpty()) {
-                List<FofoStore> stores = fofoStoreRepository
-                        .selectActivePartnersByRetailerIds(new ArrayList<>(fofoIds));
+                List<FofoStore> stores = fofoStoreRepository.selectActivePartnersByRetailerIds(new ArrayList<>(fofoIds));
                 Map<String, List<Integer>> stateMap = stores.stream().collect(groupingBy(
                         x -> x.getCode().substring(0, 2), mapping(x -> x.getId(), Collectors.toList())));
                 List<List<Serializable>> stateWiseSales = new ArrayList<>();
                 for (Map.Entry<String, List<Integer>> stateMapEntry : stateMap.entrySet()) {
-                    long totalQty = stateMapEntry.getValue().stream()
-                            .collect(Collectors.summingLong(x -> saleTargetReportModelMap.get(x).getTotalQty()));
+                    long totalQty = stateMapEntry.getValue().stream().collect(Collectors.summingLong(x -> saleTargetReportModelMap.get(x).getTotalQty()));
-                    double totalSale = stateMapEntry.getValue().stream()
-                            .collect(Collectors.summingDouble(x -> saleTargetReportModelMap.get(x).getTotalSale()));
+                    double totalSale = stateMapEntry.getValue().stream().collect(Collectors.summingDouble(x -> saleTargetReportModelMap.get(x).getTotalSale()));
-                    long smartPhoneQty = stateMapEntry.getValue().stream()
-                            .collect(Collectors.summingLong(x -> saleTargetReportModelMap.get(x).getSmartphoneQty()));
+                    long smartPhoneQty = stateMapEntry.getValue().stream().collect(Collectors.summingLong(x -> saleTargetReportModelMap.get(x).getSmartphoneQty()));
                     double smartPhoneSale = stateMapEntry.getValue().stream().collect(
                             Collectors.summingDouble(x -> saleTargetReportModelMap.get(x).getSmartphoneSale()));
                     stateWiseSales.add(
                             Arrays.asList(stateMapEntry.getKey(), smartPhoneQty, smartPhoneSale, totalQty, totalSale));
+                }
                 StringBuilder sb = new StringBuilder();
                 sb.append("<html><body>");
                 sb.append("<p>Statewise Sale Report:</p><br/><table style=\"border-collapse: collapse;\">");
-                sb.append("<tbody>\n" + "	    <tr>"
-                        + "	    					<th style='border:1px solid black;padding: 5px'>State</th>"
-                        + "	    					<th style='border:1px solid black;padding: 5px'>SmartPhone Qty</th>"
-                        + "	    					<th style='border:1px solid black;padding: 5px'>SmartPhone Value</th>"
+                sb.append("<tbody>\n" + "	    <tr>" + "	    					<th style='border:1px solid black;padding: 5px'>State</th>" + "	    					<th style='border:1px solid black;padding: 5px'>SmartPhone Qty</th>" + "	    					<th style='border:1px solid black;padding: 5px'>SmartPhone Value</th>" + "	    					<th style='border:1px solid black;padding: 5px'>Total Qty</th>" + "	    					<th style='border:1px solid black;padding: 5px'>Total Value</th>" + "	    				</tr>");
-                        + "	    					<th style='border:1px solid black;padding: 5px'>Total Qty</th>"
-                        + "	    					<th style='border:1px solid black;padding: 5px'>Total Value</th>"
-                        + "	    				</tr>");
                 for (List<Serializable> stateSale : stateWiseSales) {
                     sb.append("<tr>");
                     sb.append("<td style='border:1px solid black;padding: 5px'>" + stateSale.get(0) + "</td>");
                     sb.append("<td style='border:1px solid black;padding: 5px'>" + stateSale.get(1) + "</td>");
                     sb.append("<td style='border:1px solid black;padding: 5px'>" + stateSale.get(2) + "</td>");
                     sb.append("</tr>");
+                }
                 sb.append("</tbody></table><br><br>");
                 sb.append("<p>Partnerwise Report:</p><br/><table style=\"border-collapse: collapse;\">");
-                sb.append("<tbody>\n" + "	    				<tr>\n"
-                        + "	    					<th style='border:1px solid black;padding: 5px'>Code</th>"
-                        + "	    					<th style='border:1px solid black;padding: 5px'>Business Name</th>"
-                        + "	    					<th style='border:1px solid black;padding: 5px'>BDM Name</th>"
-                        + "	    					<th style='border:1px solid black;padding: 5px'>Regional Manager</th>"
-                        + "	    					<th style='border:1px solid black;padding: 5px'>Territory Manager</th>"
+                sb.append("<tbody>\n" + "	    				<tr>\n" + "	    					<th style='border:1px solid black;padding: 5px'>Code</th>" + "	    					<th style='border:1px solid black;padding: 5px'>Business Name</th>" + "	    					<th style='border:1px solid black;padding: 5px'>BDM Name</th>" + "	    					<th style='border:1px solid black;padding: 5px'>Regional Manager</th>" + "	    					<th style='border:1px solid black;padding: 5px'>Territory Manager</th>" + "	    					<th style='border:1px solid black;padding: 5px'>Billed(4 days)</th>" + "	    					<th style='border:1px solid black;padding: 5px'>Sale</th>" + "	    					<th style='border:1px solid black;padding: 5px'>Smartphone Sale</th>" + "	    					<th style='border:1px solid black;padding: 5px'>SmartPhone Qty</th>" + "	    				</tr>");
-                        + "	    					<th style='border:1px solid black;padding: 5px'>Billed(4 days)</th>"
-                        + "	    					<th style='border:1px solid black;padding: 5px'>Sale</th>"
-                        + "	    					<th style='border:1px solid black;padding: 5px'>Smartphone Sale</th>"
-                        + "	    					<th style='border:1px solid black;padding: 5px'>SmartPhone Qty</th>"
-                        + "	    				</tr>");
-                List<Integer> sortedSaleTargetReport = saleTargetReportModelMap.values().stream()
+                List<Integer> sortedSaleTargetReport = saleTargetReportModelMap.values().stream().filter(x -> fofoIds.contains(x.getFofoId())).sorted(Comparator.comparing(SaleTargetReportModel::getCode).thenComparing(SaleTargetReportModel::getSecondary)).map(SaleTargetReportModel::getFofoId).collect(Collectors.toList());
-                        .filter(x -> fofoIds.contains(x.getFofoId()))
-                        .sorted(Comparator.comparing(SaleTargetReportModel::getCode).thenComparing(SaleTargetReportModel::getSecondary))
-                        .map(SaleTargetReportModel::getFofoId).collect(Collectors.toList());
                 String subject = String.format("Sale till %s", String.format(timeString, now.format(timeFormatter)));
-                List<String> headers = Arrays.asList("Store Id", "Store Code", "Store Name", "Activation Type", "BDM Name", "Regional Manager", "Territory Manager",
+                List<String> headers = Arrays.asList("Store Id", "Store Code", "Store Name", "Activation Type", "BDM Name", "Regional Manager", "Territory Manager", "Secondary(4 days)", "Sale", "Smartphone Value", "Smartphone Qty");
-                        "Secondary(4 days)", "Sale", "Smartphone Value", "Smartphone Qty");
                 List<List<?>> rows = new ArrayList<>();
                 for (Integer fofoId : sortedSaleTargetReport) {
                     FofoReportingModel fofoReportingModel = partnerSalesHeadersMap.get(fofoId);
-                    rows.add(Arrays.asList(fofoId, fofoReportingModel.getCode(), fofoReportingModel.getBusinessName(), saleTargetReportModelMap.get(fofoId).getActivationType(),
+                    rows.add(Arrays.asList(fofoId, fofoReportingModel.getCode(), fofoReportingModel.getBusinessName(), saleTargetReportModelMap.get(fofoId).getActivationType(), fofoReportingModel.getBusinessManager(), fofoReportingModel.getRegionalManager(), fofoReportingModel.getTerritoryManager(), saleTargetReportModelMap.get(fofoId).getSecondary(), saleTargetReportModelMap.get(fofoId).getTotalSale(), saleTargetReportModelMap.get(fofoId).getSmartphoneSale(), saleTargetReportModelMap.get(fofoId).getSmartphoneQty()
-                            fofoReportingModel.getBusinessManager(), fofoReportingModel.getRegionalManager(), fofoReportingModel.getTerritoryManager(),
-                            saleTargetReportModelMap.get(fofoId).getSecondary(), saleTargetReportModelMap.get(fofoId).getTotalSale(),
-                            saleTargetReportModelMap.get(fofoId).getSmartphoneSale(), saleTargetReportModelMap.get(fofoId).getSmartphoneQty()
                     ));
                     //Now try to populate html rows
                     if (!saleTargetReportModelMap.get(fofoId).getActivationType().equals(ActivationType.ACTIVE)) {
                         continue;
                     if (saleTargetReportModelMap.get(fofoId).getSecondary() == 0) {
                         sb.append("<tr style='background-color:#D21F3C;color:white'>");
                     } else {
                         sb.append("<tr>");
+                    }
-                    sb.append("<td style='border:1px solid black;padding: 5px'>"
-                            + partnerSalesHeadersMap.get(fofoId).getCode() + "</td>");
+                    sb.append("<td style='border:1px solid black;padding: 5px'>" + partnerSalesHeadersMap.get(fofoId).getCode() + "</td>");
-                    sb.append("<td style='border:1px solid black;padding: 5px'>"
-                            + partnerSalesHeadersMap.get(fofoId).getBusinessName() + "</td>");
+                    sb.append("<td style='border:1px solid black;padding: 5px'>" + partnerSalesHeadersMap.get(fofoId).getBusinessName() + "</td>");
-                    sb.append("<td style='border:1px solid black;padding: 5px'>"
-                            + partnerSalesHeadersMap.get(fofoId).getBusinessManager() + "</td>");
+                    sb.append("<td style='border:1px solid black;padding: 5px'>" + partnerSalesHeadersMap.get(fofoId).getBusinessManager() + "</td>");
-                    sb.append("<td style='border:1px solid black;padding: 5px'>"
-                            + partnerSalesHeadersMap.get(fofoId).getRegionalManager() + "</td>");
+                    sb.append("<td style='border:1px solid black;padding: 5px'>" + partnerSalesHeadersMap.get(fofoId).getRegionalManager() + "</td>");
-                    sb.append("<td style='border:1px solid black;padding: 5px'>"
-                            + partnerSalesHeadersMap.get(fofoId).getTerritoryManager() + "</td>");
+                    sb.append("<td style='border:1px solid black;padding: 5px'>" + partnerSalesHeadersMap.get(fofoId).getTerritoryManager() + "</td>");
-                    sb.append("<td style='border:1px solid black;padding: 5px'>"
-                            + saleTargetReportModelMap.get(fofoId).getSecondary() + "</td>");
+                    sb.append("<td style='border:1px solid black;padding: 5px'>" + saleTargetReportModelMap.get(fofoId).getSecondary() + "</td>");
-                    sb.append("<td style='border:1px solid black;padding: 5px'>"
-                            + saleTargetReportModelMap.get(fofoId).getTotalSale() + "</td>");
+                    sb.append("<td style='border:1px solid black;padding: 5px'>" + saleTargetReportModelMap.get(fofoId).getTotalSale() + "</td>");
-                    sb.append("<td style='border:1px solid black;padding: 5px'>"
-                            + saleTargetReportModelMap.get(fofoId).getSmartphoneSale() + "</td>");
+                    sb.append("<td style='border:1px solid black;padding: 5px'>" + saleTargetReportModelMap.get(fofoId).getSmartphoneSale() + "</td>");
-                    sb.append("<td style='border:1px solid black;padding: 5px'>"
-                            + saleTargetReportModelMap.get(fofoId).getSmartphoneQty() + "</td>");
+                    sb.append("<td style='border:1px solid black;padding: 5px'>" + saleTargetReportModelMap.get(fofoId).getSmartphoneQty() + "</td>");
                     sb.append("</tr>");
+                }
                 sb.append("</tr>");
                 Utils.sendHtmlMailWithAttachments(googleMailSender, new String[]{email}, null, "Statewise " + subject, statewiseSaleReport, attachment);
+            }
+        }
+    }
-    private void sendMailOfHtmlFormat(String email, String body, String cc[], String subject)
+    private void sendMailOfHtmlFormat(String email, String body, String cc[], String subject) throws MessagingException, ProfitMandiBusinessException, IOException {
-            throws MessagingException, ProfitMandiBusinessException, IOException {
         MimeMessage message = mailSender.createMimeMessage();
         MimeMessageHelper helper = new MimeMessageHelper(message);
         helper.setSubject(subject);
         helper.setText(body, true);
         helper.setTo(email);
     public void sendNotification() throws Exception {
         List<PushNotifications> pushNotifications = pushNotificationRepository.selectAllByTimestamp();
         if (!pushNotifications.isEmpty()) {
             for (PushNotifications pushNotification : pushNotifications) {
                 Device device = deviceRepository.selectById(pushNotification.getDeviceId());
-                NotificationCampaign notificationCampaign = notificationCampaignRepository
+                NotificationCampaign notificationCampaign = notificationCampaignRepository.selectById(pushNotification.getNotificationCampaignid());
-                        .selectById(pushNotification.getNotificationCampaignid());
-                SimpleCampaignParams scp = gson.fromJson(notificationCampaign.getImplementationParams(),
+                SimpleCampaignParams scp = gson.fromJson(notificationCampaign.getImplementationParams(), SimpleCampaignParams.class);
-                        SimpleCampaignParams.class);
                 Campaign campaign = new SimpleCampaign(scp);
                 String result_url = campaign.getUrl() + "&user_id=" + device.getUser_id();
                 JSONObject json = new JSONObject();
                 json.put("to", device.getFcmId());
                 JSONObject jsonObj = new JSONObject();
+    }
     public void grouping() throws Exception {
         DateTimeFormatter dtf = DateTimeFormatter.ofPattern("MM-dd-yyyy hh:mm");
         List<PriceDropIMEI> priceDropImeis = priceDropIMEIRepository.selectByStatus(PriceDropImeiStatus.APPROVED);
-        System.out.println(String.join("\t",
-                Arrays.asList("IMEI", "ItemId", "Brand", "Model Name", "Model Number", "Franchise Id", "Franchise Name",
+        System.out.println(String.join("\t", Arrays.asList("IMEI", "ItemId", "Brand", "Model Name", "Model Number", "Franchise Id", "Franchise Name", "Grn On", "Price Dropped On", "Approved On", "Returned On", "Price Drop Paid", "Is Doa")));
-                        "Grn On", "Price Dropped On", "Approved On", "Returned On", "Price Drop Paid", "Is Doa")));
         Map<Integer, CustomRetailer> retailersMap = retailerService.getFofoRetailers(false);
         for (PriceDropIMEI priceDropIMEI : priceDropImeis) {
             if (priceDropIMEI.getPartnerId() == 0)
                 continue;
             HashSet<String> imeis = new HashSet<>();
             PriceDrop priceDrop = priceDropRepository.selectById(priceDropIMEI.getPriceDropId());
             imeis.add(priceDropIMEI.getImei());
-            List<InventoryItem> inventoryItems = inventoryItemRepository
-                    .selectByFofoIdSerialNumbers(priceDropIMEI.getPartnerId(), imeis, false);
+            List<InventoryItem> inventoryItems = inventoryItemRepository.selectByFofoIdSerialNumbers(priceDropIMEI.getPartnerId(), imeis, false);
             if (inventoryItems.size() == 0) {
                 LOGGER.info("Need to investigate partnerId - {} imeis - {}", priceDropIMEI.getPartnerId(), imeis);
                 continue;
+            }
             InventoryItem inventoryItem = inventoryItems.get(0);
             CustomRetailer customRetailer = retailersMap.get(inventoryItem.getFofoId());
-            if (inventoryItem.getLastScanType().equals(ScanType.DOA_OUT)
-                    || inventoryItem.getLastScanType().equals(ScanType.PURCHASE_RET)) {
+            if (inventoryItem.getLastScanType().equals(ScanType.DOA_OUT) || inventoryItem.getLastScanType().equals(ScanType.PURCHASE_RET)) {
                 // check if pricedrop has been rolled out
-                List<UserWalletHistory> uwh = walletService.getAllByReference(inventoryItem.getFofoId(),
+                List<UserWalletHistory> uwh = walletService.getAllByReference(inventoryItem.getFofoId(), priceDropIMEI.getPriceDropId(), WalletReferenceType.PRICE_DROP);
-                        priceDropIMEI.getPriceDropId(), WalletReferenceType.PRICE_DROP);
                 if (uwh.size() > 0) {
                     Item item = itemRepository.selectById(inventoryItem.getItemId());
-                    System.out.println(String.join("\t",
+                    System.out.println(String.join("\t", Arrays.asList(priceDropIMEI.getImei(), inventoryItem.getItemId() + "", item.getBrand(), item.getModelName(), item.getModelNumber(), inventoryItem.getFofoId() + "", customRetailer.getBusinessName(), inventoryItem.getCreateTimestamp().format(dtf), priceDrop.getAffectedOn().format(dtf), priceDropIMEI.getUpdateTimestamp().format(dtf), inventoryItem.getUpdateTimestamp().format(dtf), priceDrop.getAutoPartnerPayout(inventoryItem.getUpdateTimestamp()) + "", inventoryItem.getLastScanType().equals(ScanType.DOA_OUT) + "")));
-                            Arrays.asList(priceDropIMEI.getImei(), inventoryItem.getItemId() + "", item.getBrand(),
-                                    item.getModelName(), item.getModelNumber(), inventoryItem.getFofoId() + "",
-                                    customRetailer.getBusinessName(), inventoryItem.getCreateTimestamp().format(dtf),
-                                    priceDrop.getAffectedOn().format(dtf),
-                                    priceDropIMEI.getUpdateTimestamp().format(dtf),
-                                    inventoryItem.getUpdateTimestamp().format(dtf),
-                                    priceDrop.getAutoPartnerPayout(inventoryItem.getUpdateTimestamp()) + "",
-                                    inventoryItem.getLastScanType().equals(ScanType.DOA_OUT) + "")));
+                }
+            }
+        }
+    }
         toffeeService.cancelPolicyCopy("110143521986");
         toffeeService.getOrderId("110143521986");
+    }
     public void attachToffeeInvoices() throws Exception {
-        List<InsurancePolicy> insurancePolicies = insurancePolicyRepository.selectAllByProviderId(3,
+        List<InsurancePolicy> insurancePolicies = insurancePolicyRepository.selectAllByProviderId(3, Optional.of(false));
-                Optional.of(false));
         for (InsurancePolicy insurancePolicy : insurancePolicies) {
             String invoiceNumber = insurancePolicy.getInvoiceNumber();
             FofoOrder fofoOrder = fofoOrderRepository.selectByInvoiceNumber(invoiceNumber);
             InvoicePdfModel pdfModel = orderService.getInvoicePdfModel(fofoOrder.getId());
             java.io.ByteArrayOutputStream byteArrayOutputStream = new java.io.ByteArrayOutputStream();
             PdfUtils.generateAndWrite(Arrays.asList(pdfModel), byteArrayOutputStream);
-            String pdfInvoiceString = "data:application/pdf;base64,"
-                    + Base64.getEncoder().encodeToString(byteArrayOutputStream.toByteArray());
+            String pdfInvoiceString = "data:application/pdf;base64," + Base64.getEncoder().encodeToString(byteArrayOutputStream.toByteArray());
-            boolean attached = toffeeService.attachInvoice(insurancePolicy.getPolicyNumber().split("#")[1],
+            boolean attached = toffeeService.attachInvoice(insurancePolicy.getPolicyNumber().split("#")[1], pdfInvoiceString);
-                    pdfInvoiceString);
             if (attached) {
                 insurancePolicy.setPosted(true);
+            }
+        }
+    }
     public void sendBAGPendingPolicies() throws Exception {
-        List<InsurancePolicy> insurancePolicies = insurancePolicyRepository.selectAllByProviderId(4,
+        List<InsurancePolicy> insurancePolicies = insurancePolicyRepository.selectAllByProviderId(4, Optional.of(false));
-                Optional.of(false));
         for (InsurancePolicy insurancePolicy : insurancePolicies) {
             String invoiceNumber = insurancePolicy.getInvoiceNumber();
             FofoOrder fofoOrder = fofoOrderRepository.selectByInvoiceNumber(invoiceNumber);
             FofoOrderItem fofoOrderItem = fofoOrderItemRepository.selectByOrderId(fofoOrder.getId()).get(0);
             CustomerAddress customerAddress = customerAddressRepository.selectById(fofoOrder.getCustomerAddressId());
+        }
+    }
     public void schemeRollback(List<String> schemeIds) throws Exception {
         List<Integer> schemeIdsInt = schemeIds.stream().map(x -> Integer.parseInt(x)).collect(Collectors.toList());
-        Map<Integer, Scheme> schemesMap = schemeRepository.selectBySchemeIds(schemeIdsInt, 0, schemeIds.size()).stream()
+        Map<Integer, Scheme> schemesMap = schemeRepository.selectBySchemeIds(schemeIdsInt, 0, schemeIds.size()).stream().collect(Collectors.toMap(x -> x.getId(), x -> x));
-                .collect(Collectors.toMap(x -> x.getId(), x -> x));
         List<SchemeInOut> schemeInOuts = schemeInOutRepository.selectBySchemeIds(new HashSet<>(schemeIdsInt));
         for (SchemeInOut sio : schemeInOuts) {
             Scheme scheme = schemesMap.get(sio.getSchemeId());
             if (scheme.getType().equals(SchemeType.IN)) {
             } else if (scheme.getType().equals(SchemeType.OUT)) {
                 InventoryItem inventoryItem = inventoryItemRepository.selectById(sio.getInventoryItemId());
                 List<ScanRecord> sr = scanRecordRepository.selectByInventoryItemId(sio.getInventoryItemId());
-                ScanRecord scanRecord = sr.stream().filter(x -> x.getType().equals(ScanType.SALE))
-                        .max((x1, x2) -> x1.getCreateTimestamp().compareTo(x2.getCreateTimestamp())).get();
+                ScanRecord scanRecord = sr.stream().filter(x -> x.getType().equals(ScanType.SALE)).max((x1, x2) -> x1.getCreateTimestamp().compareTo(x2.getCreateTimestamp())).get();
-                if (scanRecord.getCreateTimestamp().isAfter(scheme.getEndDateTime())
-                        || scanRecord.getCreateTimestamp().isBefore(scheme.getStartDateTime())) {
+                if (scanRecord.getCreateTimestamp().isAfter(scheme.getEndDateTime()) || scanRecord.getCreateTimestamp().isBefore(scheme.getStartDateTime())) {
                     sio.setRolledBackTimestamp(LocalDateTime.now());
                     FofoOrder fofoOrder = fofoOrderRepository.selectByOrderId(scanRecord.getOrderId());
-                    String rollbackReason = "Scheme reversed for "
-                            + itemRepository.selectById(inventoryItem.getItemId()).getItemDescription() + "/Inv - "
+                    String rollbackReason = "Scheme reversed for " + itemRepository.selectById(inventoryItem.getItemId()).getItemDescription() + "/Inv - " + fofoOrder.getInvoiceNumber();
-                            + fofoOrder.getInvoiceNumber();
-                    walletService.rollbackAmountFromWallet(scanRecord.getFofoId(), sio.getAmount(),
+                    walletService.rollbackAmountFromWallet(scanRecord.getFofoId(), sio.getAmount(), scanRecord.getOrderId(), WalletReferenceType.SCHEME_OUT, rollbackReason, LocalDateTime.now());
-                            scanRecord.getOrderId(), WalletReferenceType.SCHEME_OUT, rollbackReason,
-                            LocalDateTime.now());
-                    System.out.printf("Amount %f,SchemeId %d,Reason %s\n", sio.getAmount(), sio.getSchemeId(),
+                    System.out.printf("Amount %f,SchemeId %d,Reason %s\n", sio.getAmount(), sio.getSchemeId(), rollbackReason);
-                            rollbackReason);
+                }
+            }
+        }
         // throw new Exception();
+    }
     public void checkfocusedModelInPartnerStock() throws Exception {
-        List<Integer> fofoIds = fofoStoreRepository.selectAll().stream().filter(x -> x.isActive()).map(x -> x.getId())
+        List<Integer> fofoIds = fofoStoreRepository.selectAll().stream().filter(x -> x.isActive()).map(x -> x.getId()).collect(Collectors.toList());
-                .collect(Collectors.toList());
-        Map<Integer, Map<Integer, List<SaholicCIS>>> warehouseItemAvailabilityMap = saholicInventoryService
+        Map<Integer, Map<Integer, List<SaholicCIS>>> warehouseItemAvailabilityMap = saholicInventoryService.getSaholicStock();
-                .getSaholicStock();
         Map<Integer, String> warehouseMap = ProfitMandiConstants.WAREHOUSE_MAP;
         Map<Integer, FofoReportingModel> partnerIdSalesHeadersMap = this.getPartnerIdSalesHeaders();
-        Map<Integer, Map<Integer, List<SaholicPOItem>>> warehousePoItemAvailabilityMap = saholicInventoryService
+        Map<Integer, Map<Integer, List<SaholicPOItem>>> warehousePoItemAvailabilityMap = saholicInventoryService.getSaholicPOItems();
-                .getSaholicPOItems();
         Map<Integer, List<FocusedModelShortageModel>> focusedModelShortageReportMap = new HashMap<>();
         for (Integer fofoId : fofoIds) {
             List<FocusedModelShortageModel> focusedModelShortageList = new ArrayList<>();
             focusedModelShortageReportMap.put(fofoId, focusedModelShortageList);
             CustomRetailer customRetailer = retailerService.getFofoRetailer(fofoId);
             Map<Integer, Integer> processingOrderMap = null;
             Map<Integer, Integer> catalogIdAndQtyMap = null;
             Map<Integer, Integer> grnPendingOrdersMap = null;
-            Map<Integer, Integer> currentInventorySnapshot = currentInventorySnapshotRepository.selectByFofoId(fofoId)
+            Map<Integer, Integer> currentInventorySnapshot = currentInventorySnapshotRepository.selectByFofoId(fofoId).stream().collect(Collectors.toMap(x -> x.getItemId(), x -> x.getAvailability()));
-                    .stream().collect(Collectors.toMap(x -> x.getItemId(), x -> x.getAvailability()));
             if (!currentInventorySnapshot.isEmpty()) {
-                catalogIdAndQtyMap = itemRepository.selectByIds(currentInventorySnapshot.keySet()).stream()
+                catalogIdAndQtyMap = itemRepository.selectByIds(currentInventorySnapshot.keySet()).stream().collect(groupingBy(x -> x.getCatalogItemId(), Collectors.summingInt(x -> currentInventorySnapshot.get(x.getId()))));
-                        .collect(groupingBy(x -> x.getCatalogItemId(),
-                                Collectors.summingInt(x -> currentInventorySnapshot.get(x.getId()))));
+            }
-            Map<Integer, Integer> grnPendingOrders = orderRepository.selectPendingGrnOrders(fofoId).stream()
+            Map<Integer, Integer> grnPendingOrders = orderRepository.selectPendingGrnOrders(fofoId).stream().collect(groupingBy(x -> x.getLineItem().getItemId(), Collectors.summingInt(x -> x.getLineItem().getQuantity())));
-                    .collect(groupingBy(x -> x.getLineItem().getItemId(),
-                            Collectors.summingInt(x -> x.getLineItem().getQuantity())));
             if (!grnPendingOrders.isEmpty()) {
-                grnPendingOrdersMap = itemRepository.selectByIds(grnPendingOrders.keySet()).stream()
+                grnPendingOrdersMap = itemRepository.selectByIds(grnPendingOrders.keySet()).stream().collect(groupingBy(x -> x.getCatalogItemId(), Collectors.summingInt(x -> grnPendingOrders.get(x.getId()))));
-                        .collect(groupingBy(x -> x.getCatalogItemId(),
-                                Collectors.summingInt(x -> grnPendingOrders.get(x.getId()))));
+            }
-            Map<Integer, Integer> processingOrder = orderRepository.selectOrders(fofoId, orderStatusList).stream()
+            Map<Integer, Integer> processingOrder = orderRepository.selectOrders(fofoId, orderStatusList).stream().collect(groupingBy(x -> x.getLineItem().getItemId(), Collectors.summingInt(x -> x.getLineItem().getQuantity())));
-                    .collect(groupingBy(x -> x.getLineItem().getItemId(),
-                            Collectors.summingInt(x -> x.getLineItem().getQuantity())));
             if (!processingOrder.isEmpty()) {
-                processingOrderMap = itemRepository.selectByIds(processingOrder.keySet()).stream()
+                processingOrderMap = itemRepository.selectByIds(processingOrder.keySet()).stream().collect(groupingBy(x -> x.getCatalogItemId(), Collectors.summingInt(x -> processingOrder.get(x.getId()))));
-                        .collect(groupingBy(x -> x.getCatalogItemId(),
-                                Collectors.summingInt(x -> processingOrder.get(x.getId()))));
+            }
-            List<String> brands = mongoClient.getMongoBrands(fofoId, null, 3).stream().map(x -> (String) x.get("name"))
+            List<String> brands = mongoClient.getMongoBrands(fofoId, null, 3).stream().map(x -> (String) x.get("name")).collect(Collectors.toList());
-                    .collect(Collectors.toList());
-            List<Integer> regionIds = partnerRegionRepository.selectByfofoId(fofoId).stream().map(x -> x.getRegionId())
+            List<Integer> regionIds = partnerRegionRepository.selectByfofoId(fofoId).stream().map(x -> x.getRegionId()).collect(Collectors.toList());
-                    .collect(Collectors.toList());
             LOGGER.info("regionIds" + regionIds);
             if (regionIds.size() == 0) {
                 LOGGER.info("No region found for partner {}", fofoId);
                 continue;
+            }
-            Map<Integer, Optional<Integer>> focusedCatalogIdAndQtyMap = focusedModelRepository
+            Map<Integer, Optional<Integer>> focusedCatalogIdAndQtyMap = focusedModelRepository.selectAllByRegionIds(regionIds).stream().collect(groupingBy(FocusedModel::getCatalogId, mapping(FocusedModel::getObsMinimumQty, Collectors.maxBy(Integer::compareTo))));
-                    .selectAllByRegionIds(regionIds).stream().collect(groupingBy(FocusedModel::getCatalogId,
-                            mapping(FocusedModel::getObsMinimumQty, Collectors.maxBy(Integer::compareTo))));
             LOGGER.info("focusedCatalogIdAndQtyMap" + focusedCatalogIdAndQtyMap);
             for (Map.Entry<Integer, Optional<Integer>> entry : focusedCatalogIdAndQtyMap.entrySet()) {
                 int minQty = entry.getValue().get();
                 int processingQty = 0;
                 int grnPendingQty = 0;
                 int allColorNetAvailability = 0;
                 int allColorPoAvailability = 0;
                 if (processingOrderMap != null) {
-                    processingQty = (processingOrderMap.get(entry.getKey()) == null) ? 0
+                    processingQty = (processingOrderMap.get(entry.getKey()) == null) ? 0 : processingOrderMap.get(entry.getKey());
-                            : processingOrderMap.get(entry.getKey());
+                }
                 if (grnPendingOrdersMap != null) {
-                    grnPendingQty = (grnPendingOrdersMap.get(entry.getKey()) == null) ? 0
+                    grnPendingQty = (grnPendingOrdersMap.get(entry.getKey()) == null) ? 0 : grnPendingOrdersMap.get(entry.getKey());
-                            : grnPendingOrdersMap.get(entry.getKey());
+                }
                 if (catalogIdAndQtyMap != null) {
-                    inStockQty = (catalogIdAndQtyMap.get(entry.getKey()) == null) ? 0
+                    inStockQty = (catalogIdAndQtyMap.get(entry.getKey()) == null) ? 0 : catalogIdAndQtyMap.get(entry.getKey());
-                            : catalogIdAndQtyMap.get(entry.getKey());
+                }
                 int grnStockQty = grnPendingQty + inStockQty;
                 int totalQty = processingQty + grnPendingQty + inStockQty;
                 TagListing tagListing = tagListingRepository.selectByCatalogId(entry.getKey());
                 FofoStore fofoStore = fofoStoreRepository.selectByRetailerId(fofoId);
-                Map<Integer, List<SaholicCIS>> itemAvailabilityMap = warehouseItemAvailabilityMap
+                Map<Integer, List<SaholicCIS>> itemAvailabilityMap = warehouseItemAvailabilityMap.get(fofoStore.getWarehouseId());
-                        .get(fofoStore.getWarehouseId());
-                Map<Integer, List<SaholicPOItem>> poItemAvailabilityMap = warehousePoItemAvailabilityMap
+                Map<Integer, List<SaholicPOItem>> poItemAvailabilityMap = warehousePoItemAvailabilityMap.get(fofoStore.getWarehouseId());
-                        .get(fofoStore.getWarehouseId());
                 for (Item item : items) {
                     List<SaholicCIS> currentAvailability = null;
                     List<SaholicPOItem> poItemAvailability = null;
                     if (itemAvailabilityMap != null) {
                     if (poItemAvailabilityMap != null) {
                         poItemAvailability = poItemAvailabilityMap.get(item.getId());
+                    }
                     if (currentAvailability != null) {
-                        allColorNetAvailability += currentAvailability.stream()
-                                .collect(Collectors.summingInt(SaholicCIS::getNetavailability));
+                        allColorNetAvailability += currentAvailability.stream().collect(Collectors.summingInt(SaholicCIS::getNetavailability));
+                    }
                     if (poItemAvailability != null) {
-                        allColorPoAvailability += poItemAvailability.stream()
-                                .collect(Collectors.summingInt(SaholicPOItem::getUnfulfilledQty));
+                        allColorPoAvailability += poItemAvailability.stream().collect(Collectors.summingInt(SaholicPOItem::getUnfulfilledQty));
+                    }
+                }
                 FocusedModelShortageModel fm = new FocusedModelShortageModel();
                     if (y.getValue().contains(x.getKey())) {
                         if (!emailRowsMap.containsKey(y.getKey())) {
                             emailRowsMap.put(y.getKey(), new ArrayList<>());
+                        }
-                        List<List<? extends Serializable>> fms = x.getValue().stream()
+                        List<List<? extends Serializable>> fms = x.getValue().stream().map(r -> Arrays.asList(r.getStoreCode(), r.getStoreName(), r.getBrandName(), r.getModelName(), r.getModelNumber(), r.getDp(), r.getWarehouseName(), r.getStateManager(), r.getTerritoryManager(), r.getPendingIndentQty(), r.getGrnStockQty(), r.getShortageQty(), r.getAvailability())).collect(Collectors.toList());
-                                .map(r -> Arrays.asList(r.getStoreCode(), r.getStoreName(), r.getBrandName(),
-                                        r.getModelName(), r.getModelNumber(), r.getDp(), r.getWarehouseName(),
-                                        r.getStateManager(), r.getTerritoryManager(), r.getPendingIndentQty(),
-                                        r.getGrnStockQty(), r.getShortageQty(), r.getAvailability()))
-                                .collect(Collectors.toList());
                         emailRowsMap.get(y.getKey()).addAll(fms);
+                    }
                 });
             });
-            List<String> headers = Arrays.asList("Store Code", "Store Name", "Brand", "Model Name", "Model Number",
+            List<String> headers = Arrays.asList("Store Code", "Store Name", "Brand", "Model Name", "Model Number", "DP", "Warehouse Name", "State Manager", "Territory Manager", "Pending Indent", "InStock", "Shortage Qty", "Availability");
-                    "DP", "Warehouse Name", "State Manager", "Territory Manager", "Pending Indent", "InStock",
-                    "Shortage Qty", "Availability");
             emailRowsMap.entrySet().forEach(entry -> {
                 ByteArrayOutputStream baos = null;
                 try {
                     baos = FileUtil.getCSVByteStream(headers, entry.getValue());
                 } catch (Exception e2) {
                     e2.printStackTrace();
+                }
                 String[] sendToArray = new String[]{
-                        entry.getKey()
+                        entry.getKey(), "apurve.shrivastava@smartdukaan.com", "puneet.bisht@smartdukaan.com"
                 };
                 try {
-                    Utils.sendMailWithAttachment(googleMailSender, sendToArray, null, "Stock Alert", "PFA", fileName,
+                    Utils.sendMailWithAttachment(googleMailSender, sendToArray, null, "Stock Alert", "PFA", fileName, new ByteArrayResource(baos.toByteArray()));
-                            new ByteArrayResource(baos.toByteArray()));
                 } catch (Exception e1) { // TODO Auto-generated catch block
                     e1.printStackTrace();
+                }
             });
+    }
     private String getMessage(List<FocusedModelShortageModel> focusedModelShortageModel) {
         StringBuilder sb = new StringBuilder();
-        sb.append("<html><body><p>Alert</p><p>Focused Model Shortage in Your Stock:-</p>"
+        sb.append("<html><body><p>Alert</p><p>Focused Model Shortage in Your Stock:-</p>" + "<br/><table style='border:1px solid black ;padding: 5px';>");
-                + "<br/><table style='border:1px solid black ;padding: 5px';>");
-        sb.append("<tbody>\n" + "	    				<tr>\n"
-                + "	    					<th style='border:1px solid black;padding: 5px'>Item</th>\n"
-                + "	    					<th style='border:1px solid black;padding: 5px'>Shortage Qty</th>\n"
+        sb.append("<tbody>\n" + "	    				<tr>\n" + "	    					<th style='border:1px solid black;padding: 5px'>Item</th>\n" + "	    					<th style='border:1px solid black;padding: 5px'>Shortage Qty</th>\n" + "	    				</tr>");
-                + "	    				</tr>");
         for (FocusedModelShortageModel entry : focusedModelShortageModel) {
             sb.append("<tr>");
             sb.append("<td style='border:1px solid black;padding: 5px'>" + entry.getItemName() + "</td>");
         return sb.toString();
+    }
     public void notifyLead() throws Exception {
-        List<Lead> leadsToNotify = leadRepository.selectLeadsScheduledBetweenDate(null,
+        List<Lead> leadsToNotify = leadRepository.selectLeadsScheduledBetweenDate(null, LocalDateTime.now().minusDays(15), LocalDateTime.now().plusHours(4));
-                LocalDateTime.now().minusDays(15), LocalDateTime.now().plusHours(4));
-        Map<Integer, String> authUserEmailMap = authRepository.selectAllActiveUser().stream()
+        Map<Integer, String> authUserEmailMap = authRepository.selectAllActiveUser().stream().collect(Collectors.toMap(x -> x.getId(), x -> x.getEmailId()));
-                .collect(Collectors.toMap(x -> x.getId(), x -> x.getEmailId()));
         LOGGER.info("authUserEmailMap {}", authUserEmailMap);
-        Map<String, Integer> dtrEmailMap = dtrUserRepository
-                .selectAllByEmailIds(new ArrayList<>(authUserEmailMap.values())).stream()
+        Map<String, Integer> dtrEmailMap = dtrUserRepository.selectAllByEmailIds(new ArrayList<>(authUserEmailMap.values())).stream().collect(Collectors.toMap(x -> x.getEmailId(), x -> x.getId()));
-                .collect(Collectors.toMap(x -> x.getEmailId(), x -> x.getId()));
         LOGGER.info("dtrEmailMap {}", dtrEmailMap);
         Map<Integer, Integer> authUserKeyMap = new HashMap<>();
             if (authUserKeyMap.get(lead.getAssignTo()) == null) {
                 LOGGER.info("Assignee no longer part of system {}", lead.getAssignTo());
                 continue;
+            }
             String title = "Leads followup Reminder";
-            String notificationMessage = String.format(templateMessage, lead.getFirstName(), lead.getLastName(),
-                    lead.getAddress(), lead.getLeadMobile(), leadTimeFormatter.format(lead.getScheduledTimestamp()));
+            String notificationMessage = String.format(templateMessage, lead.getFirstName(), lead.getLastName(), lead.getAddress(), lead.getLeadMobile(), leadTimeFormatter.format(lead.getScheduledTimestamp()));
             String url = "https://app.smartdukaan.com/pages/home/leadUpdate?leadId=" + lead.getId();
             SendNotificationModel sendNotificationModel = new SendNotificationModel();
             sendNotificationModel.setCampaignName("Lead Reminder");
             sendNotificationModel.setTitle(title);
             sendNotificationModel.setMessage(notificationMessage);
             // authUser.getMobileNumber());
+        }
+    }
     public void notifyVisits() throws Exception {
-        List<FranchiseeVisit> franchiseeVisits = franchiseeVisitRepository
-                .selectVisitsScheduledBetweenDate(LocalDateTime.now().minusDays(15), LocalDateTime.now().plusHours(4));
+        List<FranchiseeVisit> franchiseeVisits = franchiseeVisitRepository.selectVisitsScheduledBetweenDate(LocalDateTime.now().minusDays(15), LocalDateTime.now().plusHours(4));
-        Map<Integer, String> authUserEmailMap = authRepository.selectAllActiveUser().stream()
+        Map<Integer, String> authUserEmailMap = authRepository.selectAllActiveUser().stream().collect(Collectors.toMap(x -> x.getId(), x -> x.getEmailId()));
-                .collect(Collectors.toMap(x -> x.getId(), x -> x.getEmailId()));
-        Map<String, Integer> dtrEmailMap = dtrUserRepository
-                .selectAllByEmailIds(new ArrayList<>(authUserEmailMap.values())).stream()
+        Map<String, Integer> dtrEmailMap = dtrUserRepository.selectAllByEmailIds(new ArrayList<>(authUserEmailMap.values())).stream().collect(Collectors.toMap(x -> x.getEmailId(), x -> x.getId()));
-                .collect(Collectors.toMap(x -> x.getEmailId(), x -> x.getId()));
         Map<Integer, Integer> authUserKeyMap = new HashMap<>();
         for (Map.Entry<Integer, String> authUserEmail : authUserEmailMap.entrySet()) {
             int authId = authUserEmail.getKey();
             String email = authUserEmail.getValue();
                 continue;
+            }
             SendNotificationModel sendNotificationModel = new SendNotificationModel();
             String message = null;
             if (visit.getFranchiseActivityId() == 0) {
-                message = String.format(visitTemplate, visit.getPartnerName(),
+                message = String.format(visitTemplate, visit.getPartnerName(), timeFormatter.format(visit.getScheduleTimestamp()));
-                        timeFormatter.format(visit.getScheduleTimestamp()));
                 sendNotificationModel.setCampaignName("Franchisee visit Reminder");
             } else {
-                message = String.format(followupTemplate, visit.getPartnerName(),
+                message = String.format(followupTemplate, visit.getPartnerName(), timeFormatter.format(visit.getScheduleTimestamp()));
-                        timeFormatter.format(visit.getScheduleTimestamp()));
                 sendNotificationModel.setCampaignName("Franchisee followup Reminder");
+            }
             sendNotificationModel.setMessage(message);
             sendNotificationModel.setType("url");
             sendNotificationModel.setUrl("https://app.smartdukaan.com/pages/home/notifications");
+        }
+    }
     private String getMessageForReferral(List<Refferal> referrals) {
         StringBuilder sb = new StringBuilder();
-        sb.append("<html><body><p>Alert</p><p>Pending Referrals:-</p>"
-                + "<br/><table style='border:1px solid black ;padding: 5px';>");
+        sb.append("<html><body><p>Alert</p><p>Pending Referrals:-</p>" + "<br/><table style='border:1px solid black ;padding: 5px';>");
-        sb.append("<tbody>\n" + "	    				<tr>\n"
-                + "	    					<th style='border:1px solid black;padding: 5px'>RefereeName</th>\n"
-                + "	    					<th style='border:1px solid black;padding: 5px'>Referee Email</th>\n"
-                + "	    					<th style='border:1px solid black;padding: 5px'>Referral Name</th>\n"
-                + "	    					<th style='border:1px solid black;padding: 5px'>Refferal Mobile</th>\n"
+        sb.append("<tbody>\n" + "	    				<tr>\n" + "	    					<th style='border:1px solid black;padding: 5px'>RefereeName</th>\n" + "	    					<th style='border:1px solid black;padding: 5px'>Referee Email</th>\n" + "	    					<th style='border:1px solid black;padding: 5px'>Referral Name</th>\n" + "	    					<th style='border:1px solid black;padding: 5px'>Refferal Mobile</th>\n" + "	    					<th style='border:1px solid black;padding: 5px'>city</th>\n" + "	    					<th style='border:1px solid black;padding: 5px'>state</th>\n" + "	    				</tr>");
-                + "	    					<th style='border:1px solid black;padding: 5px'>city</th>\n"
-                + "	    					<th style='border:1px solid black;padding: 5px'>state</th>\n"
-                + "	    				</tr>");
         for (Refferal entry : referrals) {
             sb.append("<tr>");
             sb.append("<td style='border:1px solid black;padding: 5px'>" + entry.getRefereeName() + "</td>");
         sb.append("</tbody></table></body></html>");
         return sb.toString();
+    }
-    private String getMessageForUncontacblePartner(List<PartnerCollectionRemark> pcrs)
+    private String getMessageForUncontacblePartner(List<PartnerCollectionRemark> pcrs) throws ProfitMandiBusinessException {
-            throws ProfitMandiBusinessException {
         StringBuilder sb = new StringBuilder();
-        sb.append("<html><body><p>Alert</p><p>Not Responding Partner:-</p>"
-                + "<br/><table style='border:1px solid black ;padding: 5px';>");
+        sb.append("<html><body><p>Alert</p><p>Not Responding Partner:-</p>" + "<br/><table style='border:1px solid black ;padding: 5px';>");
-        sb.append("<tbody>\n" + "	    				<tr>\n"
-                + "	    					<th style='border:1px solid black;padding: 5px'>PartnerName</th>\n"
+        sb.append("<tbody>\n" + "	    				<tr>\n" + "	    					<th style='border:1px solid black;padding: 5px'>PartnerName</th>\n" + "	    					<th style='border:1px solid black;padding: 5px'>from</th>\n"
-                + "	    					<th style='border:1px solid black;padding: 5px'>from</th>\n"
                 + "	    				</tr>");
         for (PartnerCollectionRemark entry : pcrs) {
             CustomRetailer customRetailer = retailerService.getFofoRetailer(entry.getFofoId());
             sb.append("<tr>");
-            sb.append("<td style='border:1px solid black;padding: 5px'>" + customRetailer.getBusinessName() + "("
+            sb.append("<td style='border:1px solid black;padding: 5px'>" + customRetailer.getBusinessName() + "(" + customRetailer.getCode() + ")" + "</td>");
-                    + customRetailer.getCode() + ")" + "</td>");
-            sb.append("<td style='border:1px solid black;padding: 5px'>"
-                    + entry.getCreateTimestamp().format(DateTimeFormatter.ofPattern("dd/MM/yyyy")) + "</td>");
+            sb.append("<td style='border:1px solid black;padding: 5px'>" + entry.getCreateTimestamp().format(DateTimeFormatter.ofPattern("dd/MM/yyyy")) + "</td>");
             sb.append("</tr>");
+        }
         return sb.toString();
+    }
     public void reverseWallet() throws Exception {
         LocalDate localDate = LocalDate.of(2020, 10, 28);
-        List<UserWalletHistory> uwhList = userWalletHistoryRepository.selectAllByDateType(localDate.atStartOfDay(),
+        List<UserWalletHistory> uwhList = userWalletHistoryRepository.selectAllByDateType(localDate.atStartOfDay(), localDate.plusDays(1).atStartOfDay(), Arrays.asList(WalletReferenceType.SCHEME_IN, WalletReferenceType.SCHEME_OUT));
-                localDate.plusDays(1).atStartOfDay(),
-                Arrays.asList(WalletReferenceType.SCHEME_IN, WalletReferenceType.SCHEME_OUT));
         for (UserWalletHistory uwh : uwhList) {
             if (uwh.getBusinessTimestamp().getMonth().equals(Month.SEPTEMBER)) {
                 UserWallet uw = userWalletRepository.selectById(uwh.getWalletId());
                 // LOGGER.info("UWH - {}", uwh);
                 // amount += uwh.getAmount();
     public void partnerProblemAlert() throws Exception {
         LocalDateTime curDate = LocalDate.now().atStartOfDay();
         Map<Integer, Double> lmtdSale = fofoOrderItemRepository.selectSumMopGroupByRetailer(
                 curDate.withDayOfMonth(1).minusMonths(1), curDate.with(LocalTime.MAX).minusMonths(1), 0, false);
-        Map<Integer, Double> mtdSales = fofoOrderItemRepository.selectSumMopGroupByRetailer(curDate.withDayOfMonth(1),
+        Map<Integer, Double> mtdSales = fofoOrderItemRepository.selectSumMopGroupByRetailer(curDate.withDayOfMonth(1), curDate.with(LocalTime.MAX), 0, false);
-                curDate.with(LocalTime.MAX), 0, false);
-        Map<Integer, PartnerDailyInvestment> pdi = partnerDailyInvestmentRepository.selectAll(LocalDate.now()).stream()
+        Map<Integer, PartnerDailyInvestment> pdi = partnerDailyInvestmentRepository.selectAll(LocalDate.now()).stream().collect(Collectors.toMap(x -> x.getFofoId(), x -> x));
-                .collect(Collectors.toMap(x -> x.getFofoId(), x -> x));
         for (Entry<Integer, Double> ls : lmtdSale.entrySet()) {
             double lmtdTwentyPercentSale = ls.getValue() * 0.2;
             double mtdSale = mtdSales.get(ls.getKey()) == null ? 0 : mtdSales.get(ls.getKey());
             LOGGER.info("mtdSale" + mtdSale);
-            double totalSixtyPercentInvestment = pdi.get(ls.getKey()) == null ? 0
+            double totalSixtyPercentInvestment = pdi.get(ls.getKey()) == null ? 0 : pdi.get(ls.getKey()).getTotalInvestment() * 0.6;
-                    : pdi.get(ls.getKey()).getTotalInvestment() * 0.6;
             LOGGER.info("totalSixtyPercentInvestment" + totalSixtyPercentInvestment);
             double stockInvestment = pdi.get(ls.getKey()) == null ? 0 : pdi.get(ls.getKey()).getInStockAmount();
+            }
+        }
-        List<PartnerProblem> partnerProblems = partnerProblemRepository.selectAll().stream()
-                .filter(x -> x.getMtd() + x.getInvestment() + x.getStockInvestment() > 0).collect(Collectors.toList());
+        List<PartnerProblem> partnerProblems = partnerProblemRepository.selectAll().stream().filter(x -> x.getMtd() + x.getInvestment() + x.getStockInvestment() > 0).collect(Collectors.toList());
         partnerProblems = partnerProblems.stream().sorted((x1, x2) -> {
-            return x1.getMtd() + x1.getInvestment() + x1.getStockInvestment() < x2.getMtd() + x2.getInvestment()
+            return x1.getMtd() + x1.getInvestment() + x1.getStockInvestment() < x2.getMtd() + x2.getInvestment() + x2.getStockInvestment() ? 1 : -1;
-                    + x2.getStockInvestment() ? 1 : -1;
         }).collect(Collectors.toList());
         Map<Integer, PartnerProblem> partnerProblemMap = partnerProblems.stream().sorted((x1, x2) -> {
-            return x1.getMtd() + x1.getInvestment() + x1.getStockInvestment() < x2.getMtd() + x2.getInvestment()
+            return x1.getMtd() + x1.getInvestment() + x1.getStockInvestment() < x2.getMtd() + x2.getInvestment() + x2.getStockInvestment() ? 1 : -1;
-                    + x2.getStockInvestment() ? 1 : -1;
         }).collect(Collectors.toMap(x -> x.getFofoId(), x -> x));
         Map<Integer, CustomRetailer> customRetailers = retailerService.getAllFofoRetailers();
         List<Integer> assignTo = Arrays.asList(15, 9, 54, 53);
-        Map<Integer, AuthUser> assignAuthUserMap = authRepository.selectAllAuthUserByIds(assignTo).stream()
+        Map<Integer, AuthUser> assignAuthUserMap = authRepository.selectAllAuthUserByIds(assignTo).stream().collect(Collectors.toMap(x -> x.getId(), x -> x));
-                .collect(Collectors.toMap(x -> x.getId(), x -> x));
-        List<String> sendTo = Arrays.asList("kamini.sharma@smartdukaan.com", "tarun.verma@smartdukaan.com",
+        List<String> sendTo = Arrays.asList("kamini.sharma@smartdukaan.com", "tarun.verma@smartdukaan.com", "sm@smartdukaan.com");
-                "sm@smartdukaan.com");
         LOGGER.info("partnerProblem" + partnerProblems);
         StringBuilder sb = new StringBuilder();
         sb.append("<htl><body>");
         sb.append(
                 "<p>Number against MTD or Investment are the count of days the MTD is low VS LMTD OR Investment is below 75%.</p><br/><p>These partners needs immediate attention.</p><br/><table style='border:1px solid black';cellspacing=0>");
-        sb.append("<tbody>\n" + "	    <tr>"
-                + "	    					<th style='border:1px solid black;padding: 5px'>Partner Name</th>"
-                + "                         <th style='border:1px solid black;padding: 5px'>Assign TO</th>"
+        sb.append("<tbody>\n" + "	    <tr>" + "	    					<th style='border:1px solid black;padding: 5px'>Partner Name</th>" + "                         <th style='border:1px solid black;padding: 5px'>Assign TO</th>" + "	    					<th style='border:1px solid black;padding: 5px'>Mtd</th>" + "	    					<th style='border:1px solid black;padding: 5px'>Investment</th>" + "	    					<th style='border:1px solid black;padding: 5px'>Stock</th>" + "	    					<th style='border:1px solid black;padding: 5px'>Manager</th>"
-                + "	    					<th style='border:1px solid black;padding: 5px'>Mtd</th>"
-                + "	    					<th style='border:1px solid black;padding: 5px'>Investment</th>"
-                + "	    					<th style='border:1px solid black;padding: 5px'>Stock</th>"
-                + "	    					<th style='border:1px solid black;padding: 5px'>Manager</th>"
                 + "	    				</tr>");
         for (PartnerProblem pp : partnerProblems) {
             int value = pp.getFofoId() % 4;
             Map<EscalationType, AuthUser> authUserMap = csService.getAuthUserAndEsclationByPartnerId(pp.getFofoId());
             LOGGER.info("authUserMap" + authUserMap);
             sb.append("<tr>");
-            sb.append("<td style='border:1px solid black;padding: 5px'>"
-                    + customRetailers.get(pp.getFofoId()).getBusinessName() + "</td>");
+            sb.append("<td style='border:1px solid black;padding: 5px'>" + customRetailers.get(pp.getFofoId()).getBusinessName() + "</td>");
-            sb.append("<td style='border:1px solid black;padding: 5px'>"
-                    + assignAuthUserMap.get(assignTo.get(value)).getName() + "</td>");
+            sb.append("<td style='border:1px solid black;padding: 5px'>" + assignAuthUserMap.get(assignTo.get(value)).getName() + "</td>");
             sb.append("<td style='border:1px solid black;padding: 5px'>" + pp.getMtd() + "</td>");
             sb.append("<td style='border:1px solid black;padding: 5px'>" + pp.getInvestment() + "</td>");
             sb.append("<td style='border:1px solid black;padding: 5px'>" + pp.getStockInvestment() + "</td>");
-            sb.append("<td style='border:1px solid black;padding: 5px'>"
+            sb.append("<td style='border:1px solid black;padding: 5px'>" + (authUserMap.get(EscalationType.L1) == null ? "N/A" : authUserMap.get(EscalationType.L1).getFirstName()) + " ," + (authUserMap.get(EscalationType.L2) == null ? "N/A" : authUserMap.get(EscalationType.L2).getFirstName()) + "</td>");
-                    + (authUserMap.get(EscalationType.L1) == null ? "N/A"
-                    : authUserMap.get(EscalationType.L1).getFirstName())
-                    + " ," + (authUserMap.get(EscalationType.L2) == null ? "N/A"
-                    : authUserMap.get(EscalationType.L2).getFirstName())
-                    + "</td>");
             sb.append("</tr>");
+        }
         sb.append("</tbody></table><br><br>");
         String subject = "Partner Problem Alert!";
                     StringBuilder sbbuilder = new StringBuilder();
                     sbbuilder.append("<hml><body>");
                     sb.append(
                             "<p>Number against MTD or Investment are the count of days the MTD is low VS LMTD OR Investment is below 75%.</p><br/><p>These partners needs immediate attention.</p><br/><table style='border:1px solid black';cellspacing=0>");
-                    sbbuilder.append("<tbody>\n" + "	    <tr>"
-                            + "	    					<th style='border:1px solid black;padding: 5px'>Partner Name</th>"
-                            + "	    					<th style='border:1px solid black;padding: 5px'>Mtd</th>"
-                            + "	    					<th style='border:1px solid black;padding: 5px'>Investment</th>"
+                    sbbuilder.append("<tbody>\n" + "	    <tr>" + "	    					<th style='border:1px solid black;padding: 5px'>Partner Name</th>" + "	    					<th style='border:1px solid black;padding: 5px'>Mtd</th>" + "	    					<th style='border:1px solid black;padding: 5px'>Investment</th>" + "	    					<th style='border:1px solid black;padding: 5px'>Stock</th>"
-                            + "	    					<th style='border:1px solid black;padding: 5px'>Stock</th>"
                             + "	    				</tr>");
                     for (Integer partnerId : authUserPartner.getValue()) {
                         if (partnerProblemMap.get(partnerId) != null) {
                             PartnerProblem pp = partnerProblemMap.get(partnerId);
                             sbbuilder.append("<tr>");
-                            sbbuilder.append("<td style='border:1px solid black;padding: 5px'>"
-                                    + customRetailers.get(pp.getFofoId()).getBusinessName() + "</td>");
+                            sbbuilder.append("<td style='border:1px solid black;padding: 5px'>" + customRetailers.get(pp.getFofoId()).getBusinessName() + "</td>");
-                            sbbuilder
-                                    .append("<td style='border:1px solid black;padding: 5px'>" + pp.getMtd() + "</td>");
+                            sbbuilder.append("<td style='border:1px solid black;padding: 5px'>" + pp.getMtd() + "</td>");
                             sbbuilder.append(
                                     "<td style='border:1px solid black;padding: 5px'>" + pp.getInvestment() + "</td>");
-                            sbbuilder.append("<td style='border:1px solid black;padding: 5px'>"
+                            sbbuilder.append("<td style='border:1px solid black;padding: 5px'>" + pp.getStockInvestment() + "</td>");
-                                    + pp.getStockInvestment() + "</td>");
                             sbbuilder.append("</tr>");
+                        }
+                    }
+            }
+        }
+    }
-    private void sendMailHtmlFormat(String email[], String body, String cc[], String subject)
+    private void sendMailHtmlFormat(String email[], String body, String cc[], String subject) throws MessagingException, ProfitMandiBusinessException, IOException {
-            throws MessagingException, ProfitMandiBusinessException, IOException {
         MimeMessage message = mailSender.createMimeMessage();
         MimeMessageHelper helper = new MimeMessageHelper(message);
         helper.setSubject(subject);
         helper.setText(body, true);
         helper.setTo(email);
             e.printStackTrace();
+        }
+    }
-    public void selectFinServiceFollowUpDateByCurrDate(LocalDate currentDate)
-            throws MessagingException, ProfitMandiBusinessException, IOException {
+    public void selectFinServiceFollowUpDateByCurrDate(LocalDate currentDate) throws MessagingException, ProfitMandiBusinessException, IOException {
         LOGGER.info("selectfinServiceFollow - {}", "selectfinServiceFollowUpDateByCurrDate");
         serviceConfigService.selectFinServicePartnerfollowUpDateByCurrentDate(currentDate);
+    }
     public void checkCancellationMargin() throws Exception {
         LocalDateTime startDate = LocalDate.of(2021, 4, 1).atStartOfDay();
         List<FofoOrder> fofoOrders = fofoOrderRepository.selectCancelledBetweenSaleDate(startDate, LocalDateTime.now());
         LOGGER.info("Total Orders =  {}", fofoOrders.size());
         for (FofoOrder fofoOrder : fofoOrders) {
-            List<UserWalletHistory> history = userWalletHistoryRepository
-                    .selectAllByreferenceIdandreferenceType(fofoOrder.getId(), WalletReferenceType.SCHEME_OUT);
+            List<UserWalletHistory> history = userWalletHistoryRepository.selectAllByreferenceIdandreferenceType(fofoOrder.getId(), WalletReferenceType.SCHEME_OUT);
-            history.addAll(userWalletHistoryRepository.selectAllByreferenceIdandreferenceType(fofoOrder.getId(),
+            history.addAll(userWalletHistoryRepository.selectAllByreferenceIdandreferenceType(fofoOrder.getId(), WalletReferenceType.ACTIVATION_SCHEME));
-                    WalletReferenceType.ACTIVATION_SCHEME));
             int walletSum = history.stream().mapToInt(x -> x.getAmount()).sum();
             if (Math.abs(walletSum) > 1) {
                 // LOGGER.info("Cancelled invoice {}, Order Id = {}, = havent rolledback, Value
                 // = {}", fofoOrder.getInvoiceNumber(), fofoOrder.getId(), walletSum);
                 List<FofoOrderItem> fofoOrderItems = fofoOrderItemRepository.selectByOrderId(fofoOrder.getId());
                 List<FofoLineItem> flis = fofoLineItemRepository.selectByFofoOrderItemId(fofoOrderItems.get(0).getId());
                 FofoLineItem fli = flis.get(0);
                 if (StringUtils.isEmpty(fli.getSerialNumber()))
                     continue;
-                List<SchemeInOut> schemeInOuts = schemeInOutRepository
-                        .selectByInventoryItemIds(new HashSet<>(Arrays.asList(fli.getInventoryItemId())));
+                List<SchemeInOut> schemeInOuts = schemeInOutRepository.selectByInventoryItemIds(new HashSet<>(Arrays.asList(fli.getInventoryItemId())));
                 InventoryItem inventoryItem = inventoryItemRepository.selectById(fli.getInventoryItemId());
-                double schemeSum = schemeInOuts.stream().filter(x -> x.getRolledBackTimestamp() == null)
+                double schemeSum = schemeInOuts.stream().filter(x -> x.getRolledBackTimestamp() == null).mapToDouble(x -> x.getAmount()).sum();
-                        .mapToDouble(x -> x.getAmount()).sum();
                 /*
                  * if(inventoryItem.getGoodQuantity()==1) {
                  * LOGGER.info("GoodQty, Serial Number {}, InventoryItem = {}, Billed on {}",
                  * inventoryItem.getSerialNumber(), inventoryItem.getId(),
                  * inventoryItem.getUpdateTimestamp()); } else
                  * (inventoryItem.getLastScanType().equals(ScanType.SALE)) { LOGGER.
                  * info("Problem Sold, Serial Number {}, InventoryItem = {}, Billed on {}",
                  * inventoryItem.getSerialNumber(), inventoryItem.getId(),
                  * inventoryItem.getUpdateTimestamp()); }
                  */
-                if (inventoryItem.getLastScanType().equals(ScanType.SALE)
-                        || inventoryItem.getLastScanType().equals(ScanType.SALE_RET)) {
+                if (inventoryItem.getLastScanType().equals(ScanType.SALE) || inventoryItem.getLastScanType().equals(ScanType.SALE_RET)) {
-                    Map<String, Double> map = schemeInOuts.stream()
+                    Map<String, Double> map = schemeInOuts.stream().collect(
-                            .collect(
-                                    groupingBy(
+                            groupingBy(
-                                            x -> DateTimeFormatter.ofPattern("yyyyMMddHH")
-                                                    .format(x.getCreateTimestamp()) + "- " + x.getSchemeId(),
+                                    x -> DateTimeFormatter.ofPattern("yyyyMMddHH").format(x.getCreateTimestamp()) + "- " + x.getSchemeId(), Collectors.summingDouble(x -> x.getAmount())));
-                                            Collectors.summingDouble(x -> x.getAmount())));
                     for (Map.Entry<String, Double> entry : map.entrySet()) {
                         LOGGER.info("{} = {}", entry.getKey(), entry.getValue());
+                    }
-                    LOGGER.info("id- {}, imei- {}, lastScan = {}, Scheme sum - {}", inventoryItem.getId(),
+                    LOGGER.info("id- {}, imei- {}, lastScan = {}, Scheme sum - {}", inventoryItem.getId(), inventoryItem.getSerialNumber(), inventoryItem.getLastScanType(), schemeSum);
-                            inventoryItem.getSerialNumber(), inventoryItem.getLastScanType(), schemeSum);
+                }
+            }
+        }
+    }
         data = new String(Files.readAllBytes(Paths.get(file)));
         return data;
+    }
     public void markDelhiveryOrderDelivered() throws ProfitMandiBusinessException, IOException {
-        List<Order> orders = orderRepository.selectOrderByProviderIdAndStatus(ProfitMandiConstants.DELHIVERY_PROVIDERID,
+        List<Order> orders = orderRepository.selectOrderByProviderIdAndStatus(ProfitMandiConstants.DELHIVERY_PROVIDERID, OrderStatus.SHIPPED_FROM_WH);
-                OrderStatus.SHIPPED_FROM_WH);
         if (!orders.isEmpty()) {
             Set<String> airwayBill = orders.stream().map(x -> x.getAirwayBillNumber()).collect(Collectors.toSet());
             int arraylength = airwayBill.size();
             LOGGER.info("airwayBill" + airwayBill);
             String url = "https://track.delhivery.com/api/v1/packages/json/";
             OkHttpClient client = new OkHttpClient();
-            Request request1 = new Request.Builder()
-                    .url(url + "?waybill=" + String.join(",", airwayBill) + "&token=" + token).get().build();
+            Request request1 = new Request.Builder().url(url + "?waybill=" + String.join(",", airwayBill) + "&token=" + token).get().build();
             LOGGER.info("request1" + request1);
             Response response = client.newCall(request1).execute();
         String loginId = "DEL81122";
         String licencekey = "uhfhlg2jpmnqfhfrlsgzfr1nhu1qfvel";
-        List<Order> orders = orderRepository.selectOrderByProviderIdAndStatus(ProfitMandiConstants.BLUEDART_PROVIDERID,
+        List<Order> orders = orderRepository.selectOrderByProviderIdAndStatus(ProfitMandiConstants.BLUEDART_PROVIDERID, OrderStatus.SHIPPED_FROM_WH);
-                OrderStatus.SHIPPED_FROM_WH);
         if (!orders.isEmpty()) {
             Set<String> airwayBillNo = orders.stream().map(x -> x.getAirwayBillNumber()).collect(Collectors.toSet());
             LOGGER.info("airwayBill" + airwayBillNo);
             String url = "https://api.bluedart.com/servlet/RoutingServlet?handler=tnt&action=custawbquery";
-            String response = restClient.get(url + "&loginid=" + loginId + "&awb=awb&numbers="
-                            + String.join(",", airwayBillNo) + "&format=xml&lickey=" + licencekey + "&verno=1.3&scan=1", null,
+            String response = restClient.get(url + "&loginid=" + loginId + "&awb=awb&numbers=" + String.join(",", airwayBillNo) + "&format=xml&lickey=" + licencekey + "&verno=1.3&scan=1", null, null);
-                    null);
             JSONObject updateJson = XML.toJSONObject(response);
             JSONObject shipmentData = updateJson.getJSONObject("ShipmentData");
             Object shipmentObject = shipmentData.get("Shipment");
             markOrderDelivered(airwaybillStatus);
+        }
+    }
-    private void markOrderDelivered(Set<String> airwaybillStatus)
-            throws ProfitMandiBusinessException, HttpHostConnectException {
+    private void markOrderDelivered(Set<String> airwaybillStatus) throws ProfitMandiBusinessException, HttpHostConnectException {
         if (!airwaybillStatus.isEmpty()) {
             for (String aws : airwaybillStatus) {
                 List<Order> deliverdOrders = orderRepository.selectByAirwayBillNumber(aws);
                 Address address = addressRepository.selectById(user.getAddressId());
                 String title = "Order Delivered";
-                String message = String.format("Dear partner, Your SmartDukaan Order " + aws
+                String message = String.format("Dear partner, Your SmartDukaan Order " + aws + " has been delivered to you in a safe sealed bag.");
-                        + " has been delivered to you in a safe sealed bag.");
                 SendNotificationModel sendNotificationModel = new SendNotificationModel();
                 sendNotificationModel.setCampaignName("Order Delivered");
                 sendNotificationModel.setTitle(title);
                 sendNotificationModel.setMessage(message);
             if (fs.getPan() != null) {
                 AccountStatusResponseOut accountStatusResponseOut = mandiiService.getStatus(fs.getPan());
                 LOGGER.info("accountStatusResponseOut" + accountStatusResponseOut);
-                CreditAccount creditAccount = creditAccountRepository.selectByFofoIdAndGateway(fs.getId(),
+                CreditAccount creditAccount = creditAccountRepository.selectByFofoIdAndGateway(fs.getId(), Gateway.MANDII);
-                        Gateway.MANDII);
                 if (creditAccount == null) {
                     creditAccount = new CreditAccount();
+    }
     @Autowired
     private PartnerCollectionRemarkRepository partnerCollectionRemarkRepository;
-    public void reviewUncontactablePartner()
-            throws ProfitMandiBusinessException, MessagingException, UnsupportedEncodingException {
+    public void reviewUncontactablePartner() throws ProfitMandiBusinessException, MessagingException, UnsupportedEncodingException {
         Map<Integer, CustomRetailer> customRetailerMap = retailerService.getFofoRetailers(true);
-        List<Integer> pcrms = partnerCollectionRemarkRepository
-                .selectMaxRemarkId(new ArrayList<>(customRetailerMap.keySet()));
+        List<Integer> pcrms = partnerCollectionRemarkRepository.selectMaxRemarkId(new ArrayList<>(customRetailerMap.keySet()));
         if (!pcrms.isEmpty()) {
-            Map<Integer, PartnerCollectionRemark> partnerCollectionRemarksMap = partnerCollectionRemarkRepository
+            Map<Integer, PartnerCollectionRemark> partnerCollectionRemarksMap = partnerCollectionRemarkRepository.selectByIds(pcrms).stream().filter(x -> x.getRemark().equals(CollectionRemark.NOT_RESPONDING)).collect(Collectors.toMap(x -> x.getFofoId(), x -> x));
-                    .selectByIds(pcrms).stream().filter(x -> x.getRemark().equals(CollectionRemark.NOT_RESPONDING))
-                    .collect(Collectors.toMap(x -> x.getFofoId(), x -> x));
             if (!partnerCollectionRemarksMap.isEmpty()) {
-                for (Map.Entry<String, Set<Integer>> storeGuyEntry : csService.getAuthUserPartnerIdMapping()
+                for (Map.Entry<String, Set<Integer>> storeGuyEntry : csService.getAuthUserPartnerIdMapping().entrySet()) {
-                        .entrySet()) {
-                    List<PartnerCollectionRemark> filteredRows = storeGuyEntry.getValue().stream()
+                    List<PartnerCollectionRemark> filteredRows = storeGuyEntry.getValue().stream().map(x -> partnerCollectionRemarksMap.get(x)).filter(x -> x != null).collect(Collectors.toList());
-                            .map(x -> partnerCollectionRemarksMap.get(x)).filter(x -> x != null)
-                            .collect(Collectors.toList());
                     String subject = "UNCONTACTABLE PARTNERS";
                     String messageText = this.getMessageForUncontacblePartner(filteredRows);
                     MimeMessage message = mailSender.createMimeMessage();
                     MimeMessageHelper helper = new MimeMessageHelper(message, true);
                     String[] email = new String[]{storeGuyEntry.getKey()};
                     helper.setSubject(subject);
                     helper.setText(messageText, true);
                     helper.setTo(email);
-                    InternetAddress senderAddress = new InternetAddress("noreply@smartdukaan.com",
+                    InternetAddress senderAddress = new InternetAddress("noreply@smartdukaan.com", "Smartdukaan Alerts");
-                            "Smartdukaan Alerts");
                     helper.setFrom(senderAddress);
                     mailSender.send(message);
                     LOGGER.info("filteredRows {}", filteredRows);
                 if (loan.getFreeDays() > 0) {
                     LocalDateTime freeDaysLimitDate = loan.getCreatedOn().plusDays(loan.getFreeDays() - 1);
                     LOGGER.info("freeDaysLimitDate {}", freeDaysLimitDate);
                     if (LocalDateTime.now().isAfter(freeDaysLimitDate)) {
-                        int loanStatementId = loanStatementRepository.selectLatestLoanSatement(loan.getFofoId(),
+                        int loanStatementId = loanStatementRepository.selectLatestLoanSatement(loan.getFofoId(), loan.getId());
-                                loan.getId());
                         LOGGER.info("loanStatementId {}", loanStatementId);
                         if (loanStatementId != 0) {
                             this.calculateInterest(loan, loanStatusAmount, loanStatementId);
                         } else {
-                            sdCreditService.addInterest(freeDaysLimitDate.toLocalDate(), LocalDate.now(), loan,
+                            sdCreditService.addInterest(freeDaysLimitDate.toLocalDate(), LocalDate.now(), loan, loanStatusAmount);
-                                    loanStatusAmount);
+                        }
+                    }
                 } else {
-                    int loanStatementId = loanStatementRepository.selectLatestLoanSatement(loan.getFofoId(),
+                    int loanStatementId = loanStatementRepository.selectLatestLoanSatement(loan.getFofoId(), loan.getId());
-                            loan.getId());
                     LOGGER.info("loanStatementId2 {}", loanStatementId);
                     this.calculateInterest(loan, loanStatusAmount, loanStatementId);
+                }
     @Autowired
     CCAvenuePaymentService ccAvenuePaymentService;
     public void settleCCAvePayments() throws Exception {
-        List<FofoPayment> fofoPayments = fofoPaymentRepository
-                .selectAllByGatewayStatus(Gateway.CCAVENUE, PaymentStatus.INIT).stream()
-                .filter(x -> x.getCreateTimestamp().isBefore(LocalDateTime.now().minusMinutes(30l)))
+        List<FofoPayment> fofoPayments = fofoPaymentRepository.selectAllByGatewayStatus(Gateway.CCAVENUE, PaymentStatus.INIT).stream().filter(x -> x.getCreateTimestamp().isBefore(LocalDateTime.now().minusMinutes(30l))).collect(Collectors.toList());
-                .collect(Collectors.toList());
         for (FofoPayment fofoPayment : fofoPayments) {
             ccAvenuePaymentService.updatePayment(fofoPayment);
+        }
+    }
      * public void getCCAvenuePendingOrderStatus(int pendingOrderId) { PendingOrder
      * pendingOrder = pendingOrderRepository.selectById(pendingOrderId);
      * ccAvenuePaymentService.getPaymentStatusMap(pendingOrder); }
      */
-    private void calculateInterest(Loan loan, Map<LoanReferenceType, Double> loanStatusAmount, int loanStatementId)
+    private void calculateInterest(Loan loan, Map<LoanReferenceType, Double> loanStatusAmount, int loanStatementId) throws ProfitMandiBusinessException {
-            throws ProfitMandiBusinessException {
         LoanStatement loanStatement = loanStatementRepository.selectById(loanStatementId);
         if (loanStatement.getLoanId() == loan.getId()) {
-            sdCreditService.addInterest(loanStatement.getCreatedAt().toLocalDate(), LocalDate.now(), loan,
+            sdCreditService.addInterest(loanStatement.getCreatedAt().toLocalDate(), LocalDate.now(), loan, loanStatusAmount);
-                    loanStatusAmount);
         } else {
             throw new ProfitMandiBusinessException("loanstament", loanStatement.getLoanId(), "Invalid LoanId");
+        }
+    }
         if (!loans.isEmpty()) {
             for (Loan loan : loans) {
                 UserWallet userWallet = userWalletRepository.selectByRetailerId(loan.getFofoId());
-                SDCreditRequirement sdCreditRequirement = sdCreditRequirementRepository
+                SDCreditRequirement sdCreditRequirement = sdCreditRequirementRepository.selectByFofoId(loan.getFofoId());
-                        .selectByFofoId(loan.getFofoId());
                 if (userWallet.getAmount() >= 100) {
                     List<LoanStatement> loanStatements = loanStatementRepository.selectByLoanId(loan.getId());
                     LOGGER.info("loanStatements {}", loanStatements);
-                    Map<LoanReferenceType, Double> loanStatusAmount = loanStatements.stream()
-                            .collect(groupingBy(x -> x.getLoanReferenceType(),
-                                    Collectors.summingDouble(x -> FormattingUtils.serialize(x.getAmount()))));
+                    Map<LoanReferenceType, Double> loanStatusAmount = loanStatements.stream().collect(groupingBy(x -> x.getLoanReferenceType(), Collectors.summingDouble(x -> FormattingUtils.serialize(x.getAmount()))));
                     LOGGER.info("loanStatusAmount {}", loanStatusAmount);
                     Double interestAmount = loanStatusAmount.get(LoanReferenceType.INTEREST);
                     if (interestAmount == null) {
                         LOGGER.info("interestAmount b {}", interestAmount);
                         if (interestAmount < 0) {
                             LOGGER.info("interestAmount a {}", interestAmount);
-                            settledLoanStatement(LoanReferenceType.INTEREST, BigDecimal.valueOf(interestAmount),
+                            settledLoanStatement(LoanReferenceType.INTEREST, BigDecimal.valueOf(interestAmount), loan.getFofoId(), loan.getId(), "Amount adjusted against loan", LocalDateTime.now());
-                                    loan.getFofoId(), loan.getId(), "Amount adjusted against loan",
-                                    LocalDateTime.now());
                             loan.setInterestPaid(loan.getInterestPaid().add(BigDecimal.valueOf(interestAmount).abs()));
                             paidAmount += Math.abs(interestAmount);
+                        }
                         double userWalletAmount = userWallet.getAmount() - Math.abs(interestAmount);
                         if (userWalletAmount > Math.abs(principalAmount) && principalAmount < 0) {
-                            settledLoanStatement(LoanReferenceType.PRINCIPAL, BigDecimal.valueOf(principalAmount),
+                            settledLoanStatement(LoanReferenceType.PRINCIPAL, BigDecimal.valueOf(principalAmount), loan.getFofoId(), loan.getId(), "Amount adjusted against loan", LocalDateTime.now());
-                                    loan.getFofoId(), loan.getId(), "Amount adjusted against loan",
-                                    LocalDateTime.now());
                             double amount = userWalletAmount - Math.abs(principalAmount);
                             paidAmount += Math.abs(principalAmount);
                             userWallet.setAmount((int) amount);
-                            BigDecimal utilizationAmount = sdCreditRequirement.getUtilizedAmount()
+                            BigDecimal utilizationAmount = sdCreditRequirement.getUtilizedAmount().subtract(BigDecimal.valueOf(principalAmount).abs());
-                                    .subtract(BigDecimal.valueOf(principalAmount).abs());
                             sdCreditRequirement.setUtilizedAmount(utilizationAmount);
-                            CreditAccount creditAccount = creditAccountRepository
-                                    .selectByFofoIdAndGateway(loan.getFofoId(), Gateway.SDDIRECT);
+                            CreditAccount creditAccount = creditAccountRepository.selectByFofoIdAndGateway(loan.getFofoId(), Gateway.SDDIRECT);
                             creditAccount.setAvailableAmount(sdCreditRequirement.getAvailableLimit().floatValue());
                             creditAccount.setUpdatedOn(LocalDateTime.now());
                             loan.setPendingAmount(BigDecimal.ZERO);
                         } else if (principalAmount < 0) {
-                            settledLoanStatement(LoanReferenceType.PRINCIPAL, BigDecimal.valueOf(userWalletAmount),
+                            settledLoanStatement(LoanReferenceType.PRINCIPAL, BigDecimal.valueOf(userWalletAmount), loan.getFofoId(), loan.getId(), "Amount adjusted against loan", LocalDateTime.now());
-                                    loan.getFofoId(), loan.getId(), "Amount adjusted against loan",
-                                    LocalDateTime.now());
                             paidAmount += Math.abs(userWalletAmount);
-                            BigDecimal availableLimit = sdCreditRequirement.getAvailableLimit()
+                            BigDecimal availableLimit = sdCreditRequirement.getAvailableLimit().add(BigDecimal.valueOf(userWalletAmount)).abs();
-                                    .add(BigDecimal.valueOf(userWalletAmount)).abs();
-                            BigDecimal utilizationAmount = sdCreditRequirement.getUtilizedAmount()
+                            BigDecimal utilizationAmount = sdCreditRequirement.getUtilizedAmount().subtract(BigDecimal.valueOf(userWalletAmount)).abs();
-                                    .subtract(BigDecimal.valueOf(userWalletAmount)).abs();
                             sdCreditRequirement.setUtilizedAmount(utilizationAmount);
-                            CreditAccount creditAccount = creditAccountRepository
-                                    .selectByFofoIdAndGateway(loan.getFofoId(), Gateway.SDDIRECT);
+                            CreditAccount creditAccount = creditAccountRepository.selectByFofoIdAndGateway(loan.getFofoId(), Gateway.SDDIRECT);
                             creditAccount.setAvailableAmount(sdCreditRequirement.getAvailableLimit().floatValue());
                             creditAccount.setUpdatedOn(LocalDateTime.now());
                             userWallet.setAmount(0);
                             loan.setPendingAmount(
                                     loan.getPendingAmount().subtract(BigDecimal.valueOf(userWalletAmount)));
+                        }
-                        createUserWalletHistory(userWallet.getId(), userWallet.getUserId(),
-                                WalletReferenceType.LOAN_REPAYMENT, loan.getId(), Math.abs(paidAmount));
+                        createUserWalletHistory(userWallet.getId(), userWallet.getUserId(), WalletReferenceType.LOAN_REPAYMENT, loan.getId(), Math.abs(paidAmount));
                     } else {
-                        settledLoanStatement(LoanReferenceType.INTEREST, BigDecimal.valueOf(userWallet.getAmount()),
+                        settledLoanStatement(LoanReferenceType.INTEREST, BigDecimal.valueOf(userWallet.getAmount()), loan.getFofoId(), loan.getId(), "Amount adjusted against loan", LocalDateTime.now());
-                                loan.getFofoId(), loan.getId(), "Amount adjusted against loan", LocalDateTime.now());
                         paidAmount += Math.abs(userWallet.getAmount());
-                        createUserWalletHistory(userWallet.getId(), userWallet.getUserId(),
-                                WalletReferenceType.LOAN_REPAYMENT, loan.getId(), Math.abs(paidAmount));
+                        createUserWalletHistory(userWallet.getId(), userWallet.getUserId(), WalletReferenceType.LOAN_REPAYMENT, loan.getId(), Math.abs(paidAmount));
                         loan.setInterestPaid(
                                 loan.getInterestPaid().add(BigDecimal.valueOf(userWallet.getAmount()).abs()));
                         userWallet.setAmount(0);
             List<Order> allOrders = orderRepository.selectHoldOrder();
             LOGGER.info("allOrders {}", allOrders);
             if (!allOrders.isEmpty()) {
-                Map<Integer, List<Order>> transactionOrdersMap = allOrders.stream()
-                        .collect(groupingBy(Order::getTransactionId, Collectors.toList()));
+                Map<Integer, List<Order>> transactionOrdersMap = allOrders.stream().collect(groupingBy(Order::getTransactionId, Collectors.toList()));
                 LinkedHashMap<Integer, List<Order>> sortedTransactionOrdersMap = new LinkedHashMap<>();
-                transactionOrdersMap.entrySet().stream().sorted(Map.Entry.comparingByKey())
-                        .forEachOrdered(x -> sortedTransactionOrdersMap.put(x.getKey(), x.getValue()));
+                transactionOrdersMap.entrySet().stream().sorted(Map.Entry.comparingByKey()).forEachOrdered(x -> sortedTransactionOrdersMap.put(x.getKey(), x.getValue()));
                 LOGGER.info("sortedTransactionOrdersMap {}", sortedTransactionOrdersMap);
                 for (Entry<Integer, List<Order>> transactionOrdersEntry : sortedTransactionOrdersMap.entrySet()) {
                     List<Order> orders = transactionOrdersEntry.getValue();
                     int transactionId = transactionOrdersEntry.getKey();
                     SanctionRequest sanctionRequest = sanctionRequestRepository.selectByTransactionId(transactionId);
-                    double loanSettleAmount = loanStatementRepository.selectByDateAndFofoId(createDate, fofoId).stream()
+                    double loanSettleAmount = loanStatementRepository.selectByDateAndFofoId(createDate, fofoId).stream().filter(x -> x.getAmount().doubleValue() > 0).collect(Collectors.summingDouble(x -> x.getAmount().doubleValue()));
-                            .filter(x -> x.getAmount().doubleValue() > 0)
-                            .collect(Collectors.summingDouble(x -> x.getAmount().doubleValue()));
                     LOGGER.info("loanSettleAmount {}", loanSettleAmount);
                     LOGGER.info("totalAmount {}", totalAmount);
                     if (loanSettleAmount >= sanctionRequest.getUtilizationAmount().doubleValue()) {
                         LOGGER.info("totalAmount {}", totalAmount);
                         orders.forEach(x -> x.setShipmentHold(false));
-                        List<String> authUserEmail = csService.getAuthUserIdByPartnerId(orders.get(0).getRetailerId())
+                        List<String> authUserEmail = csService.getAuthUserIdByPartnerId(orders.get(0).getRetailerId()).stream().map(x -> x.getEmailId()).collect(Collectors.toList());
-                                .stream().map(x -> x.getEmailId()).collect(Collectors.toList());
                         authUserEmail.add("vinay.p@smartdukaan.com");
                         authUserEmail.add("shivam.gupta@smartdukaan.com");
                         String[] emailTo = authUserEmail.toArray(new String[authUserEmail.size()]);
                         String[] ccTo = {"tarun.verma@smartdukaan.com", "kamini.sharma@smartdukaan.com"};
                         String subject = "Dispatched " + (orders.get(0).getRetailerName());
-                        String message = String.format("Dear Team, \n" + "kindly note the material for the "
-                                + orders.get(0).getRetailerName() + "of Rs." + totalAmount + "is dispatched.");
+                        String message = String.format("Dear Team, \n" + "kindly note the material for the " + orders.get(0).getRetailerName() + "of Rs." + totalAmount + "is dispatched.");
                         Utils.sendMailWithAttachments(mailSender, emailTo, ccTo, subject, message);
+                    }
+        }
+    }
-    private void settledLoanStatement(LoanReferenceType loanReferneceType, BigDecimal amount, int fofoId, int loanId,
+    private void settledLoanStatement(LoanReferenceType loanReferneceType, BigDecimal amount, int fofoId, int loanId, String description, LocalDateTime now) {
-                                      String description, LocalDateTime now) {
-        sdCreditService.createLoanStatement(loanReferneceType, amount.abs(), fofoId, loanId, description,
+        sdCreditService.createLoanStatement(loanReferneceType, amount.abs(), fofoId, loanId, description, LocalDateTime.now());
-                LocalDateTime.now());
+    }
-    private void createUserWalletHistory(int walletId, int userId, WalletReferenceType referenceType, int loanId,
+    private void createUserWalletHistory(int walletId, int userId, WalletReferenceType referenceType, int loanId, double interestAmount) {
-                                         double interestAmount) {
         UserWalletHistory uwh = new UserWalletHistory();
         uwh.setWalletId(walletId);
         uwh.setFofoId(userId);
         uwh.setBusinessTimestamp(LocalDateTime.now());
         uwh.setReferenceType(referenceType);
         uwh.setDescription("Amount adjusted against loan");
         userWalletHistoryRepository.persist(uwh);
+    }
-    public void dailyLoanAlert()
-            throws ProfitMandiBusinessException, HttpHostConnectException, UnsupportedEncodingException {
+    public void dailyLoanAlert() throws ProfitMandiBusinessException, HttpHostConnectException, UnsupportedEncodingException {
         List<Loan> loans = loanRepository.selectAllActiveLoan();
         Map<Integer, Double> partnerLoanAmount = new HashMap<>();
         if (!loans.isEmpty()) {
             for (Loan loan : loans) {
                 List<LoanStatement> loanStatements = loanStatementRepository.selectByLoanId(loan.getId());
-                double amount = loanStatements.stream().map(x -> x.getAmount())
+                double amount = loanStatements.stream().map(x -> x.getAmount()).collect(Collectors.summingDouble(x -> x.doubleValue()));
-                        .collect(Collectors.summingDouble(x -> x.doubleValue()));
                 if (partnerLoanAmount.get(loan.getFofoId()) != null) {
                     amount += partnerLoanAmount.get(loan.getFofoId());
                     partnerLoanAmount.put(loan.getFofoId(), amount);
                 } else {
                     partnerLoanAmount.put(loan.getFofoId(), amount);
                 Address address = addressRepository.selectById(user.getAddressId());
                 String title = "Alert Credit Outstanding!";
                 String url = "http://app.smartdukaan.com/pages/home/credit";
-                String message = "Your total pending Loan amount is Rs."
-                        + FormattingUtils.formatDecimal(Math.abs(partnerLoanAmountEnrty.getValue())) + ".";
+                String message = "Your total pending Loan amount is Rs." + FormattingUtils.formatDecimal(Math.abs(partnerLoanAmountEnrty.getValue())) + ".";
                 notificationService.sendNotification(fofoId, title, MessageType.notification, title, message, url);
                 notificationService.sendWhatsappMessage(message, title, address.getPhoneNumber());
+            }
+    }
     public void updatePartnerLimit() throws ProfitMandiBusinessException {
         Map<Integer, CustomRetailer> customRetailerMap = retailerService.getFofoRetailers(true);
-        Map<Integer, SDCreditRequirement> sdCreditRequirementMap = sdCreditRequirementRepository.selectAll().stream()
+        Map<Integer, SDCreditRequirement> sdCreditRequirementMap = sdCreditRequirementRepository.selectAll().stream().collect(Collectors.toMap(x -> x.getFofoId(), x -> x));
-                .collect(Collectors.toMap(x -> x.getFofoId(), x -> x));
-        Map<Integer, CurrentPartnerDailyInvestment> currentPartnerDailyInvestmentMap = currentPartnerDailyInvestmentRepository
+        Map<Integer, CurrentPartnerDailyInvestment> currentPartnerDailyInvestmentMap = currentPartnerDailyInvestmentRepository.selectAll().stream().collect(Collectors.toMap(x -> x.getFofoId(), x -> x));
-                .selectAll().stream().collect(Collectors.toMap(x -> x.getFofoId(), x -> x));
         double limitValue = 100000;
         for (Entry<Integer, CustomRetailer> customRetailerEntry : customRetailerMap.entrySet()) {
             int fofoId = customRetailerEntry.getKey();
             SDCreditRequirement sdCreditRequirement = sdCreditRequirementMap.get(customRetailerEntry.getKey());
             LocalDateTime firstBillingDate = transactionRepository.getFirstBillingDate(fofoId);
             sdCreditRequirement.setUtilizedAmount(utilizedLimit);
             sdCreditRequirement.setUpdateTimestamp(LocalDateTime.now());
-            CreditAccount creditAccount = creditAccountRepository
-                    .selectByFofoIdAndGateway(sdCreditRequirement.getFofoId(), Gateway.SDDIRECT);
+            CreditAccount creditAccount = creditAccountRepository.selectByFofoIdAndGateway(sdCreditRequirement.getFofoId(), Gateway.SDDIRECT);
             if (creditAccount != null) {
                 creditAccount.setInterestRate(sdCreditRequirement.getInterestRate().floatValue());
                 creditAccount.setSanctionedAmount(sdCreditRequirement.getLimit().floatValue());
                 creditAccount.setAvailableAmount(availableLimit.floatValue());
             this.sendDefaultLoanAlert(defaultLoans);
+        }
+    }
-    public void sendDefaultLoanAlert(List<Loan> defaultLoans)
-            throws ProfitMandiBusinessException, MessagingException, IOException {
+    public void sendDefaultLoanAlert(List<Loan> defaultLoans) throws ProfitMandiBusinessException, MessagingException, IOException {
         String subject = "Default Partners";
-        List<Integer> categoryIds = Arrays.asList(ProfitMandiConstants.TICKET_CATEGORY_CATEGORY,
+        List<Integer> categoryIds = Arrays.asList(ProfitMandiConstants.TICKET_CATEGORY_CATEGORY, ProfitMandiConstants.TICKET_CATEGORY_RBM, ProfitMandiConstants.TICKET_CATEGORY_SALES, ProfitMandiConstants.TICKET_CATEGORY_ACCOUNTS, ProfitMandiConstants.TICKET_CATEGORY_BUSINESSINTELLIGENT);
-                ProfitMandiConstants.TICKET_CATEGORY_RBM, ProfitMandiConstants.TICKET_CATEGORY_SALES,
-                ProfitMandiConstants.TICKET_CATEGORY_ACCOUNTS,
-                ProfitMandiConstants.TICKET_CATEGORY_BUSINESSINTELLIGENT);
-        for (Map.Entry<String, Set<Integer>> storeGuyEntry : csService
-                .getAuthUserPartnerIdMappingByCategoryIds(categoryIds, false).entrySet()) {
+        for (Map.Entry<String, Set<Integer>> storeGuyEntry : csService.getAuthUserPartnerIdMappingByCategoryIds(categoryIds, false).entrySet()) {
             List<Loan> filteredRows = new ArrayList<>();
             for (Loan loan : defaultLoans) {
                 if (storeGuyEntry.getValue().contains(loan.getFofoId())) {
+        }
         for (Loan defaultLoan : defaultLoans) {
             List<LoanStatement> loanStatements = loanStatementRepository.selectByLoanId(defaultLoan.getId());
-            double amount = loanStatements.stream().map(x -> x.getAmount())
+            double amount = loanStatements.stream().map(x -> x.getAmount()).collect(Collectors.summingDouble(x -> x.doubleValue()));
-                    .collect(Collectors.summingDouble(x -> x.doubleValue()));
             com.spice.profitmandi.dao.entity.user.User user = userUserRepository.selectById(defaultLoan.getFofoId());
             Address address = addressRepository.selectById(user.getAddressId());
             String title = "Loan Amount Overdue!";
             String url = "http://app.smartdukaan.com/pages/home/credit";
-            String message = "Your loan due date "
-                    + defaultLoan.getDueDate().toLocalDate().format(DateTimeFormatter.ofPattern("dd-MM-yyyy"))
-                    + " has been exceeded. Additional penal interest of "
-                    + defaultLoan.getInterestRate().setScale(2, RoundingMode.HALF_UP)
-                    + "%  and Rs.100 shall be levied on daily basis." + " Your total pending Loan amount is Rs."
+            String message = "Your loan due date " + defaultLoan.getDueDate().toLocalDate().format(DateTimeFormatter.ofPattern("dd-MM-yyyy")) + " has been exceeded. Additional penal interest of " + defaultLoan.getInterestRate().setScale(2, RoundingMode.HALF_UP) + "%  and Rs.100 shall be levied on daily basis." + " Your total pending Loan amount is Rs." + FormattingUtils.formatDecimal(Math.abs(amount)) + ". !!Pay Now!!";
-                    + FormattingUtils.formatDecimal(Math.abs(amount)) + ". !!Pay Now!!";
-            notificationService.sendNotification(defaultLoan.getFofoId(), title, MessageType.notification, title,
+            notificationService.sendNotification(defaultLoan.getFofoId(), title, MessageType.notification, title, message, url);
-                    message, url);
             // notificationService.sendWhatsappMessage(message, title,
             // address.getPhoneNumber());
+        }
+    }
     private String getMessageForDueDateExtend(List<Loan> loans) throws ProfitMandiBusinessException {
         StringBuilder sb = new StringBuilder();
         sb.append(
-                "<html><body><p>Alert</p><p>Default Partners :-</p>" + "<br/><p>EveryDay Rs.100 charged as Penalty</p>"
+                "<html><body><p>Alert</p><p>Default Partners :-</p>" + "<br/><p>EveryDay Rs.100 charged as Penalty</p>" + "<br/><table style='border:1px solid black ;padding: 5px';>");
-                        + "<br/><table style='border:1px solid black ;padding: 5px';>");
-        sb.append("<tbody>\n" + "	    				<tr>\n"
-                + "	    					<th style='border:1px solid black;padding: 5px'>PartnerName</th>\n"
-                + "	    					<th style='border:1px solid black;padding: 5px'>due date</th>\n"
-                + "	    					<th style='border:1px solid black;padding: 5px'>Days</th>\n"
-                + "	    					<th style='border:1px solid black;padding: 5px'>Pending Amount</th>\n"
+        sb.append("<tbody>\n" + "	    				<tr>\n" + "	    					<th style='border:1px solid black;padding: 5px'>PartnerName</th>\n" + "	    					<th style='border:1px solid black;padding: 5px'>due date</th>\n" + "	    					<th style='border:1px solid black;padding: 5px'>Days</th>\n" + "	    					<th style='border:1px solid black;padding: 5px'>Pending Amount</th>\n"
                 + "	    				</tr>");
         for (Loan entry : loans) {
             List<LoanStatement> loanStatements = loanStatementRepository.selectByLoanId(entry.getId());
-            double amount = loanStatements.stream().map(x -> x.getAmount())
+            double amount = loanStatements.stream().map(x -> x.getAmount()).collect(Collectors.summingDouble(x -> x.doubleValue()));
-                    .collect(Collectors.summingDouble(x -> x.doubleValue()));
             long noOfdaysBetween = ChronoUnit.DAYS.between(entry.getDueDate().toLocalDate(), LocalDateTime.now());
             CustomRetailer customRetailer = retailerService.getFofoRetailer(entry.getFofoId());
             sb.append("<tr>");
-            sb.append("<td style='border:1px solid black;padding: 5px'>" + customRetailer.getBusinessName() + "("
+            sb.append("<td style='border:1px solid black;padding: 5px'>" + customRetailer.getBusinessName() + "(" + customRetailer.getCode() + ")" + "</td>");
-                    + customRetailer.getCode() + ")" + "</td>");
-            sb.append("<td style='border:1px solid black;padding: 5px'>"
-                    + entry.getDueDate().format(DateTimeFormatter.ofPattern("dd/MM/yyyy")) + "</td>");
+            sb.append("<td style='border:1px solid black;padding: 5px'>" + entry.getDueDate().format(DateTimeFormatter.ofPattern("dd/MM/yyyy")) + "</td>");
             sb.append("<td style='border:1px solid black;padding: 5px'>" + noOfdaysBetween + "</td>");
-            sb.append("<td style='border:1px solid black;padding: 5px'>"
-                    + new DecimalFormat("#.##").format(Math.abs(amount)) + "</td>");
+            sb.append("<td style='border:1px solid black;padding: 5px'>" + new DecimalFormat("#.##").format(Math.abs(amount)) + "</td>");
             sb.append("</tr>");
+        }
         return sb.toString();
+    }
     private String getMessageForDueDateCross(List<Loan> loans) throws ProfitMandiBusinessException {
         StringBuilder sb = new StringBuilder();
-        sb.append("<html><body><p>Alert</p><p>Due Date Cross Partners :-</p>"
-                + "<br/><p>Additional penal interest of  shall be levied on daily basis.</p>"
+        sb.append("<html><body><p>Alert</p><p>Due Date Cross Partners :-</p>" + "<br/><p>Additional penal interest of  shall be levied on daily basis.</p>" + "<br/><table style='border:1px solid black ;padding: 5px';>");
-                + "<br/><table style='border:1px solid black ;padding: 5px';>");
-        sb.append("<tbody>\n" + "	    				<tr>\n"
-                + "	    					<th style='border:1px solid black;padding: 5px'>PartnerName</th>\n"
-                + "	    					<th style='border:1px solid black;padding: 5px'>due date</th>\n"
-                + "	    					<th style='border:1px solid black;padding: 5px'>Days</th>\n"
-                + "	    					<th style='border:1px solid black;padding: 5px'>Pending Amount</th>\n"
+        sb.append("<tbody>\n" + "	    				<tr>\n" + "	    					<th style='border:1px solid black;padding: 5px'>PartnerName</th>\n" + "	    					<th style='border:1px solid black;padding: 5px'>due date</th>\n" + "	    					<th style='border:1px solid black;padding: 5px'>Days</th>\n" + "	    					<th style='border:1px solid black;padding: 5px'>Pending Amount</th>\n"
                 + "	    				</tr>");
         for (Loan entry : loans) {
             List<LoanStatement> loanStatements = loanStatementRepository.selectByLoanId(entry.getId());
-            double amount = loanStatements.stream().map(x -> x.getAmount())
+            double amount = loanStatements.stream().map(x -> x.getAmount()).collect(Collectors.summingDouble(x -> x.doubleValue()));
-                    .collect(Collectors.summingDouble(x -> x.doubleValue()));
             long noOfdaysBetween = ChronoUnit.DAYS.between(entry.getDueDate().toLocalDate(), LocalDateTime.now());
             CustomRetailer customRetailer = retailerService.getFofoRetailer(entry.getFofoId());
             sb.append("<tr>");
-            sb.append("<td style='border:1px solid black;padding: 5px'>" + customRetailer.getBusinessName() + "("
+            sb.append("<td style='border:1px solid black;padding: 5px'>" + customRetailer.getBusinessName() + "(" + customRetailer.getCode() + ")" + "</td>");
-                    + customRetailer.getCode() + ")" + "</td>");
-            sb.append("<td style='border:1px solid black;padding: 5px'>"
-                    + entry.getDueDate().format(DateTimeFormatter.ofPattern("dd/MM/yyyy")) + "</td>");
+            sb.append("<td style='border:1px solid black;padding: 5px'>" + entry.getDueDate().format(DateTimeFormatter.ofPattern("dd/MM/yyyy")) + "</td>");
             sb.append("<td style='border:1px solid black;padding: 5px'>" + noOfdaysBetween + "</td>");
-            sb.append("<td style='border:1px solid black;padding: 5px'>"
-                    + new DecimalFormat("#.##").format(Math.abs(amount)) + "</td>");
+            sb.append("<td style='border:1px solid black;padding: 5px'>" + new DecimalFormat("#.##").format(Math.abs(amount)) + "</td>");
             sb.append("</tr>");
+        }
             this.sendDueDateCrossLoanAlert(dueDateCrossLoans);
+        }
+    }
-    private void sendDueDateCrossLoanAlert(List<Loan> dueDateCrossLoans)
-            throws ProfitMandiBusinessException, MessagingException, IOException {
+    private void sendDueDateCrossLoanAlert(List<Loan> dueDateCrossLoans) throws ProfitMandiBusinessException, MessagingException, IOException {
-        List<Integer> categoryIds = Arrays.asList(ProfitMandiConstants.TICKET_CATEGORY_CATEGORY,
+        List<Integer> categoryIds = Arrays.asList(ProfitMandiConstants.TICKET_CATEGORY_CATEGORY, ProfitMandiConstants.TICKET_CATEGORY_RBM, ProfitMandiConstants.TICKET_CATEGORY_SALES, ProfitMandiConstants.TICKET_CATEGORY_ACCOUNTS, ProfitMandiConstants.TICKET_CATEGORY_BUSINESSINTELLIGENT);
-                ProfitMandiConstants.TICKET_CATEGORY_RBM, ProfitMandiConstants.TICKET_CATEGORY_SALES,
-                ProfitMandiConstants.TICKET_CATEGORY_ACCOUNTS,
-                ProfitMandiConstants.TICKET_CATEGORY_BUSINESSINTELLIGENT);
-        for (Map.Entry<String, Set<Integer>> storeGuyEntry : csService
-                .getAuthUserPartnerIdMappingByCategoryIds(categoryIds, false).entrySet()) {
+        for (Map.Entry<String, Set<Integer>> storeGuyEntry : csService.getAuthUserPartnerIdMappingByCategoryIds(categoryIds, false).entrySet()) {
             List<Loan> filteredRows = new ArrayList<>();
             for (Loan loan : dueDateCrossLoans) {
                 if (storeGuyEntry.getValue().contains(loan.getFofoId())) {
                 LOGGER.info("noOfdaysBetween {} ", noOfdaysBetween);
                 List<LoanStatement> loanStatements = loanStatementRepository.selectByLoanId(loan.getId());
-                double amount = loanStatements.stream().map(x -> x.getAmount())
+                double amount = loanStatements.stream().map(x -> x.getAmount()).collect(Collectors.summingDouble(x -> x.doubleValue()));
-                        .collect(Collectors.summingDouble(x -> x.doubleValue()));
                 String url = "http://app.smartdukaan.com/pages/home/credit";
                 String title = "Alert!";
-                String message = "Your loan due date "
-                        + loan.getDueDate().toLocalDate().format(DateTimeFormatter.ofPattern("dd-MM-yyyy"))
-                        + " has been exceeded. Additional penal interest of "
-                        + loan.getInterestRate().setScale(2, RoundingMode.HALF_UP)
-                        + "% shall be levied on daily basis. Your total pending loan amount is Rs."
+                String message = "Your loan due date " + loan.getDueDate().toLocalDate().format(DateTimeFormatter.ofPattern("dd-MM-yyyy")) + " has been exceeded. Additional penal interest of " + loan.getInterestRate().setScale(2, RoundingMode.HALF_UP) + "% shall be levied on daily basis. Your total pending loan amount is Rs." + FormattingUtils.formatDecimal(Math.abs(amount)) + ". !!Pay Now!!";
-                        + FormattingUtils.formatDecimal(Math.abs(amount)) + ". !!Pay Now!!";
-                notificationService.sendNotification(loan.getFofoId(), title, MessageType.notification, title, message,
+                notificationService.sendNotification(loan.getFofoId(), title, MessageType.notification, title, message, url);
-                        url);
                 notificationService.sendWhatsappMessage(message, title, address.getPhoneNumber());
+            }
+        }
                 LOGGER.info("noOfdaysBetween {} ", noOfdaysBetween);
                 if (noOfdaysBetween <= 4 && noOfdaysBetween >= 0) {
                     List<LoanStatement> loanStatements = loanStatementRepository.selectByLoanId(loan.getId());
-                    double amount = loanStatements.stream().map(x -> x.getAmount())
+                    double amount = loanStatements.stream().map(x -> x.getAmount()).collect(Collectors.summingDouble(x -> x.doubleValue()));
-                            .collect(Collectors.summingDouble(x -> x.doubleValue()));
                     String title = "Alert!";
                     String url = "http://app.smartdukaan.com/pages/home/credit";
                     String message = null;
                     if (noOfdaysBetween == 0) {
-                        message = "Your total pending Loan amount is Rs."
-                                + FormattingUtils.formatDecimal(Math.abs(amount)) + " is due for Today, Pay Now!!";
+                        message = "Your total pending Loan amount is Rs." + FormattingUtils.formatDecimal(Math.abs(amount)) + " is due for Today, Pay Now!!";
                     } else {
-                        message = "Your total pending Loan amount is Rs."
-                                + FormattingUtils.formatDecimal(Math.abs(amount)) + " is due by "
-                                + loan.getDueDate().toLocalDate().format(DateTimeFormatter.ofPattern("dd-MM-yyyy"))
+                        message = "Your total pending Loan amount is Rs." + FormattingUtils.formatDecimal(Math.abs(amount)) + " is due by " + loan.getDueDate().toLocalDate().format(DateTimeFormatter.ofPattern("dd-MM-yyyy")) + " , Pay Now!!";
-                                + " , Pay Now!!";
+                    }
-                    notificationService.sendNotification(loan.getFofoId(), title, MessageType.notification, title,
+                    notificationService.sendNotification(loan.getFofoId(), title, MessageType.notification, title, message, url);
-                            message, url);
                     notificationService.sendWhatsappMessage(message, title, address.getPhoneNumber());
+                }
+            }
+        }
     public void userMobileNumberOptIn() throws HttpHostConnectException, ProfitMandiBusinessException {
         List<FofoStore> fofoStores = fofoStoreRepository.selectActiveStores();
-        List<com.spice.profitmandi.dao.entity.user.User> users = userUserRepository
-                .selectByIds(fofoStores.stream().map(x -> x.getId()).collect(Collectors.toList()));
+        List<com.spice.profitmandi.dao.entity.user.User> users = userUserRepository.selectByIds(fofoStores.stream().map(x -> x.getId()).collect(Collectors.toList()));
-        List<Address> addresses = addressRepository
-                .selectByIds(users.stream().map(x -> x.getAddressId()).collect(Collectors.toList()));
+        List<Address> addresses = addressRepository.selectByIds(users.stream().map(x -> x.getAddressId()).collect(Collectors.toList()));
         LOGGER.info("addresses" + addresses);
         for (Address address : addresses) {
             Map<String, String> requestheaders = new HashMap<>();
             requestParams.put("format", "json");
             requestParams.put("method", "OPT_IN");
             requestParams.put("channel", "WHATSAPP");
-            String response = restClient.get("https://media.smsgupshup.com/GatewayAPI/rest", requestParams,
+            String response = restClient.get("https://media.smsgupshup.com/GatewayAPI/rest", requestParams, requestheaders);
-                    requestheaders);
             LOGGER.info("response" + response);
+        }
+    }
             requestParams.put("format", "json");
             requestParams.put("method", "OPT_IN");
             requestParams.put("channel", "WHATSAPP");
-            String response = restClient.get("https://media.smsgupshup.com/GatewayAPI/rest", requestParams,
+            String response = restClient.get("https://media.smsgupshup.com/GatewayAPI/rest", requestParams, requestheaders);
-                    requestheaders);
             LOGGER.info("response" + response);
+        }
+    }
         List<String> remarks = new ArrayList<>();
         remarks.add("Out of Service");
         remarks.add("Duplicate number");
         remarks.add("Partner number");
-        List<HygieneData> hygieneData = hygieneDataRepository.selectAllByDisposedDateAndRemark(LocalDate.now(),
+        List<HygieneData> hygieneData = hygieneDataRepository.selectAllByDisposedDateAndRemark(LocalDate.now(), remarks);
-                remarks);
         if (!hygieneData.isEmpty()) {
-            Map<Integer, List<HygieneData>> partnerHygieneDataMap = hygieneData.stream()
+            Map<Integer, List<HygieneData>> partnerHygieneDataMap = hygieneData.stream().collect(groupingBy(x -> x.getFofoId()));
-                    .collect(groupingBy(x -> x.getFofoId()));
             for (Entry<Integer, List<HygieneData>> partnerHygieneDataMapEntry : partnerHygieneDataMap.entrySet()) {
                 CustomRetailer customRetailer = retailerService.getFofoRetailer(partnerHygieneDataMapEntry.getKey());
                 StringBuilder sb = new StringBuilder();
-                sb.append("<html><body><p>Dear Partner,"
-                        + "</p><br/><p>It has been observed in our calls to the respective customers that the contact no is either not correct or does not have incoming calls.\n"
+                sb.append("<html><body><p>Dear Partner," + "</p><br/><p>It has been observed in our calls to the respective customers that the contact no is either not correct or does not have incoming calls.\n"
-                        + " </p>"
-                        + "<p>We would like to inform you that this will hinder all our marketing initiatives to bring this customer back to our smartdukaan or cross sell any product from your inventory."
+                        + " </p>" + "<p>We would like to inform you that this will hinder all our marketing initiatives to bring this customer back to our smartdukaan or cross sell any product from your inventory." + "</p><p>Kindly ensure going forward that the details are correct so to avoid 1% margin loss.\n" + "</p><p>In case the data is found to be incorrect there is a loss of 1% margin on this sales under SmartDukaan hygiene guidelines.\n" + "				" + "</p>"
-                        + "</p><p>Kindly ensure going forward that the details are correct so to avoid 1% margin loss.\n"
-                        + "</p><p>In case the data is found to be incorrect there is a loss of 1% margin on this sales under SmartDukaan hygiene guidelines.\n"
-                        + "				" + "</p>"
                         + "<br/><table style='border:1px solid black ;padding: 5px';>");
                 sb.append("<tbody>\n" + "	" + "    				" + "<tr>\n");
                 sb.append("<th style='border:1px solid black;padding: 5px'>Invoice Number</th>\n");
                 sb.append("<th style='border:1px solid black;padding: 5px'>Customer Name</th>\n");
                 List<FofoOrder> fofoOrders = fofoOrderRepository.selectAllByOrderIds(orderIds);
                 for (FofoOrder fofoOrder : fofoOrders) {
                     Customer customer = customerRepository.selectById(fofoOrder.getCustomerId());
                     sb.append("<tr>");
-                    sb.append("<td style='border:1px solid black;padding: 5px'>" + fofoOrder.getInvoiceNumber()
+                    sb.append("<td style='border:1px solid black;padding: 5px'>" + fofoOrder.getInvoiceNumber() + "</td>\n");
-                            + "</td>\n");
-                    sb.append("<td style='border:1px solid black;padding: 5px'>" + customer.getFirstName() + ""
+                    sb.append("<td style='border:1px solid black;padding: 5px'>" + customer.getFirstName() + "" + customer.getLastName() + "</td>\n");
-                            + customer.getLastName() + "</td>\n");
-                    sb.append("<td style='border:1px solid black;padding: 5px'>" + customer.getMobileNumber()
+                    sb.append("<td style='border:1px solid black;padding: 5px'>" + customer.getMobileNumber() + "</td>\n");
-                            + "</td>\n");
                     sb.append("</tr>\n");
+                }
                 sb.append("</tbody></table></body></html>");
         List<String> remarks = new ArrayList<>();
         remarks.add("Out of Service");
         remarks.add("Duplicate number");
         remarks.add("Partner number");
-        List<HygieneData> hygieneDataLastThreeMonth = hygieneDataRepository
+        List<HygieneData> hygieneDataLastThreeMonth = hygieneDataRepository.selectDisposedDateAndRemarks(
-                .selectDisposedDateAndRemarks(
-                        LocalDate.now().withDayOfMonth(1).minusMonths(3).atStartOfDay(), LocalDate.now().minusMonths(1)
+                LocalDate.now().withDayOfMonth(1).minusMonths(3).atStartOfDay(), LocalDate.now().minusMonths(1).withDayOfMonth(LocalDate.now().minusMonths(1).lengthOfMonth()).atTime(LocalTime.MAX), remarks);
-                                .withDayOfMonth(LocalDate.now().minusMonths(1).lengthOfMonth()).atTime(LocalTime.MAX),
-                        remarks);
-        List<HygieneData> hygieneDataRecentMonth = hygieneDataRepository
-                .selectDisposedDateAndRemarks(LocalDate.now().withDayOfMonth(1), remarks);
+        List<HygieneData> hygieneDataRecentMonth = hygieneDataRepository.selectDisposedDateAndRemarks(LocalDate.now().withDayOfMonth(1), remarks);
         Map<String, Set<Integer>> storeGuyMap = csService.getAuthUserPartnerIdMapping();
         Map<Integer, List<HygieneData>> partnerHygieneLastThreeMonthMap = null;
         Map<Integer, List<HygieneData>> partnerHygieneDataRecentMonth = null;
         if (!hygieneDataLastThreeMonth.isEmpty()) {
-            partnerHygieneLastThreeMonthMap = hygieneDataLastThreeMonth.stream()
+            partnerHygieneLastThreeMonthMap = hygieneDataLastThreeMonth.stream().collect(groupingBy(x -> x.getFofoId()));
-                    .collect(groupingBy(x -> x.getFofoId()));
+        }
         if (!hygieneDataRecentMonth.isEmpty()) {
-            partnerHygieneDataRecentMonth = hygieneDataRecentMonth.stream()
+            partnerHygieneDataRecentMonth = hygieneDataRecentMonth.stream().collect(groupingBy(x -> x.getFofoId()));
-                    .collect(groupingBy(x -> x.getFofoId()));
+        }
         for (Entry<String, Set<Integer>> storeGuyEntry : storeGuyMap.entrySet()) {
             String email = storeGuyEntry.getKey();
                 partnerDateWiseData.put(fofoId, null);
                 if (!partnerHygieneLastThreeMonthMap.isEmpty()) {
                     List<HygieneData> hygienes = partnerHygieneLastThreeMonthMap.get(fofoId);
                     if (hygienes != null) {
-                        Map<YearMonth, List<HygieneData>> yearMonthData = hygienes.stream()
-                                .collect(groupingBy(x -> YearMonth.from(x.getDisposedTimestamp())));
+                        Map<YearMonth, List<HygieneData>> yearMonthData = hygienes.stream().collect(groupingBy(x -> YearMonth.from(x.getDisposedTimestamp())));
                         partnerYearMonthData.put(fofoId, yearMonthData);
+                    }
                     List<HygieneData> dateWiseHygienes = partnerHygieneDataRecentMonth.get(fofoId);
                     if (dateWiseHygienes != null) {
-                        Map<LocalDate, List<HygieneData>> dateWiseData = hygienes.stream()
-                                .collect(groupingBy(x -> (x.getDisposedTimestamp()).toLocalDate()));
+                        Map<LocalDate, List<HygieneData>> dateWiseData = hygienes.stream().collect(groupingBy(x -> (x.getDisposedTimestamp()).toLocalDate()));
                         partnerDateWiseData.put(fofoId, dateWiseData);
+                    }
+        }
+    }
     private String getMessageHygieneAlertForPartner(
-            Map<Integer, Map<YearMonth, List<HygieneData>>> partnerYearMonthData,
-            Map<Integer, Map<LocalDate, List<HygieneData>>> partnerDateWiseData) {
+                                                    Map<Integer, Map<YearMonth, List<HygieneData>>> partnerYearMonthData, Map<Integer, Map<LocalDate, List<HygieneData>>> partnerDateWiseData) {
         Map<Integer, CustomRetailer> customeRetailerMap = retailerService.getAllFofoRetailers();
         LocalDateTime startDate = LocalDate.now().withDayOfMonth(1).atStartOfDay();
         LocalDateTime endDate = LocalDateTime.now();
         LocalDateTime startYearMonth = LocalDate.now().withDayOfMonth(1).minusMonths(3).atStartOfDay();
-        LocalDateTime endYearMonth = LocalDate.now().minusMonths(1)
-                .withDayOfMonth(LocalDate.now().minusMonths(1).lengthOfMonth()).atTime(LocalTime.MAX);
+        LocalDateTime endYearMonth = LocalDate.now().minusMonths(1).withDayOfMonth(LocalDate.now().minusMonths(1).lengthOfMonth()).atTime(LocalTime.MAX);
         DateTimeFormatter dateYearMonthFormatter = DateTimeFormatter.ofPattern("MMM''uu");
         List<YearMonth> yearMonthRange = new ArrayList<>();
         yearMonthRange.add(YearMonth.from(startYearMonth));
         yearMonthRange.add(YearMonth.from(endYearMonth));
         long noOfDaysBetween = ChronoUnit.DAYS.between(startDate, endDate.plusDays(1));
-        List<LocalDate> dateRange = Stream.iterate(startDate.toLocalDate(), date -> date.plusDays(1))
+        List<LocalDate> dateRange = Stream.iterate(startDate.toLocalDate(), date -> date.plusDays(1)).limit(noOfDaysBetween).collect(Collectors.toList());
-                .limit(noOfDaysBetween).collect(Collectors.toList());
         StringBuilder sb = new StringBuilder();
-        sb.append("<html><body><p>Hi,"
-                + "</p><br/><p>Kindly advise below mentioned partner to input correct details in the system else this will hinder all our marketing initiatives to bring this customer back to our smartdukaan or cross sell any product from partner's inventory.\n"
+        sb.append("<html><body><p>Hi," + "</p><br/><p>Kindly advise below mentioned partner to input correct details in the system else this will hinder all our marketing initiatives to bring this customer back to our smartdukaan or cross sell any product from partner's inventory.\n" + " </p>" + "<p>Kindly ensure going forward that the details are correct so to avoid 1% margin loss.\n" + "</p><p>In case the data is found to be incorrect there is a loss of 1% margin on this sales under SmartDukaan hygiene guidelines.\n</p>"
-                + " </p>" + "<p>Kindly ensure going forward that the details are correct so to avoid 1% margin loss.\n"
-                + "</p><p>In case the data is found to be incorrect there is a loss of 1% margin on this sales under SmartDukaan hygiene guidelines.\n</p>"
                 + "<table style='border:1px solid black ;padding: 5px';>");
         sb.append("<tbody>\n" + "	" + "    				" + "<tr>\n");
         sb.append("<th style='border:1px solid black;padding: 5px'>Partner Name</th>\n");
         for (YearMonth yearMonth : yearMonthRange) {
-            sb.append("<th style='border:1px solid black;padding: 5px'>" + yearMonth.format(dateYearMonthFormatter)
+            sb.append("<th style='border:1px solid black;padding: 5px'>" + yearMonth.format(dateYearMonthFormatter) + "</th>\n");
-                    + "</th>\n");
+        }
         for (LocalDate localDate : dateRange) {
             sb.append("<th style='border:1px solid black;padding: 5px'>" + localDate + "</th>\n");
+        }
         sb.append("</tr>\n");
-        for (Entry<Integer, Map<YearMonth, List<HygieneData>>> partnerYearMonthEntry : partnerYearMonthData
+        for (Entry<Integer, Map<YearMonth, List<HygieneData>>> partnerYearMonthEntry : partnerYearMonthData.entrySet()) {
-                .entrySet()) {
             int fofoId = partnerYearMonthEntry.getKey();
             Map<YearMonth, List<HygieneData>> yearMonthData = partnerYearMonthEntry.getValue();
             if (yearMonthData == null && dateWiseData == null) {
                 continue;
+            }
             sb.append("<tr>");
-            sb.append("<td style='border:1px solid black;padding: 5px'>"
-                    + customeRetailerMap.get(fofoId).getBusinessName() + "</td>\n");
+            sb.append("<td style='border:1px solid black;padding: 5px'>" + customeRetailerMap.get(fofoId).getBusinessName() + "</td>\n");
             for (YearMonth yearMonth : yearMonthRange) {
                 if (yearMonthData == null) {
                     sb.append("<td style='border:1px solid black;padding: 5px'>-</td>\n");
     public void monthlyTargetForPartner() throws MessagingException, ProfitMandiBusinessException, IOException {
         LocalDateTime curDate = LocalDateTime.now();
         List<MonthlyTarget> monthlyTargets = monthlyTargetRepository.selectByDate(YearMonth.now());
-        Map<Integer, MonthlyTarget> partnersMonthlyTarget = monthlyTargets.stream()
+        Map<Integer, MonthlyTarget> partnersMonthlyTarget = monthlyTargets.stream().collect(Collectors.toMap(x -> x.getFofoId(), x -> x));
-                .collect(Collectors.toMap(x -> x.getFofoId(), x -> x));
-        Map<Integer, Double> secondaryMtd = orderRepository
-                .selectBillingDatesBetweenSumGroupByRetailerId(curDate.withDayOfMonth(1), curDate.with(LocalTime.MAX));
+        Map<Integer, Double> secondaryMtd = orderRepository.selectBillingDatesBetweenSumGroupByRetailerId(curDate.withDayOfMonth(1), curDate.with(LocalTime.MAX));
-        Map<Integer, Double> todaytertiary = fofoOrderItemRepository.selectSumMopGroupByRetailer(curDate,
+        Map<Integer, Double> todaytertiary = fofoOrderItemRepository.selectSumMopGroupByRetailer(curDate, curDate.with(LocalTime.MAX), 0, false);
-                curDate.with(LocalTime.MAX), 0, false);
         String subject = "Monthly Target Vs Achievement";
         for (Entry<Integer, MonthlyTarget> partnerMonthlyTargetEntry : partnersMonthlyTarget.entrySet()) {
                     balanceTarget = 0.0;
+                }
                 StringBuilder sb = new StringBuilder();
                 sb.append("<html><body><p>Dear Partner,\n");
-                sb.append("<p>Pls note your agreed monthly target is Rs." + purchaseTarget
+                sb.append("<p>Pls note your agreed monthly target is Rs." + purchaseTarget + " and your achievement till date is Rs." + purchase + "</p>");
-                        + " and your achievement till date is Rs." + purchase + "</p>");
                 sb.append("<p>Pls note that your balance target is Rs." + balanceTarget + "</p>\n");
                 sb.append(
-                        "<p>We wish you all the best and we are confident that this focussed approach towards our outlet sales will help us take our outlet to the best SmartDukaan in your city.\n"
+                        "<p>We wish you all the best and we are confident that this focussed approach towards our outlet sales will help us take our outlet to the best SmartDukaan in your city.\n" + "</p>\n");
-                                + "</p>\n");
                 this.sendMailOfHtmlFormat(customRetailer.getEmail(), sb.toString(), null, subject);
                 // this.sendMailOfHtmlFormat("tejbeer.kaur@smartdukaan.com", sb.toString(),
                 // null, subject);
     public void monthlyTargetForInternalTeam() throws MessagingException, ProfitMandiBusinessException, IOException {
         LocalDateTime curDate = LocalDateTime.now();
-        List<Integer> categoryIds = Arrays.asList(ProfitMandiConstants.TICKET_CATEGORY_CATEGORY,
+        List<Integer> categoryIds = Arrays.asList(ProfitMandiConstants.TICKET_CATEGORY_CATEGORY, ProfitMandiConstants.TICKET_CATEGORY_RBM, ProfitMandiConstants.TICKET_CATEGORY_SALES, ProfitMandiConstants.TICKET_CATEGORY_MARKETING, ProfitMandiConstants.TICKET_CATEGORY_ACCOUNTS, ProfitMandiConstants.TICKET_CATEGORY_BUSINESSINTELLIGENT);
-                ProfitMandiConstants.TICKET_CATEGORY_RBM, ProfitMandiConstants.TICKET_CATEGORY_SALES,
-                ProfitMandiConstants.TICKET_CATEGORY_MARKETING, ProfitMandiConstants.TICKET_CATEGORY_ACCOUNTS,
-                ProfitMandiConstants.TICKET_CATEGORY_BUSINESSINTELLIGENT);
         Map<String, Set<Integer>> storeGuyMap = csService.getAuthUserPartnerIdMappingByCategoryIds(categoryIds, false);
         List<MonthlyTarget> monthlyTargets = monthlyTargetRepository.selectByDate(YearMonth.now());
         Map<Integer, CustomRetailer> customeRetailerMap = retailerService.getAllFofoRetailers();
-        Map<Integer, MonthlyTarget> partnersMonthlyTarget = monthlyTargets.stream()
+        Map<Integer, MonthlyTarget> partnersMonthlyTarget = monthlyTargets.stream().collect(Collectors.toMap(x -> x.getFofoId(), x -> x));
-                .collect(Collectors.toMap(x -> x.getFofoId(), x -> x));
-        Map<Integer, Double> secondaryMtd = orderRepository
-                .selectBillingDatesBetweenSumGroupByRetailerId(curDate.withDayOfMonth(1), curDate.with(LocalTime.MAX));
+        Map<Integer, Double> secondaryMtd = orderRepository.selectBillingDatesBetweenSumGroupByRetailerId(curDate.withDayOfMonth(1), curDate.with(LocalTime.MAX));
-        Map<Integer, Double> todaytertiary = fofoOrderItemRepository.selectSumMopGroupByRetailer(curDate,
+        Map<Integer, Double> todaytertiary = fofoOrderItemRepository.selectSumMopGroupByRetailer(curDate, curDate.with(LocalTime.MAX), 0, false);
-                curDate.with(LocalTime.MAX), 0, false);
         String subject = "Monthly Target Vs Achievement";
         for (Entry<String, Set<Integer>> storeGuyEntry : storeGuyMap.entrySet()) {
             if (!monthlyTargetAchievement.isEmpty()) {
                 StringBuilder sb = new StringBuilder();
                 sb.append("<html><body><p>Hi,\n");
-                sb.append("<p>Pls note your Partners agreed monthly target foolowing are :</p>\n"
+                sb.append("<p>Pls note your Partners agreed monthly target foolowing are :</p>\n" + " <table style='border:1px solid black ;padding: 5px';>");
-                        + " <table style='border:1px solid black ;padding: 5px';>");
                 sb.append("<tbody>\n" + "	" + "    				" + "<tr>\n");
                 sb.append("<th style='border:1px solid black;padding: 5px'>Partner Name</th>\n");
                 sb.append("<th style='border:1px solid black;padding: 5px'>Purchase Target</th>\n");
                 sb.append("<th style='border:1px solid black;padding: 5px'>Purchase Achievement</th>\n");
                 sb.append("</tr>\n");
-                for (Entry<Integer, MonthlyTarget> monthlyTargetAchievementEntry : monthlyTargetAchievement
+                for (Entry<Integer, MonthlyTarget> monthlyTargetAchievementEntry : monthlyTargetAchievement.entrySet()) {
-                        .entrySet()) {
                     sb.append("<tr>");
                     int fofoId = monthlyTargetAchievementEntry.getKey();
                     MonthlyTarget monthlyTarget = monthlyTargetAchievementEntry.getValue();
-                    sb.append("<td style='border:1px solid black;padding: 5px'>"
-                            + customeRetailerMap.get(fofoId).getBusinessName() + "</td>\n");
+                    sb.append("<td style='border:1px solid black;padding: 5px'>" + customeRetailerMap.get(fofoId).getBusinessName() + "</td>\n");
-                    sb.append("<td style='border:1px solid black;padding: 5px'>" + monthlyTarget.getPurchaseTarget()
+                    sb.append("<td style='border:1px solid black;padding: 5px'>" + monthlyTarget.getPurchaseTarget() + "</td>\n");
-                            + "</td>\n");
-                    sb.append("<td style='border:1px solid black;padding: 5px'>"
+                    sb.append("<td style='border:1px solid black;padding: 5px'>" + monthlyTarget.getPurchaseAchievement() + "</td>\n");
-                            + monthlyTarget.getPurchaseAchievement() + "</td>\n");
                     sb.append("</tr>\n");
+                }

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java – Rev 31746 → 31886