Subversion Repositories SmartDukaan

Rev

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

Rev 34730 Rev 34738
Line 452... Line 452...
452 
 
 452 
 
453 
        /*Map<Integer, CustomRetailer> customRetailers = retailerService.getAllFofoRetailersInternalFalse();
 453 
        /*Map<Integer, CustomRetailer> customRetailers = retailerService.getAllFofoRetailersInternalFalse();
454 
 
 454 
 
455 
        List<Integer> retailerIds = customRetailers.values().stream().map(CustomRetailer::getPartnerId).collect(Collectors.toList());*/
 455 
        List<Integer> retailerIds = customRetailers.values().stream().map(CustomRetailer::getPartnerId).collect(Collectors.toList());*/
456 
 
 456 
 
457 
        List<Integer> retailerIds = Arrays.asList(175139178,175139391,175139651,175139287,175139507,175139314,175139311,175139302,175139273,175138814,175138867,175138541,175139583,175139218,175139308,175139615,175139266,175139247,175139158,175139253);
 457 
        List<Integer> retailerIds = Arrays.asList(175138886,175139660,175139584,175139235,175138843,175139356,175139662,168094765,175139684,175135707,175139335,175139270,175139305,175139262,175139241,175139560,175139732,175138871,175138875,175139323,175139564,166900459,175139261,175139337,175138836,175139551,175139498,175139685,175127215,175139712,175138969,175139408,175139711,175136389,175139019,175139589,175139424,175139094,175138908,175139180,175139648,175138951,175139220,175139508,175138854,175139726,175138897,175139671,175139721,175139681);
458 
        Map<Integer,CustomRetailer> customRetailers = retailerService.getFofoRetailers(retailerIds);
 458 
        Map<Integer,CustomRetailer> customRetailers = retailerService.getFofoRetailers(retailerIds);
459 
 
 459 
 
460 
        //partner daily investment
 460 
        //partner daily investment
461 
        List<Loan> defaultLoans = sdCreditService.getDefaultLoans();
 461 
        List<Loan> defaultLoans = sdCreditService.getDefaultLoans();
462 
        Map<Integer,List<Loan>> defaultLoanMap = defaultLoans.stream().collect(Collectors.groupingBy(Loan::getFofoId));
 462 
        Map<Integer,List<Loan>> defaultLoanMap = defaultLoans.stream().collect(Collectors.groupingBy(Loan::getFofoId));
Line 568... Line 568...
568 
            if(ast != null){
 568 
            if(ast != null){
569 
                biRetailerModel.setArea(ast.getArea());
 569 
                biRetailerModel.setArea(ast.getArea());
570 
            }else {
 570 
            }else {
571 
                biRetailerModel.setArea("-");
 571 
                biRetailerModel.setArea("-");
572 
            }
 572 
            }
- 
 
 573 
            String retailerStatus = "";
- 
 
 574 
            FofoStore fofoStore1 = fofoStoreRepository.selectByRetailerId(fofoId);
- 
 
 575 
            if(!fofoStore1.isActive()){
- 
 
 576 
                retailerStatus = "INACTIVE";
- 
 
 577 
            }else{
- 
 
 578 
                retailerStatus =  String.valueOf(fofoStore1.getActivationType());
- 
 
 579 
            }
573 
            biRetailerModel.setCity(customRetailers.get(fofoId).getAddress().getCity());
 580 
            biRetailerModel.setCity(customRetailers.get(fofoId).getAddress().getCity());
574 
            biRetailerModel.setStoreName(customRetailers.get(fofoId).getBusinessName());
 581 
            biRetailerModel.setStoreName(customRetailers.get(fofoId).getBusinessName());
575 
            biRetailerModel.setStatus(String.valueOf(customRetailers.get(fofoId).getActivationType()));
 582 
            biRetailerModel.setStatus(retailerStatus);
576 
            biRetailerModel.setCategory(String.valueOf(partnerTypeThisMonth));
 583 
            biRetailerModel.setCategory(String.valueOf(partnerTypeThisMonth));
577 
            biRetailerModel.setSalesManager(managerName);
 584 
            biRetailerModel.setSalesManager(managerName);
578 
            biRetailerModel.setRbm(rbmName);
 585 
            biRetailerModel.setRbm(rbmName);
579 
 
 586 
 
580 
            biRetailerModelMap.put(fofoId,biRetailerModel);
 587 
            biRetailerModelMap.put(fofoId,biRetailerModel);