Subversion Repositories SmartDukaan

Rev

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

Rev 32844 Rev 32905
Line 8... Line 8...
8
import com.spice.profitmandi.common.util.FileUtil;
8
import com.spice.profitmandi.common.util.FileUtil;
9
import com.spice.profitmandi.common.util.FormattingUtils;
9
import com.spice.profitmandi.common.util.FormattingUtils;
10
import com.spice.profitmandi.common.util.Utils;
10
import com.spice.profitmandi.common.util.Utils;
11
import com.spice.profitmandi.dao.entity.catalog.Item;
11
import com.spice.profitmandi.dao.entity.catalog.Item;
12
import com.spice.profitmandi.dao.entity.catalog.TagListing;
12
import com.spice.profitmandi.dao.entity.catalog.TagListing;
-
 
13
import com.spice.profitmandi.dao.entity.fofo.FofoStore;
13
import com.spice.profitmandi.dao.entity.inventory.ItemPricingHistory;
14
import com.spice.profitmandi.dao.entity.inventory.ItemPricingHistory;
14
import com.spice.profitmandi.dao.entity.inventory.VendorItemPricing;
15
import com.spice.profitmandi.dao.entity.inventory.VendorItemPricing;
15
import com.spice.profitmandi.dao.entity.transaction.PriceDrop;
16
import com.spice.profitmandi.dao.entity.transaction.PriceDrop;
16
import com.spice.profitmandi.dao.entity.transaction.PriceDropIMEI;
17
import com.spice.profitmandi.dao.entity.transaction.PriceDropIMEI;
17
import com.spice.profitmandi.dao.enumuration.catalog.SchemeType;
18
import com.spice.profitmandi.dao.enumuration.catalog.SchemeType;
Line 576... Line 577...
576
        LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
577
        LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
577
        if (fofoId > 0 && roleManager.isAdmin(loginDetails.getRoleIds())) {
578
        if (fofoId > 0 && roleManager.isAdmin(loginDetails.getRoleIds())) {
578
        } else {
579
        } else {
579
            fofoId = loginDetails.getFofoId();
580
            fofoId = loginDetails.getFofoId();
580
        }
581
        }
-
 
582
        FofoStore fs = fofoStoreRepository.selectByRetailerId(fofoId);
-
 
583
 
581
        //.minusDays(2)
584
        //.minusDays(2)
582
        PriceCircularModel priceCircular = priceCircularService.getPriceCircularByOffer(fofoId, brand, LocalDate.now());
585
        PriceCircularModel priceCircular = priceCircularService.getPriceCircularByOffer(fofoId, brand, LocalDate.now());
583
        return this.getPriceCircularView(priceCircular, model);
586
        return this.getPriceCircularView(priceCircular, model,fs.getCode());
584
    }
587
    }
585
 
588
 
586
    public String getPriceCircularView(PriceCircularModel priceCircular, Model model) throws ProfitMandiBusinessException {
589
    public String getPriceCircularView( PriceCircularModel priceCircular, Model model, String partnerCode ) throws ProfitMandiBusinessException {
587
        List<String> schemeHeaders = new ArrayList<>(this.getSchemeHeaders(priceCircular));
590
        List<String> schemeHeaders = new ArrayList<>(this.getSchemeHeaders(priceCircular));
588
        List<String> allMargins = ALL_MARGINS.stream().filter(x -> schemeHeaders.contains(x)).collect(Collectors.toList());
591
        List<String> allMargins = ALL_MARGINS.stream().filter(x -> schemeHeaders.contains(x)).collect(Collectors.toList());
589
        List<String> sellins = SELLINS.stream().filter(x -> allMargins.contains(x)).collect(Collectors.toList());
592
        List<String> sellins = SELLINS.stream().filter(x -> allMargins.contains(x)).collect(Collectors.toList());
590
        List<String> sellouts = SELLOUTS.stream().filter(x -> allMargins.contains(x)).collect(Collectors.toList());
593
        List<String> sellouts = SELLOUTS.stream().filter(x -> allMargins.contains(x)).collect(Collectors.toList());
591
        LOGGER.info("Scheme Headers = {}", schemeHeaders);
594
        LOGGER.info("Scheme Headers = {}", schemeHeaders);
Line 597... Line 600...
597
        model.addAttribute("sellins", sellins);
600
        model.addAttribute("sellins", sellins);
598
        model.addAttribute("sellouts", sellouts);
601
        model.addAttribute("sellouts", sellouts);
599
        model.addAttribute("offers", priceCircular.getOffers());
602
        model.addAttribute("offers", priceCircular.getOffers());
600
        model.addAttribute("upgradeOffer", priceCircular.isUpgradeOffer());
603
        model.addAttribute("upgradeOffer", priceCircular.isUpgradeOffer());
601
        model.addAttribute("mvcResponseSender", mvcResponseSender);
604
        model.addAttribute("mvcResponseSender", mvcResponseSender);
-
 
605
        model.addAttribute("partnerCode", partnerCode);
602
        return "price-circular-table";
606
        return "price-circular-table";
603
    }
607
    }
604
 
608
 
605
    private Set<String> getSchemeHeaders(PriceCircularModel priceCircular) {
609
    private Set<String> getSchemeHeaders(PriceCircularModel priceCircular) {
606
        Set<String> schemeHeaders = new HashSet<>();
610
        Set<String> schemeHeaders = new HashSet<>();