Subversion Repositories SmartDukaan

Rev

Rev 37765 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 37765 Rev 37780
Line 15... Line 15...
15
import com.spice.profitmandi.dao.entity.user.Promoter;
15
import com.spice.profitmandi.dao.entity.user.Promoter;
16
import com.spice.profitmandi.dao.entity.user.User;
16
import com.spice.profitmandi.dao.entity.user.User;
17
import com.spice.profitmandi.dao.repository.auth.AuthRepository;
17
import com.spice.profitmandi.dao.repository.auth.AuthRepository;
18
import com.spice.profitmandi.dao.repository.catalog.BrandsRepository;
18
import com.spice.profitmandi.dao.repository.catalog.BrandsRepository;
19
import com.spice.profitmandi.dao.repository.cs.CsService;
19
import com.spice.profitmandi.dao.repository.cs.CsService;
-
 
20
import com.spice.profitmandi.dao.repository.cs.DemoPartnerAccessService;
20
import com.spice.profitmandi.dao.repository.cs.RetailerBrandsLimitService;
21
import com.spice.profitmandi.dao.repository.cs.RetailerBrandsLimitService;
21
import com.spice.profitmandi.dao.repository.dtr.*;
22
import com.spice.profitmandi.dao.repository.dtr.*;
22
import com.spice.profitmandi.dao.repository.fofo.PartnerTypeChangeRepository;
23
import com.spice.profitmandi.dao.repository.fofo.PartnerTypeChangeRepository;
23
import com.spice.profitmandi.dao.repository.fofo.PartnerTypeChangeService;
24
import com.spice.profitmandi.dao.repository.fofo.PartnerTypeChangeService;
24
import com.spice.profitmandi.dao.repository.fofo.PincodePartnerRepository;
25
import com.spice.profitmandi.dao.repository.fofo.PincodePartnerRepository;
Line 103... Line 104...
103
    private UserRepository userRepository;
104
    private UserRepository userRepository;
104
    @Autowired
105
    @Autowired
105
    private AuthRepository authRepository;
106
    private AuthRepository authRepository;
106
    @Autowired
107
    @Autowired
107
    private CsService csService;
108
    private CsService csService;
-
 
109
 
-
 
110
    @Autowired
-
 
111
    private DemoPartnerAccessService demoPartnerAccessService;
108
    @Autowired
112
    @Autowired
109
    private LocationRepository locationRepository;
113
    private LocationRepository locationRepository;
110
    @Autowired
114
    @Autowired
111
    private ResponseSender<?> responseSender;
115
    private ResponseSender<?> responseSender;
112
    @Autowired
116
    @Autowired
Line 985... Line 989...
985
        LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
989
        LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
986
        AuthUser authUser = authRepository.selectByEmailOrMobile(loginDetails.getEmailId());
990
        AuthUser authUser = authRepository.selectByEmailOrMobile(loginDetails.getEmailId());
987
 
991
 
988
        Map<Integer, List<Integer>> pp = csService.getAuthUserIdPartnerIdMapping();
992
        Map<Integer, List<Integer>> pp = csService.getAuthUserIdPartnerIdMapping();
989
 
993
 
-
 
994
        // Copy: the mapping is a shared cached object and must not carry demo partners.
-
 
995
        Set<Integer> fofoIds = new LinkedHashSet<>();
-
 
996
        if (pp.get(authUser.getId()) != null) {
990
        List<Integer> fofoIds = pp.get(authUser.getId());
997
            fofoIds.addAll(pp.get(authUser.getId()));
-
 
998
        }
-
 
999
        Set<Integer> demoFofoIds = demoPartnerAccessService.getDemoFofoIds(authUser.getId());
-
 
1000
        demoFofoIds.removeAll(fofoIds);
-
 
1001
        fofoIds.addAll(demoFofoIds);
991
 
1002
 
992
        Map<Integer, CustomRetailer> customRetailersMap = retailerService.getFofoRetailers(fofoIds);
1003
        Map<Integer, CustomRetailer> customRetailersMap = fofoIds.isEmpty() ? new HashMap<>()
-
 
1004
                : retailerService.getFofoRetailers(new ArrayList<>(fofoIds));
993
 
1005
 
994
        model.addAttribute("customRetailersMap", customRetailersMap);
1006
        model.addAttribute("customRetailersMap", customRetailersMap);
-
 
1007
        model.addAttribute("demoFofoIds", demoFofoIds);
995
 
1008
 
996
        return "partner-readonly-info";
1009
        return "partner-readonly-info";
997
 
1010
 
998
    }
1011
    }
999
 
1012