Subversion Repositories SmartDukaan

Rev

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

Rev 32776 Rev 32905
Line 737... Line 737...
737
                Map<Integer, String> schemeRegionMap = schemeRegionList.stream().collect(Collectors.groupingBy(x -> x.getSchemeId(), Collectors.mapping(y -> regionRepository.selectById(y.getRegionId()).getName(), Collectors.joining(" ,"))));
737
                Map<Integer, String> schemeRegionMap = schemeRegionList.stream().collect(Collectors.groupingBy(x -> x.getSchemeId(), Collectors.mapping(y -> regionRepository.selectById(y.getRegionId()).getName(), Collectors.joining(" ,"))));
738
                model.addAttribute("schemeRegionMap", schemeRegionMap);
738
                model.addAttribute("schemeRegionMap", schemeRegionMap);
739
                return "schemes";
739
                return "schemes";
740
            } else {
740
            } else {
741
                PriceCircularModel priceCircularModel = priceCircularService.getPriceCircularByOffer(loginDetails.getFofoId(), Arrays.asList(searchModel), date);
741
                PriceCircularModel priceCircularModel = priceCircularService.getPriceCircularByOffer(loginDetails.getFofoId(), Arrays.asList(searchModel), date);
-
 
742
                FofoStore fs = fofoStoreRepository.selectByRetailerId(loginDetails.getFofoId());
742
                priceDropController.getPriceCircularView(priceCircularModel, model);
743
                priceDropController.getPriceCircularView(priceCircularModel, model,fs.getCode());
743
            }
744
            }
744
 
745
 
745
        } else if (org.apache.commons.lang3.StringUtils.isNotEmpty(searchImei)) {
746
        } else if (org.apache.commons.lang3.StringUtils.isNotEmpty(searchImei)) {
746
 
747
 
747
            LOGGER.info("searchImei" + searchImei);
748
            LOGGER.info("searchImei" + searchImei);