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

+    }
     public void generateBiReportExcel() throws Exception {
+        LocalDateTime startOfToday;
+        LocalDateTime previousDay;
+        if (LocalDate.now().getDayOfMonth() == 1) {
+            // If today is 1st, go to yesterday (i.e., last day of previous month)
+            startOfToday = LocalDate.now().minusDays(1).atStartOfDay();
+            previousDay = startOfToday.with(LocalTime.MAX);
+        } else {
+            // Otherwise, use today
-        LocalDateTime startOfToday = LocalDate.now().atStartOfDay();
+            startOfToday = LocalDate.now().atStartOfDay();
+            previousDay = startOfToday.with(LocalTime.MAX).minusDays(1);
+        }
         /*Map<Integer, CustomRetailer> customRetailers = retailerService.getAllFofoRetailersInternalFalse();
         List<Integer> retailerIds = customRetailers.values().stream().map(CustomRetailer::getPartnerId).collect(Collectors.toList());*/
-        List<Integer> retailerIds = Arrays.asList(175138886,175139660,175139584,175139235,175138843,175139356,175139662,168094765,175139684,175135707,175139335,175139270,175139305,175139262,175139241,175139560,175139732,175138871,175138875,175139323,175139564,166900459,175139261,175139337,175138836,175139551,175139498,175139685,175127215,175139712,175138969,175139408,175139711,175136389,175139019,175139589,175139424,175139094,175138908,175139180,175139648,175138951,175139220,175139508,175138854,175139726,175138897,175139671,175139721,175139681);
+        List<Integer> retailerIds = Arrays.asList(175139400, 175139727, 175138674, 175139476, 175139409, 175139260, 175139650, 175139742, 175139715, 175139154, 175139135, 175139550, 175139733, 175139722, 175138842, 175139309, 175138859, 175139438, 175139718, 175139320, 175139047, 175138408, 175139590, 175139494, 175139670, 175139730, 175139295, 175139188, 175139487, 175139422, 175139488, 175139279, 175139724, 175139687, 175139161, 175138934, 175139013, 175139633, 175139383, 175139432, 175139089, 175139561, 175135227, 175139412, 175139018, 175139088, 175139616, 175139294, 175139649, 175139129, 175139366, 175139699, 175139557, 175138174, 175139620, 175139514, 175139079, 175139521, 175139015, 175138982, 175139683, 175139676, 175139562, 175139675, 175138989, 175139114, 175139526, 175139729, 175139394, 175138864, 175135923, 175139415, 175139459, 175139395, 175139731, 175139401, 175139481, 175139623, 175139563, 175139692, 175139345);
         Map<Integer,CustomRetailer> customRetailers = retailerService.getFofoRetailers(retailerIds);
         //partner daily investment
         List<Loan> defaultLoans = sdCreditService.getDefaultLoans();
         Map<Integer,List<Loan>> defaultLoanMap = defaultLoans.stream().collect(Collectors.groupingBy(Loan::getFofoId));
         Map<Integer, PartnerDailyInvestment> partnerDailyInvestmentMap = new HashMap<>();
         List<PartnerDailyInvestment> partnerDailyInvestments = partnerDailyInvestmentRepository
-                .selectAll(new ArrayList<>(retailerIds), LocalDate.now().minusDays(1));
+                .selectAll(new ArrayList<>(retailerIds), previousDay.toLocalDate());
         if (!partnerDailyInvestments.isEmpty()) {
             partnerDailyInvestmentMap = partnerDailyInvestments.stream()
                     .collect(Collectors.toMap(x -> x.getFofoId(), x -> x));
+        }
     //  this month return data
+        YearMonth currentMonth;
+        LocalDateTime currentMonthStartDate;
+        LocalDateTime currentMonthEndDate;
+        if (LocalDate.now().getDayOfMonth() == 1) {
+            // If today is the 1st, use previous month
+            currentMonth = YearMonth.now().minusMonths(1);
+            currentMonthStartDate = currentMonth.atDay(1).atStartOfDay();
+            currentMonthEndDate = currentMonth.atEndOfMonth().atTime(23, 59, 59);
+        } else {
+            // Otherwise, use this month up to yesterday
-        YearMonth currentMonth = YearMonth.now();
+            currentMonth = YearMonth.now();
+            currentMonthStartDate = currentMonth.atDay(1).atStartOfDay();
+            currentMonthEndDate = LocalDate.now().minusDays(1).atTime(23, 59, 59);
+        }
         String currentMonthStringValue = String.valueOf(currentMonth);
-        LocalDateTime currentMonthStartDate = YearMonth.now().atDay(1).atStartOfDay();
-        LocalDateTime currentMonthEndDate = LocalDateTime.now().minusDays(1).toLocalDate().atTime(23, 59, 59);
         List<ReturnOrderInfoModel> currentMonthReturnOrderInfoModels = returnOrderInfoRepository.selectAllByBetweenDate(currentMonthStartDate, currentMonthEndDate);
         Map<Integer, Long> currentMonthPartnerReturnOrderInfoModelMap = currentMonthReturnOrderInfoModels.stream().collect(Collectors.groupingBy(x -> x.getRetailerId(), Collectors.summingLong(x -> Math.round(x.getRefundAmount()))));
         List<Order> currentMonthRtoRefundOrders = orderRepository.selectAllOrderDatesBetweenByStatus(currentMonthStartDate, currentMonthEndDate, OrderStatus.RTO_REFUNDED);
         Map<Integer, Long> currentMonthRtoRefundOrderMap = currentMonthRtoRefundOrders.stream().collect(Collectors.groupingBy(x -> x.getRetailerId(), Collectors.summingLong(x -> Math.round(x.getTotalAmount()))));
-//  last month return data
+    //  last month return data
-        YearMonth lastMonth = YearMonth.now().minusMonths(1);
+        YearMonth lastMonth = currentMonth.minusMonths(1);
         String lastMonthStringValue = String.valueOf(lastMonth);
         LocalDateTime lastMontStartDate = lastMonth.atDay(1).atStartOfDay();
         LocalDateTime lastMonthEndDate = lastMonth.atEndOfMonth().atTime(23, 59, 59);
         List<ReturnOrderInfoModel> lastMonthReturnOrderInfoModels = returnOrderInfoRepository.selectAllByBetweenDate(lastMontStartDate, lastMonthEndDate);
         List<Order> lastMonthRtoRefundOrders = orderRepository.selectAllOrderDatesBetweenByStatus(lastMontStartDate, lastMonthEndDate, OrderStatus.RTO_REFUNDED);
         Map<Integer, Long> lastMonthRtoRefundOrderMap = lastMonthRtoRefundOrders.stream().collect(Collectors.groupingBy(x -> x.getRetailerId(), Collectors.summingLong(x -> Math.round(x.getTotalAmount()))));
-//  twoMonthsAgo return data
+    //  twoMonthsAgo return data
-        YearMonth twoMonthsAgo = YearMonth.now().minusMonths(2);
+        YearMonth twoMonthsAgo = currentMonth.minusMonths(2);
         String twoMonthAgoStringValue = String.valueOf(twoMonthsAgo);
         LocalDateTime twoMonthsAgoStartDate = twoMonthsAgo.atDay(1).atStartOfDay();
         LocalDateTime twoMonthsAgoEndDate = twoMonthsAgo.atEndOfMonth().atTime(23, 59, 59);
         List<ReturnOrderInfoModel> twoMonthAgoReturnOrderInfoModels = returnOrderInfoRepository.selectAllByBetweenDate(twoMonthsAgoStartDate, twoMonthsAgoEndDate);
                 managerName = bmName;
+            }
             AST ast = astRepository.selectById(customRetailers.get(fofoId).getAstId());
-            PartnerType partnerTypeThisMonth = partnerTypeChangeService.getTypeOnMonth(fofoId, YearMonth.now());
+            PartnerType partnerTypeThisMonth = partnerTypeChangeService.getTypeOnMonth(fofoId, currentMonth);
 //            generate retaile detail
             BIRetailerModel biRetailerModel = new BIRetailerModel();
             biRetailerModel.setBmName(bmName);
             List<PartnerWiseActivatedNotBilledTotal> partnerWiseActivatedNotBilledMonthlyTotals = activatedImeiRepository.getTotalMonthlyActivatedNotBilled(fofoId,twoMonthsAgoStartDate);
             Map<YearMonth , PartnerWiseActivatedNotBilledTotal> partnerWiseActivatedNotBilledTotalMap = partnerWiseActivatedNotBilledMonthlyTotals.stream().collect(Collectors.toMap(x-> YearMonth.parse(x.getYearMonth()),x->x));
 //            this month secondary target
-            double currentSecondaryTarget =  monthlyTargetRepository.selectByDateAndFofoId(YearMonth.now(), fofoId) != null ? monthlyTargetRepository.selectByDateAndFofoId(YearMonth.now(), fofoId).getPurchaseTarget() : 0;
+            double currentSecondaryTarget =  monthlyTargetRepository.selectByDateAndFofoId(currentMonth, fofoId) != null ? monthlyTargetRepository.selectByDateAndFofoId(currentMonth, fofoId).getPurchaseTarget() : 0;
             long currentMonthReturn = currentMonthPartnerReturnOrderInfoModelMap.getOrDefault(fofoId, 0L) + currentMonthRtoRefundOrderMap.getOrDefault(fofoId, 0L);
             Map<Integer, Double> secondaryMtd = orderRepository.selectOrderValueBetweenBillingDatesGroupByFofoId(Arrays.asList(fofoId),
-                    startOfToday.withDayOfMonth(1), startOfToday.with(LocalTime.MAX).minusDays(1)).stream().collect(Collectors.toMap(x -> x.getId(), x -> x.getAmount()));
+                    startOfToday.withDayOfMonth(1), previousDay).stream().collect(Collectors.toMap(x -> x.getId(), x -> x.getAmount()));
             double secondaryAchievedMtd = secondaryMtd.getOrDefault(fofoId, 0.0);
             double currentMonthNetSecondary = secondaryAchievedMtd - currentMonthReturn;
 //          this month tertiary----------
             LocalDateTime now = LocalDateTime.now();
             double todaySale = fofoOrderItemRepository.selectSumMopGroupByRetailer(startOfToday, now, fofoId, false).get(fofoId);
-            double mtdSaleTillYesterDay = fofoOrderItemRepository.selectSumMopGroupByRetailer(startOfToday.withDayOfMonth(1), startOfToday, fofoId, false).get(fofoId);
+            double mtdSaleTillYesterDay = fofoOrderItemRepository.selectSumMopGroupByRetailer(startOfToday.withDayOfMonth(1), previousDay, fofoId, false).get(fofoId);
             double mtdSale = mtdSaleTillYesterDay;
 //            last month secondary target
             fofoTotalMtdTertiaryMap.put(fofoId,totalMtdTertiaryAmount);
             LOGGER.info("fofoBrandMtdTertiaryMap- {}",fofoBrandMtdTertiaryMap);
-            List<BrandWiseModel> brandWiseMtdSecondary = orderRepository.selectAllBilledByCategoryOrderGroupByBrandFofoId(fofoId, currentMonthStartDate,Arrays.asList(10006,10009,10010));
+            List<BrandWiseModel> brandWiseMtdSecondary = orderRepository.selectAllBilledByCategoryOrderGroupByBrandFofoId(fofoId, currentMonthStartDate,Arrays.asList(10006,10001));
             Map<String,Long> brandWiseMtdSecondaryMap = brandWiseMtdSecondary.stream().collect(Collectors.toMap(BrandWiseModel::getBrand,BrandWiseModel::getAmount));
             //retrunInfo
             List<BrandWiseReturnInfo> brandWiseReturnInfos = returnOrderInfoRepository.selectAllBrandWiseByBetweenDate(currentMonthStartDate,currentMonthEndDate.plusDays(1),fofoId);
             Map<String,Double> brandWiseReturnInfoMap = brandWiseReturnInfos.stream().collect(Collectors.toMap(BrandWiseReturnInfo::getBrand, x->x.getReturnAmount()));
             float poValue = partnerDailyInvestmentMap.get(fofoId) != null ?  partnerDailyInvestmentMap.get(fofoId).getUnbilledAmount() : 0f;
             float poAndBilledValue = (float) (currentMonthNetSecondary + poValue);
-            double todayRequiredDrr = rbmTargetService.calculateFofoIdTodayTarget(fofoId, currentMonthNetSecondary,LocalDate.now());
+            double todayRequiredDrr = rbmTargetService.calculateFofoIdTodayTarget(fofoId, currentMonthNetSecondary,startOfToday.toLocalDate());
-            double monthDay1Drr = rbmTargetService.calculateFofoIdTodayTarget(fofoId,0d,YearMonth.now().atDay(1));
+            double monthDay1Drr = rbmTargetService.calculateFofoIdTodayTarget(fofoId,0d,currentMonth.atDay(1));
             double gotDrrPercent = (todayRequiredDrr / monthDay1Drr) * 100;
             long drrPercentDisplay = Math.round(Math.abs(gotDrrPercent));
             LocalDateTime walletCreationDate = userWalletHistoryRepository.selectFirstCreatedDate(fofoId);
             BIRetailerModel retailer = entry.getValue();
             Map<YearMonth, BiSecondaryModel> monthlyData = allRetailerMonthlyData.get(fofoId);
-            BiSecondaryModel current = monthlyData.getOrDefault(YearMonth.now(), new BiSecondaryModel(0,0,0,0,0,0,0));
+            BiSecondaryModel current = monthlyData.getOrDefault(currentMonth, new BiSecondaryModel(0,0,0,0,0,0,0));
-            BiSecondaryModel last = monthlyData.getOrDefault(YearMonth.now().minusMonths(1), new BiSecondaryModel(0,0,0,0,0,0,0));
+            BiSecondaryModel last = monthlyData.getOrDefault(currentMonth.minusMonths(1), new BiSecondaryModel(0,0,0,0,0,0,0));
-            BiSecondaryModel twoAgo = monthlyData.getOrDefault(YearMonth.now().minusMonths(2), new BiSecondaryModel(0,0,0,0,0,0,0));
+            BiSecondaryModel twoAgo = monthlyData.getOrDefault(currentMonth.minusMonths(2), new BiSecondaryModel(0,0,0,0,0,0,0));
             List<Object> row = new ArrayList<>();
             row.addAll(Arrays.asList(
                     assessmentMap.get(fofoId),zeroBillingMap.get(fofoId),billingNeededMap.get(fofoId),countAMap.get(fofoId),
                     retailer.getBmName(),fofoId ,"https://partners.smartdukaan.com/partnerPerformance?fofoId="+fofoId,walletCreationDate,user.getCreateTimestamp(), retailer.getCode(), retailer.getArea(), retailer.getCity(),  retailer.getStoreName(), retailer.getStatus(),

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasksTest.java – Rev 34738 → 34741