Subversion Repositories SmartDukaan

Rev

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

Rev 31269 Rev 31270
Line 1915... Line 1915...
1915
 
1915
 
1916
				List<PartnerDetailModel> partnerDetails = fofoIds.stream().filter(x -> partnerStats.containsKey(x))
1916
				List<PartnerDetailModel> partnerDetails = fofoIds.stream().filter(x -> partnerStats.containsKey(x))
1917
						.map(x -> partnerStats.get(x)).collect(Collectors.toList());
1917
						.map(x -> partnerStats.get(x)).collect(Collectors.toList());
1918
 
1918
 
1919
				Map<Integer, Double> last3MonthSale = fofoOrderItemRepository.selectSumMopGroupByRetailer(
1919
				Map<Integer, Double> last3MonthSale = fofoOrderItemRepository.selectSumMopGroupByRetailer(
1920
						LocalDateTime.now().withDayOfMonth(1).minusMonths(2), LocalDateTime.now(), 0, false);
1920
						LocalDateTime.now().withDayOfMonth(1).minusMonths(6), LocalDateTime.now(), 0, false);
1921
 
1921
 
1922
				Map<Milestone, Long> lmsMap = new HashMap<>();
1922
				Map<Milestone, Long> lmsMap = new HashMap<>();
1923
				if (!last3MonthSale.isEmpty()) {
1923
				if (!last3MonthSale.isEmpty()) {
1924
 
1924
 
1925
					int days = 60 + LocalDateTime.now().getDayOfMonth();
1925
					int days = 60 + LocalDateTime.now().getDayOfMonth();
Line 1949... Line 1949...
1949
						}
1949
						}
1950
 
1950
 
1951
					}
1951
					}
1952
 
1952
 
1953
				}
1953
				}
-
 
1954
				
-
 
1955
				LOGGER.info("last3MonthSale" + last3MonthSale);
1954
 
1956
 
1955
				LOGGER.info("partnerDetails" + partnerDetails);
1957
				LOGGER.info("partnerDetails" + partnerDetails);
1956
 
1958
 
1957
				if (partnerDetails != null) {
1959
				if (partnerDetails != null) {
1958
 
1960
 
Line 1975... Line 1977...
1975
 
1977
 
1976
			}
1978
			}
1977
		}
1979
		}
1978
 
1980
 
1979
		model.addAttribute("warehouseMap", ProfitMandiConstants.WAREHOUSE_MAP);
1981
		model.addAttribute("warehouseMap", ProfitMandiConstants.WAREHOUSE_MAP);
-
 
1982
		for (Milestone currency : Milestone.values()) {
-
 
1983
			LOGGER.info("mtdMap" + currency.name());
1980
 
1984
 
1981
		LOGGER.info("warehouseId" + Milestone.values());
-
 
-
 
1985
		}
1982
 
1986
 
1983
		model.addAttribute("warehouseId", warehouseId);
1987
		model.addAttribute("warehouseId", warehouseId);
1984
 
1988
 
1985
		model.addAttribute("milestones", Milestone.values());
1989
		model.addAttribute("milestones", Milestone.values());
1986
 
1990