Subversion Repositories SmartDukaan

Rev

Rev 35343 | Rev 35345 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 35343 Rev 35344
Line 567... Line 567...
567
                .collect(Collectors.toList());
567
                .collect(Collectors.toList());
568
 
568
 
569
        if (!matchingVariantNames.isEmpty()) {
569
        if (!matchingVariantNames.isEmpty()) {
570
            for (SuperCatalogMapping matchingVariant : matchingVariantNames) {
570
            for (SuperCatalogMapping matchingVariant : matchingVariantNames) {
571
                logger.info("matchingVariantName: "+matchingVariant);
571
                logger.info("matchingVariantName: "+matchingVariant);
-
 
572
                ItemTagModel itemTagModel = itemTagModels.stream().filter(tag -> tag.getItem().getCatalogItemId() == matchingVariant.getCatalogId()).findFirst().orElse(null);
572
                   if (matchingVariant != null && matchingVariant.getVariantName() != null && itemTagModels.stream().anyMatch(tag -> tag.getItem().getCatalogItemId() == matchingVariant.getCatalogId() && tag.getTagListing().isActive())) {
573
                   if (matchingVariant != null && matchingVariant.getVariantName() != null && itemTagModels.stream().anyMatch(tag -> tag.getItem().getCatalogItemId() == matchingVariant.getCatalogId() && tag.getTagListing().isActive())) {
573
                    Map<String, Object> variantObj = new HashMap<>();
574
                    Map<String, Object> variantObj = new HashMap<>();
574
                    variantObj.put("catalogId", matchingVariant.getCatalogId());
575
                    variantObj.put("catalogId", matchingVariant.getCatalogId());
575
                    variantObj.put("variantName", matchingVariant.getVariantName());
576
                    variantObj.put("variantName", matchingVariant.getVariantName());
-
 
577
                    variantObj.put("mrp", itemTagModel != null ? itemTagModel.getTagListing().getMrp() : 0.0);
-
 
578
                    variantObj.put("sellingPrice", itemTagModel != null ? itemTagModel.getTagListing().getSellingPrice() : 0.0);
576
                    variantList.add(variantObj);
579
                    variantList.add(variantObj);
577
                }
580
                }
578
            }
581
            }
579
        }
582
        }
580
 
583