Subversion Repositories SmartDukaan

Rev

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

Rev 27660 Rev 27732
Line 74... Line 74...
74
		Map<Integer, Double> mtdSale = fofoOrderItemRepository.selectSumMopGroupByRetailer(curDate.withDayOfMonth(1),
74
		Map<Integer, Double> mtdSale = fofoOrderItemRepository.selectSumMopGroupByRetailer(curDate.withDayOfMonth(1),
75
				curDate.with(LocalTime.MAX), 0, false);
75
				curDate.with(LocalTime.MAX), 0, false);
76
		int lengthOfMonth = YearMonth.from(curDate.minusMonths(1)).lengthOfMonth();
76
		int lengthOfMonth = YearMonth.from(curDate.minusMonths(1)).lengthOfMonth();
77
 
77
 
78
		Map<Integer, Double> lmsSale = fofoOrderItemRepository.selectSumMopGroupByRetailer(
78
		Map<Integer, Double> lmsSale = fofoOrderItemRepository.selectSumMopGroupByRetailer(
-
 
79
				curDate.withDayOfMonth(1).minusMonths(1),
79
				curDate.withDayOfMonth(1).minusMonths(1), curDate.with(LocalTime.MAX).minusMonths(1).withDayOfMonth(lengthOfMonth), 0,
80
				curDate.with(LocalTime.MAX).minusMonths(1).withDayOfMonth(lengthOfMonth), 0, false);
80
				false);
-
 
81
 
81
 
82
		Map<Integer, Double> todaytertiary = fofoOrderItemRepository.selectSumMopGroupByRetailer(curDate,
82
		Map<Integer, Double> todaytertiary = fofoOrderItemRepository.selectSumMopGroupByRetailer(curDate,
83
				curDate.with(LocalTime.MAX), 0, false);
83
				curDate.with(LocalTime.MAX), 0, false);
84
 
84
 
85
		Map<Integer, Long> last3daystertiary = fofoOrderItemRepository.selectQtyGroupByRetailer(curDate.minusDays(4),
85
		Map<Integer, Long> last3daystertiary = fofoOrderItemRepository.selectQtyGroupByRetailer(curDate.minusDays(4),
Line 152... Line 152...
152
	public PartnerDetailModel getAggregateStats(List<PartnerDetailModel> partnerDetailModels)
152
	public PartnerDetailModel getAggregateStats(List<PartnerDetailModel> partnerDetailModels)
153
			throws ProfitMandiBusinessException {
153
			throws ProfitMandiBusinessException {
154
		PartnerDetailModel pdm = new PartnerDetailModel();
154
		PartnerDetailModel pdm = new PartnerDetailModel();
155
		PartnerDailyInvestment aggregateInvestment = new PartnerDailyInvestment();
155
		PartnerDailyInvestment aggregateInvestment = new PartnerDailyInvestment();
156
		pdm.setInvestment(aggregateInvestment);
156
		pdm.setInvestment(aggregateInvestment);
-
 
157
		double totallmsAmount = 0;
157
		double totallmtdAmount = 0;
158
		double totallmtdAmount = 0;
158
		double totalmtdAmount = 0;
159
		double totalmtdAmount = 0;
159
		double totalTodayTertiary = 0;
160
		double totalTodayTertiary = 0;
160
		int totalTicketCount = 0;
161
		int totalTicketCount = 0;
161
 
162
 
Line 163... Line 164...
163
		int currentTotalHygieneCount = 0;
164
		int currentTotalHygieneCount = 0;
164
		if (partnerDetailModels != null && !partnerDetailModels.isEmpty()) {
165
		if (partnerDetailModels != null && !partnerDetailModels.isEmpty()) {
165
			for (PartnerDetailModel partnerDetailModel : partnerDetailModels) {
166
			for (PartnerDetailModel partnerDetailModel : partnerDetailModels) {
166
				if (partnerDetailModel != null) {
167
				if (partnerDetailModel != null) {
167
					PartnerDailyInvestment pdi = partnerDetailModel.getInvestment();
168
					PartnerDailyInvestment pdi = partnerDetailModel.getInvestment();
-
 
169
					totallmsAmount += partnerDetailModel.getLms();
168
					totallmtdAmount += partnerDetailModel.getLmtd();
170
					totallmtdAmount += partnerDetailModel.getLmtd();
169
					totalmtdAmount += partnerDetailModel.getMtd();
171
					totalmtdAmount += partnerDetailModel.getMtd();
170
					totalTicketCount += partnerDetailModel.getTicket();
172
					totalTicketCount += partnerDetailModel.getTicket();
171
					totalTodayTertiary += partnerDetailModel.getTodayTertiary();
173
					totalTodayTertiary += partnerDetailModel.getTodayTertiary();
172
					currentHygieneCount += partnerDetailModel.getHygiene();
174
					currentHygieneCount += partnerDetailModel.getHygiene();