Subversion Repositories SmartDukaan

Rev

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

Rev 33194 Rev 33792
Line 77... Line 77...
77
public class UserController {
77
public class UserController {
78
 
78
 
79
    @Autowired
79
    @Autowired
80
    private ResponseSender<?> responseSender;
80
    private ResponseSender<?> responseSender;
81
 
81
 
-
 
82
    //Changed to 2000 as per policy
82
    private static final int PER_REFERRAL_EARNING=10000;
83
    private static final int PER_REFERRAL_EARNING=2000;
83
 
84
 
84
    private static final Logger LOGGER = LogManager.getLogger(UserController.class);
85
    private static final Logger LOGGER = LogManager.getLogger(UserController.class);
85
 
86
 
86
    @Value("${notifications.api.host}")
87
    @Value("${notifications.api.host}")
87
    private String nodeHost;
88
    private String nodeHost;
Line 819... Line 820...
819
            List<Refferal> previousAndcurrentMonthtransferredRefferal = refferalRepository
820
            List<Refferal> previousAndcurrentMonthtransferredRefferal = refferalRepository
820
                    .selectByEmailIdAndStatusAndDateRange(refereeEmail, RefferalStatus.transferred, drm);
821
                    .selectByEmailIdAndStatusAndDateRange(refereeEmail, RefferalStatus.transferred, drm);
821
            List<Refferal> preCurrMonthtransferred = previousAndcurrentMonthtransferredRefferal.stream()
822
            List<Refferal> preCurrMonthtransferred = previousAndcurrentMonthtransferredRefferal.stream()
822
                    .filter(x -> x.getCreatedTimestamp().isBefore(currentMonthdate)).collect(Collectors.toList());
823
                    .filter(x -> x.getCreatedTimestamp().isBefore(currentMonthdate)).collect(Collectors.toList());
823
 
824
 
824
            long approvedRefferal = previousMonthapprovedRefferalbeforeSixteen.size()
825
            long approvedRefferalCount = previousMonthapprovedRefferalbeforeSixteen.size()
825
                    + previousMonthtransferredRefferalbeforeSixteen.size() + preCurrMonthapproved.size()
826
                    + previousMonthtransferredRefferalbeforeSixteen.size() + preCurrMonthapproved.size()
826
                    + preCurrMonthtransferred.size();
827
                    + preCurrMonthtransferred.size();
827
            rfm = new RefferalEarningModel();
828
            rfm = new RefferalEarningModel();
828
            rfm.setActualEarning(approvedRefferal * 10000);
829
            rfm.setActualEarning(approvedRefferalCount * PER_REFERRAL_EARNING);
829
 
830
 
830
            rfm.setYearMonth(YearMonth.now().minusMonths(1));
831
            rfm.setYearMonth(YearMonth.now().minusMonths(1));
831
            rfm.setPendingRefferal(0);
832
            rfm.setPendingRefferal(0);
832
            rfm.setApprovedRefferal(approvedRefferal);
833
            rfm.setApprovedRefferal(approvedRefferalCount);
833
            refferAmountModel.add(rfm);
834
            refferAmountModel.add(rfm);
834
            List<Refferal> allpendingRefferal = refferalRepository.selectByEmailIdAndStatus(refereeEmail,
835
            List<Refferal> allpendingRefferal = refferalRepository.selectByEmailIdAndStatus(refereeEmail,
835
                    RefferalStatus.pending);
836
                    RefferalStatus.pending);
836
            LOGGER.info("allpendingRefferal" + allpendingRefferal);
837
            LOGGER.info("allpendingRefferal" + allpendingRefferal);
837
 
838