Subversion Repositories SmartDukaan

Rev

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

Rev 34024 Rev 34186
Line 835... Line 835...
835
 
835
 
836
        if (!catalogFavourites.isEmpty()) {
836
        if (!catalogFavourites.isEmpty()) {
837
            catalogFavourites.stream().collect(Collectors.toMap(x -> x.getCatalogId(), x -> x));
837
            catalogFavourites.stream().collect(Collectors.toMap(x -> x.getCatalogId(), x -> x));
838
        }*/
838
        }*/
839
 
839
 
-
 
840
        logger.info("getCatalogResponse docs: {}",docs);
-
 
841
 
840
        for (int i = 0; i < docs.length(); i++) {
842
        for (int i = 0; i < docs.length(); i++) {
841
            Map<Integer, FofoAvailabilityInfo> fofoAvailabilityInfoMap = new HashMap<>();
843
            Map<Integer, FofoAvailabilityInfo> fofoAvailabilityInfoMap = new HashMap<>();
842
            JSONObject doc = docs.getJSONObject(i);
844
            JSONObject doc = docs.getJSONObject(i);
843
            FofoCatalogResponse fofoCatalogResponse = new FofoCatalogResponse();
845
            FofoCatalogResponse fofoCatalogResponse = new FofoCatalogResponse();
844
            fofoCatalogResponse.setCatalogId(doc.getInt("catalogId_i"));
846
            fofoCatalogResponse.setCatalogId(doc.getInt("catalogId_i"));
Line 1007... Line 1009...
1007
                if (fdiAnyColour != null) {
1009
                if (fdiAnyColour != null) {
1008
                    fdiAnyColour.setColorClass(modelColorClass);
1010
                    fdiAnyColour.setColorClass(modelColorClass);
1009
                }
1011
                }
1010
                fofoCatalogResponse.setInStock(!modelColorClass.equals("grey"));
1012
                fofoCatalogResponse.setInStock(!modelColorClass.equals("grey"));
1011
            }
1013
            }
-
 
1014
            logger.info("fofoCatalogResponse: {}",fofoCatalogResponse);
1012
            if (fofoAvailabilityInfoMap.values().size() > 0) {
1015
            if (fofoAvailabilityInfoMap.values().size() > 0) {
1013
                List<FofoAvailabilityInfo> availabilityList = fofoAvailabilityInfoMap.values().stream().sorted(Comparator.comparing(FofoAvailabilityInfo::getAvailability).reversed()).collect(Collectors.toList());
1016
                List<FofoAvailabilityInfo> availabilityList = fofoAvailabilityInfoMap.values().stream().sorted(Comparator.comparing(FofoAvailabilityInfo::getAvailability).reversed()).collect(Collectors.toList());
1014
                fofoCatalogResponse.setItems(availabilityList);
1017
                fofoCatalogResponse.setItems(availabilityList);
1015
                if (priceCircularItemModelMap.containsKey(fofoCatalogResponse.getCatalogId())) {
1018
                if (priceCircularItemModelMap.containsKey(fofoCatalogResponse.getCatalogId())) {
1016
                    PriceCircularItemModelNew priceCircularItemModel = priceCircularItemModelMap.get(fofoCatalogResponse.getCatalogId());
1019
                    PriceCircularItemModelNew priceCircularItemModel = priceCircularItemModelMap.get(fofoCatalogResponse.getCatalogId());
Line 1033... Line 1036...
1033
                    fofoCatalogResponse.setPriceCircularItemModel(priceCircularItemModel);
1036
                    fofoCatalogResponse.setPriceCircularItemModel(priceCircularItemModel);
1034
                }
1037
                }
1035
                dealResponse.add(fofoCatalogResponse);
1038
                dealResponse.add(fofoCatalogResponse);
1036
            }
1039
            }
1037
        }
1040
        }
-
 
1041
        logger.info("dealResponse: {}",dealResponse);
1038
        return dealResponse;
1042
        return dealResponse;
1039
 
1043
 
1040
    }
1044
    }
1041
 
1045
 
1042
    private List<FofoCatalogResponse> getCatalogSingleSkuResponse(JSONArray
1046
    private List<FofoCatalogResponse> getCatalogSingleSkuResponse(JSONArray