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

         params.put("type", "INVESTMENT");
         List<EvaluateSchemeInvestmentPayoutModel> evaluateSchemeInvestmentPayouts = reporticoService.getReports(
                 EvaluateSchemeInvestmentPayoutModel.class, ReporticoProject.FOCO, "schemepayout.xml", params);
-        LOGGER.info("reportResponse {}", evaluateSchemeInvestmentPayouts);
         int referenceId = Integer.parseInt(FormattingUtils.getYearMonth(startOfPreviousMonth.atStartOfDay()));
         List<PartnerDailyInvestment> partnerDailyInvestments = partnerDailyInvestmentRepository
                 .selectAll(startOfPreviousMonth, lastOfPreviousMonth);
         Map<Integer, Long> investmentMaintainedDaysMap = partnerDailyInvestments.stream()
             long investmentMaintainedDays = investmentMaintainedDaysMap.get(esip.getFofoId()) == null ? 0
                     : investmentMaintainedDaysMap.get(esip.getFofoId());
             esip.setInvestmentDays(investmentMaintainedDays);
-            float processAmount = esip.getPaidAmount() / 2;
+            float processAmount = esip.getProcessAmount();
+            if (investmentMaintainedDays < 8) {
+                processAmount = 0;
+            } else if (investmentMaintainedDays < 12) {
+                processAmount = processAmount / 2;
+            }
             esip.setProcessAmount(processAmount);
             rows.add(Arrays.asList(esip.getCode(), esip.getStoreName(), esip.getFofoId(), esip.getItemId(),
                     esip.getBrand(), esip.getModelName(), esip.getModelNumber(), esip.getColor(), esip.getSchemeInDp(),
         LOGGER.info("allImeiList" + allImeiList);
         LOGGER.info("lmcm" + lastmonthCategoryUpgradeMargin);
         List<LastMonthFrontEndImeiModel> lastMonthFrontEndImeis = schemeInOutRepository
                 .selectLastMonthFrontEndByImei(loginDetails.getFofoId(), allImeiList);
+        Map<String, LastMonthFrontEndImeiModel> soldMap = lastMonthFrontEndImeis.stream().collect(Collectors.toMap(x -> x.getImei(), x -> x));
         List<LastMonthImeiModel> lastMonthPurchaseInImeis = schemeInOutRepository
                 .selectLastMonthPurchaseInByImei(loginDetails.getFofoId(), allImeiList);
         List<LastMonthImeiModel> lastMonthCreditedImeis = schemeInOutRepository
                     .collect(Collectors.summingDouble(x -> x.getValue()));
             imeiWiseIncomeMapOfMap.get(entry.getKey())
                     .setTotalIncome(totalAmount + imeiWiseIncomeMapOfMap.get(entry.getKey()).getTotalIncome());
+        }
-        lastMonthFrontEndImeis.stream().forEach(x -> {
+        /*lastMonthFrontEndImeis.stream().forEach(x -> {
             if (imeiWiseIncomeMapOfMap.containsKey(x.getImei())) {
                 ImeiWiseIncomePairAndMapModel imeiWiseIncomePairAndMapModel = imeiWiseIncomeMapOfMap
                         .get(x.getImei());
                 imeiWiseIncomePairAndMapModel.setTotalIncome(imeiWiseIncomePairAndMapModel.getTotalIncome() + x.getAmount());
                 imeiWiseIncomePairAndMapModel.setFrontMargin(x.getAmount());
+            }
-        });
+        });*/
         //Imeis for pending activation
         lastMonthCreditedImeis.stream().filter(x -> x.getStatus().equals(SchemePayoutStatus.PENDING)).forEach(x -> {
             if (!imeiWiseIncomeMapOfMap.containsKey(x.getImei())) {
-                ImeiWiseIncomePairAndMapModel imeiWiseIncomePairAndMapModel = new ImeiWiseIncomePairAndMapModel();
+                ImeiWiseIncomePairAndMapModel imeiWiseIncomePairAndMapModel = new ImeiWiseIncomePairAndMapModel(x.getImei(), null, null);
-                imeiWiseIncomePairAndMapModel.setSerialNumber(x.getImei());
+            }
             ImeiWiseIncomePairAndMapModel imeiWiseIncomePairAndMapModel = imeiWiseIncomeMapOfMap
                     .get(x.getImei());
             imeiWiseIncomePairAndMapModel.setSaleDate(x.getCreateTimeStamp().toLocalDate());
             imeiWiseIncomePairAndMapModel.setTotalIncome(x.getPendingSaleAmount() + imeiWiseIncomePairAndMapModel.getTotalIncome());
         });
+        lastMonthFrontEndImeis.stream().forEach(lastMonthFrontEndImeiModel -> {
+            if (imeiWiseIncomeMapOfMap.containsKey(lastMonthFrontEndImeiModel.getImei())) {
+                lastMonthFrontEndImeiModel.setNlc(lastMonthFrontEndImeiModel.getDp()
+                        - (float) imeiWiseIncomeMapOfMap.get(lastMonthFrontEndImeiModel.getImei()).getTotalIncome());
+                lastMonthFrontEndImeiModel.setNetIncome(lastMonthFrontEndImeiModel.getSellingPrice() - lastMonthFrontEndImeiModel.getNlc());
+            }
+        });
         model.addAttribute("imeiWisePendingSaleAmount", imeiWisePendingSaleAmount);
         model.addAttribute("month", month);
         model.addAttribute("purchaseList", purchaseList);
         model.addAttribute("saleList", saleList);
         model.addAttribute("lastMonthPurchaseInMapPairMap", lastMonthPurchaseInMapPairMap);
         model.addAttribute("lastMonthCreditedMapPairMap", lastMonthCreditedMapPairMap);
         model.addAttribute("imeiWiseIncomeMapOfMap", imeiWiseIncomeMapOfMap);
         model.addAttribute("lastmonthCategoryUpgradeMargin", lastmonthCategoryUpgradeMargin);
+        model.addAttribute("soldMap", soldMap);
         model.addAttribute("allOfferPayoutImeiIncomeModels", allOfferPayoutImeiIncomeModels);
         //model.addAttribute("iimeiSaleDateMap", imeiSaleDateMap);
         //model.addAttribute("imeiPurchaseDateMap", imeiPurchaseDateMap);
         return "last-month-imei-wise-income";

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java – Rev 31352 → 31379