| Line 338... |
Line 338... |
| 338 |
int daysGone = now.getDayOfMonth() - 1;
|
338 |
int daysGone = now.getDayOfMonth() - 1;
|
| 339 |
int daysRemaining = monthLength - daysGone;
|
339 |
int daysRemaining = monthLength - daysGone;
|
| 340 |
Double todaySale = fofoOrderItemRepository.selectSumMopGroupByRetailer(startOfToday, now, fofoId, false).get(fofoId);
|
340 |
Double todaySale = fofoOrderItemRepository.selectSumMopGroupByRetailer(startOfToday, now, fofoId, false).get(fofoId);
|
| 341 |
Double mtdSaleTillYesterDay = fofoOrderItemRepository.selectSumMopGroupByRetailer(startOfToday.withDayOfMonth(1), startOfToday, fofoId, false).get(fofoId);
|
341 |
Double mtdSaleTillYesterDay = fofoOrderItemRepository.selectSumMopGroupByRetailer(startOfToday.withDayOfMonth(1), startOfToday, fofoId, false).get(fofoId);
|
| 342 |
Double mtdSale = mtdSaleTillYesterDay + todaySale;
|
342 |
Double mtdSale = mtdSaleTillYesterDay + todaySale;
|
| - |
|
343 |
// This matches exactly what getMonthsale() does
|
| - |
|
344 |
LocalDateTime startOfLastMonth = startOfToday.withDayOfMonth(1).minusMonths(1);
|
| - |
|
345 |
int currentDayOfMonth = startOfToday.getDayOfMonth();
|
| - |
|
346 |
int lastMonthLength = YearMonth.from(startOfLastMonth).lengthOfMonth();
|
| - |
|
347 |
LocalDateTime lmtdEndDate = startOfLastMonth.plusDays(Math.min(currentDayOfMonth, lastMonthLength));
|
| - |
|
348 |
|
| 343 |
Double lmtdSale = fofoOrderItemRepository.selectSumMopGroupByRetailer(
|
349 |
Double lmtdSale = fofoOrderItemRepository.selectSumMopGroupByRetailer(
|
| 344 |
startOfToday.withDayOfMonth(1).minusMonths(1), now.minusMonths(1), fofoId, false).get(fofoId);
|
350 |
startOfLastMonth, lmtdEndDate, fofoId, false).get(fofoId);
|
| 345 |
|
351 |
|
| 346 |
List<PartnerTargetDetails> partnerTargetDetails = partnerTargetRepository.selectAllGeEqAndLeEqStartDateAndEndDate(LocalDateTime.now());
|
352 |
List<PartnerTargetDetails> partnerTargetDetails = partnerTargetRepository.selectAllGeEqAndLeEqStartDateAndEndDate(LocalDateTime.now());
|
| 347 |
if (partnerTargetDetails.isEmpty()) {
|
353 |
if (partnerTargetDetails.isEmpty()) {
|
| 348 |
partnerTargetDetails = partnerTargetRepository.selectAllGeEqAndLeEqStartDateAndEndDate(LocalDateTime.now().minusMonths(3));
|
354 |
partnerTargetDetails = partnerTargetRepository.selectAllGeEqAndLeEqStartDateAndEndDate(LocalDateTime.now().minusMonths(3));
|
| 349 |
}
|
355 |
}
|