Subversion Repositories SmartDukaan

Rev

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

Rev 35886 Rev 35888
Line 86... Line 86...
86
    @Autowired
86
    @Autowired
87
    private ResponseSender responseSender;
87
    private ResponseSender responseSender;
88
    @Autowired
88
    @Autowired
89
    private ViewResolver viewResolver;
89
    private ViewResolver viewResolver;
90
    @Autowired
90
    @Autowired
91
    private OfferPartnerRepository offerPartnerRepository;
-
 
92
    @Autowired
-
 
93
    private ItemRepository itemRepository;
91
    private ItemRepository itemRepository;
94
    @Autowired
92
    @Autowired
95
    private MVCResponseSender mvcResponseSender;
93
    private MVCResponseSender mvcResponseSender;
96
    @Autowired
94
    @Autowired
97
    private RetailerService retailerService;
95
    private RetailerService retailerService;
Line 604... Line 602...
604
        LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
602
        LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
605
        if (!roleManager.isAdmin(loginDetails.getRoleIds())) {
603
        if (!roleManager.isAdmin(loginDetails.getRoleIds())) {
606
            throw new ProfitMandiBusinessException("Unauthorized", "Unauthorized", "");
604
            throw new ProfitMandiBusinessException("Unauthorized", "Unauthorized", "");
607
        }
605
        }
608
        CreateOfferRequest offer = offerService.getOffer(0, offerId);
606
        CreateOfferRequest offer = offerService.getOffer(0, offerId);
609
        List<com.spice.profitmandi.dao.entity.catalog.OfferPartner> offerPartners = offerPartnerRepository.selectByOfferId(offerId);
-
 
610
        Map<Integer, CustomRetailer> customRetailerMap = retailerService.getAllFofoRetailers();
607
        Map<Integer, CustomRetailer> customRetailerMap = retailerService.getAllFofoRetailers();
611
 
608
 
-
 
609
        // Partners are stored in partner_criteria JSON, not in offer_partners table
-
 
610
        List<Integer> partnerFofoIds = offer.getPartnerCriteria() != null
-
 
611
                ? offer.getPartnerCriteria().getFofoIds() : new ArrayList<>();
-
 
612
        if (partnerFofoIds == null) partnerFofoIds = new ArrayList<>();
-
 
613
 
612
        List<Integer> allFofoIds = fofoStoreRepository.selectActiveStores().stream()
614
        List<Integer> allFofoIds = fofoStoreRepository.selectActiveStores().stream()
613
                .map(x -> x.getId()).collect(Collectors.toList());
615
                .map(x -> x.getId()).collect(Collectors.toList());
614
        Map<Integer, CustomRetailer> allRetailersMap = allFofoIds.stream()
616
        Map<Integer, CustomRetailer> allRetailersMap = allFofoIds.stream()
615
                .map(id -> customRetailerMap.get(id))
617
                .map(id -> customRetailerMap.get(id))
616
                .filter(x -> x != null)
618
                .filter(x -> x != null)
617
                .collect(Collectors.toMap(CustomRetailer::getPartnerId, x -> x));
619
                .collect(Collectors.toMap(CustomRetailer::getPartnerId, x -> x));
618
 
620
 
619
        model.addAttribute("offer", offer);
621
        model.addAttribute("offer", offer);
620
        model.addAttribute("offerId", offerId);
622
        model.addAttribute("offerId", offerId);
621
        model.addAttribute("offerPartners", offerPartners);
623
        model.addAttribute("partnerFofoIds", partnerFofoIds);
622
        model.addAttribute("customRetailerMap", customRetailerMap);
624
        model.addAttribute("customRetailerMap", customRetailerMap);
623
        model.addAttribute("allRetailersMap", allRetailersMap);
625
        model.addAttribute("allRetailersMap", allRetailersMap);
624
        return "offer_partners";
626
        return "offer_partners";
625
    }
627
    }
626
 
628