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

+    }
     @RequestMapping(value = "/addItemToScheme", method = RequestMethod.POST)
     public String updateScheme(HttpServletRequest request, @RequestBody SchemeItems schemeItems, Model model)
             throws Exception {
+        LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
         for (int schemeId : schemeItems.getSchemeIds()) {
-            List<Integer> catalogIds = schemeItemRepository.selectCatalogIdsBySchemeId(schemeId);
+            Scheme scheme = schemeRepository.selectById(schemeId);
-            if (schemeRepository.selectById(schemeId) != null)
+            if (scheme != null) {
                 for (int catalogId : schemeItems.getCatalogIds()) {
-                    if (!(catalogIds.contains(catalogId))) {
+                    // Use dates from request if provided, else default to scheme's window
-                        SchemeItem si = new SchemeItem();
+                    LocalDateTime startDate = schemeItems.getStartDate() != null ? schemeItems.getStartDate() : scheme.getStartDateTime();
-                        si.setCatalogId(catalogId);
-                        si.setSchemeId(schemeId);
-                        si.setCreateTimestamp(LocalDateTime.now());
+                    LocalDateTime endDate = schemeItems.getEndDate() != null ? schemeItems.getEndDate() : scheme.getEndDateTime();
-                        try {
+                    try {
-                            schemeItemRepository.persist(si);
+                        schemeService.addSchemeItemWithDates(schemeId, catalogId, startDate, endDate, loginDetails.getFofoId());
-                        } catch (Exception e) {
+                    } catch (ProfitMandiBusinessException e) {
-                            LOGGER.info("Scheme already exist");
-                        }
+                        throw e;
-                        model.addAttribute("response1", mvcResponseSender.createResponseString(true));
-                    } else {
+                    } catch (Exception e) {
-                        throw new ProfitMandiBusinessException("Catalog exist for scheme",
-                                "SchemeId= " + schemeId + ", CatalogId= " + catalogId, "Catalog exist for scheme");
+                        LOGGER.info("Scheme already exist for schemeId={}, catalogId={}", schemeId, catalogId);
+                    }
+                    model.addAttribute("response1", mvcResponseSender.createResponseString(true));
+                }
+            }
+        }
         return "response";
+    }
     @RequestMapping(value = "/createScheme", method = RequestMethod.GET)
         return "scheme-imei-results-modal";
+    }
     /**
+     * Scheme-only net-margin modal for an IMEI, priced at the IMEI's
+     * purchase-billed date (the date schemes were locked in when the
+     * partner was billed-in). Offers are intentionally excluded.
+     */
+    @RequestMapping(value = "/getImeiNetMarginModal", method = RequestMethod.GET)
+    public String getImeiNetMarginModal(HttpServletRequest request,
+                                        @RequestParam(defaultValue = "") String searchImei,
+                                        @RequestParam int fofoId,
+                                        Model model) throws ProfitMandiBusinessException {
+        model.addAttribute("searchImei", searchImei);
+        model.addAttribute("fofoId", fofoId);
+        if (StringUtils.isBlank(searchImei)) {
+            model.addAttribute("errorMessage", "Please enter an IMEI.");
+            return "imei-net-margin-modal";
+        }
+        InventoryItem inventoryItem = inventoryItemRepository.selectBySerialNumber(searchImei);
+        if (inventoryItem == null) {
+            model.addAttribute("errorMessage", "IMEI not found.");
+            return "imei-net-margin-modal";
+        }
+        if (inventoryItem.getFofoId() != fofoId) {
+            model.addAttribute("errorMessage", "IMEI not found for this partner.");
+            return "imei-net-margin-modal";
+        }
+        List<ItemPurchaseSummaryModel> purchaseSummaries = inventoryItemRepository
+                .selectPurchaseSummary(Arrays.asList(inventoryItem.getId()));
+        if (purchaseSummaries.isEmpty() || purchaseSummaries.get(0).getInvoiceDate() == null) {
+            model.addAttribute("errorMessage", "IMEI not yet billed-in — margin unavailable.");
+            return "imei-net-margin-modal";
+        }
+        ItemPurchaseSummaryModel purchaseSummary = purchaseSummaries.get(0);
+        LocalDate billedDate = purchaseSummary.getInvoiceDate().toLocalDate();
+        Item item = purchaseSummary.getItem() != null
+                ? purchaseSummary.getItem()
+                : itemRepository.selectById(inventoryItem.getItemId());
+        int catalogId = item.getCatalogItemId();
+        PriceCircularModel priceCircularModel = priceCircularService
+                .getPriceCircularByOffer(fofoId, Arrays.asList(catalogId), billedDate);
+        com.spice.profitmandi.service.pricecircular.PriceCircularItemModelNew itemModel = null;
+        if (priceCircularModel != null && priceCircularModel.getPriceCircularItemModelNews() != null) {
+            itemModel = priceCircularModel.getPriceCircularItemModelNews().stream()
+                    .filter(x -> x.getCatalogId() == catalogId)
+                    .findFirst().orElse(null);
+        }
+        // Use the same DP basis as SchemeServiceImpl.createSchemeInOut →
+        // PriceCircularService.getPayouts: actual purchase price stamped on
+        // inventory_item at GRN time, minus any price-drop credited against
+        // it. This is what the persisted scheme_in_out.amount values were
+        // computed against.
+        double purchasePrice = inventoryItem.getUnitPrice();
+        double priceDropAmount = Math.max(0d, inventoryItem.getPriceDropAmount());
+        double effectiveDP = purchasePrice - priceDropAmount;
+        // Pull per-IMEI price-drop history for reference display.
+        List<PriceDropIMEI> priceDropImeis = priceDropIMEIRepository
+                .selectByFofoIdImei(fofoId, searchImei);
+        if (priceDropImeis != null && !priceDropImeis.isEmpty()) {
+            List<Integer> priceDropIds = priceDropImeis.stream()
+                    .map(PriceDropIMEI::getPriceDropId).distinct().collect(Collectors.toList());
+            Map<Integer, PriceDrop> priceDropMap = priceDropRepository.selectByIds(priceDropIds)
+                    .stream().collect(Collectors.toMap(PriceDrop::getId, x -> x));
+            for (PriceDropIMEI pdi : priceDropImeis) {
+                pdi.setPriceDrop(priceDropMap.get(pdi.getPriceDropId()));
+            }
+        }
+        model.addAttribute("imei", searchImei);
+        model.addAttribute("billedDate", billedDate);
+        model.addAttribute("invoiceNumber", purchaseSummary.getInvoiceNumber());
+        model.addAttribute("modelName", item.getItemDescriptionNoColor());
+        model.addAttribute("purchasePrice", fmt2(purchasePrice));
+        model.addAttribute("priceDropAmount", fmt2(priceDropAmount));
+        model.addAttribute("hasPriceDrop", priceDropAmount > 0d);
+        model.addAttribute("priceDropImeis", priceDropImeis == null ? Collections.emptyList() : priceDropImeis);
+        if (itemModel == null || itemModel.getSchemeSummaryModels() == null
+                || itemModel.getSchemeSummaryModels().isEmpty()) {
+            model.addAttribute("noSchemes", true);
+            model.addAttribute("dp", fmt2(effectiveDP));
+            model.addAttribute("schemeSummaryModels", Collections.emptyList());
+            model.addAttribute("contributionMap", Collections.emptyMap());
+            model.addAttribute("rateMap", Collections.emptyMap());
+            model.addAttribute("fixedSchemeAmount", fmt2(0d));
+            model.addAttribute("percentageSchemeAmount", fmt2(0d));
+            model.addAttribute("nlc", fmt2(effectiveDP));
+            model.addAttribute("netMargin", fmt2(0d));
+            return "imei-net-margin-modal";
+        }
+        double fixedTotal = itemModel.getFixedSchemeAmount();
+        double percentageTotal = itemModel.getPercentageSchemeAmount();
+        // Recompute NLC against effectiveDP — do NOT reuse
+        // PriceCircularItemModelNew.getNlc() because it is derived from the
+        // current TagListing list-DP, not the partner's actual purchase price.
+        double nlc = (effectiveDP - fixedTotal) / (1d + percentageTotal / 100d);
+        double netMargin = effectiveDP - nlc;
+        Map<Integer, String> contributionMap = new HashMap<>();
+        Map<Integer, String> rateMap = new HashMap<>();
+        for (com.spice.profitmandi.service.pricecircular.SchemeSummaryModel ssm : itemModel.getSchemeSummaryModels()) {
+            double contribution;
+            if (ssm.getAmountType() == AmountType.FIXED) {
+                contribution = ssm.getAmount() == null ? 0d : ssm.getAmount();
+            } else if (ssm.getAmountType() == AmountType.PERCENTAGE && percentageTotal > 0) {
+                double pct = ssm.getAmount() == null ? 0d : ssm.getAmount();
+                contribution = effectiveDP * (pct / (100d + percentageTotal));
+            } else {
+                contribution = 0d;
+            }
+            contributionMap.put(ssm.getSchemeId(), fmt2(contribution));
+            double rate = ssm.getAmount() == null ? 0d : ssm.getAmount();
+            String rateStr = ssm.getAmountType() == AmountType.PERCENTAGE
+                    ? fmt2(rate) + "%"
+                    : "&#8377; " + fmt2(rate);
+            rateMap.put(ssm.getSchemeId(), rateStr);
+        }
+        model.addAttribute("noSchemes", false);
+        model.addAttribute("dp", fmt2(effectiveDP));
+        model.addAttribute("schemeSummaryModels", itemModel.getSchemeSummaryModels());
+        model.addAttribute("contributionMap", contributionMap);
+        model.addAttribute("rateMap", rateMap);
+        model.addAttribute("fixedSchemeAmount", fmt2(fixedTotal));
+        model.addAttribute("percentageSchemeAmount", fmt2(percentageTotal));
+        model.addAttribute("nlc", fmt2(nlc));
+        model.addAttribute("netMargin", fmt2(netMargin));
+        return "imei-net-margin-modal";
+    }
+    private static String fmt2(double v) {
+        return String.format(Locale.ENGLISH, "%.2f", v);
+    }
+    /**
      * New endpoint for modal model-wise margin search
      * Accepts fofoId as parameter to work for both admin and partner views
      */
     @RequestMapping(value = "/getModelMarginModal", method = RequestMethod.GET)
     public String getModelMarginModal(HttpServletRequest request,
             throws ProfitMandiBusinessException {
         LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
         boolean fullAccess = this.getAccess(loginDetails.getEmailId());
         Scheme scheme = schemeService.getSchemeById(schemeId);
+        List<SchemeItem> schemeItems = schemeItemRepository.selectBySchemeId(schemeId);
+        List<Category> categories = categoryRepository.selectByIds(categoryIds);
+        categories = categories.stream().sorted(Comparator.comparing(Category::getId)).collect(Collectors.toList());
         model.addAttribute("fullAccess", fullAccess);
         model.addAttribute("scheme", scheme);
+        model.addAttribute("schemeItems", schemeItems);
+        model.addAttribute("categories", categories);
         model.addAttribute("isAdmin", roleManager.isAdmin(loginDetails.getRoleIds()));
         return "scheme-details";
+    }
     @RequestMapping(value = "/activeSchemeById", method = RequestMethod.PUT)
             throws ProfitMandiBusinessException {
         schemeService.expireSchemeById(schemeId, expiryTimestamp);
         return getDefaultSchemes(request, model);
+    }
+    @RequestMapping(value = "/scheme/item/window", method = RequestMethod.PUT)
+    public ResponseEntity<?> updateSchemeItemWindow(HttpServletRequest request,
+                                                    @RequestParam(name = "schemeItemId") long schemeItemId,
+                                                    @RequestParam(name = "startDate") LocalDateTime startDate,
+                                                    @RequestParam(name = "endDate") LocalDateTime endDate)
+            throws ProfitMandiBusinessException {
+        LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
+        schemeService.updateSchemeItemWindow(schemeItemId, startDate, endDate, loginDetails.getFofoId());
+        return responseSender.ok("Scheme item window updated");
+    }
+    @RequestMapping(value = "/scheme/item/add", method = RequestMethod.POST)
+    public ResponseEntity<?> addSchemeItemWithDates(HttpServletRequest request,
+                                                    @RequestParam(name = "schemeId") int schemeId,
+                                                    @RequestParam(name = "catalogId") int catalogId,
+                                                    @RequestParam(name = "startDate") LocalDateTime startDate,
+                                                    @RequestParam(name = "endDate") LocalDateTime endDate)
+            throws ProfitMandiBusinessException {
+        LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
+        SchemeItem item = schemeService.addSchemeItemWithDates(schemeId, catalogId, startDate, endDate, loginDetails.getFofoId());
+        return responseSender.ok(item);
+    }
+    @RequestMapping(value = "/scheme/items", method = RequestMethod.GET)
+    public ResponseEntity<?> getSchemeItems(@RequestParam(name = "schemeId") int schemeId)
+            throws ProfitMandiBusinessException {
+        List<SchemeItem> items = schemeItemRepository.selectBySchemeId(schemeId);
+        return responseSender.ok(items);
+    }
     @RequestMapping(value = "/getSchemesJson", method = RequestMethod.GET)
     public ResponseEntity<?> getSchemesJson(HttpServletRequest request,
                                             @RequestParam(name = "offset", defaultValue = "0") int offset,
                                             @RequestParam(name = "limit", defaultValue = "10") int limit, Model model)
             throws ProfitMandiBusinessException {

Subversion Repositories SmartDukaan

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