Subversion Repositories SmartDukaan

Rev

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

Rev 25334 Rev 25335
Line 115... Line 115...
115
import com.spice.profitmandi.dao.repository.transaction.UserWalletHistoryRepository;
115
import com.spice.profitmandi.dao.repository.transaction.UserWalletHistoryRepository;
116
import com.spice.profitmandi.dao.repository.transaction.UserWalletRepository;
116
import com.spice.profitmandi.dao.repository.transaction.UserWalletRepository;
117
import com.spice.profitmandi.dao.repository.user.AddressRepository;
117
import com.spice.profitmandi.dao.repository.user.AddressRepository;
118
import com.spice.profitmandi.service.PartnerInvestmentService;
118
import com.spice.profitmandi.service.PartnerInvestmentService;
119
import com.spice.profitmandi.service.inventory.InventoryService;
119
import com.spice.profitmandi.service.inventory.InventoryService;
-
 
120
import com.spice.profitmandi.service.order.OrderService;
120
import com.spice.profitmandi.service.pricing.PriceDropService;
121
import com.spice.profitmandi.service.pricing.PriceDropService;
121
import com.spice.profitmandi.service.recharge.provider.OxigenRechargeProviderService;
122
import com.spice.profitmandi.service.recharge.provider.OxigenRechargeProviderService;
122
import com.spice.profitmandi.service.recharge.provider.ThinkWalnutDigitalRechargeProviderService;
123
import com.spice.profitmandi.service.recharge.provider.ThinkWalnutDigitalRechargeProviderService;
123
import com.spice.profitmandi.service.scheme.SchemeService;
124
import com.spice.profitmandi.service.scheme.SchemeService;
124
import com.spice.profitmandi.service.slab.TargetSlabService;
125
import com.spice.profitmandi.service.slab.TargetSlabService;
Line 252... Line 253...
252
	@Autowired
253
	@Autowired
253
	private ItemRepository itemRepository;
254
	private ItemRepository itemRepository;
254
 
255
 
255
	@Autowired
256
	@Autowired
256
	private OrderRepository orderRepository;
257
	private OrderRepository orderRepository;
-
 
258
	
-
 
259
	@Autowired
-
 
260
	private OrderService orderService;
257
 
261
 
258
	@Autowired
262
	@Autowired
259
	private SchemeRepository schemeRepository;
263
	private SchemeRepository schemeRepository;
260
 
264
 
261
	@Autowired
265
	@Autowired
Line 575... Line 579...
575
		}
579
		}
576
		LocalDate yesterDay = LocalDate.now().minusDays(1);
580
		LocalDate yesterDay = LocalDate.now().minusDays(1);
577
		List<FofoStore> fofoStores = fofoStoreRepository.selectActiveStores();
581
		List<FofoStore> fofoStores = fofoStoreRepository.selectActiveStores();
578
		Map<Integer, CustomRetailer> customRetailerMap = retailerService
582
		Map<Integer, CustomRetailer> customRetailerMap = retailerService
579
				.getFofoRetailers(fofoStores.stream().map(x -> x.getId()).collect(Collectors.toList()));
583
				.getFofoRetailers(fofoStores.stream().map(x -> x.getId()).collect(Collectors.toList()));
580
 
584
		
581
		List<String> headers = Arrays.asList("Code", "Store Name", "Firm Name", "State Manager", "Teritory Manager",
585
		List<String> headers = Arrays.asList("Code", "Store Name", "Firm Name", "State Manager", "Teritory Manager",
582
				"Team Leader", "Wallet Amount", "In Stock Amount", "Return In Transit Stock", "Unbilled Amount",
586
				"Team Leader", "Wallet Amount", "In Stock Amount", "Return In Transit Stock", "Unbilled Amount",
583
				"Grn Pending Amount", "Min Investment", "Investment Amount", "Investment Short");
587
				"Grn Pending Amount", "Min Investment", "Investment Amount", "Investment Short");
584
		List<List<? extends Serializable>> rows = new ArrayList<>();
588
		List<List<? extends Serializable>> rows = new ArrayList<>();
585
		Map<String, List<? extends Serializable>> partnerRow = new HashMap<>();
589
		Map<String, List<? extends Serializable>> partnerRow = new HashMap<>();
Line 601... Line 605...
601
					storeManagerMap.get(retailer.getEmail()).get(2), storeManagerMap.get(retailer.getEmail()).get(1),
605
					storeManagerMap.get(retailer.getEmail()).get(2), storeManagerMap.get(retailer.getEmail()).get(1),
602
					storeManagerMap.get(retailer.getEmail()).get(0), partnerDailyInvestment.getWalletAmount(), 
606
					storeManagerMap.get(retailer.getEmail()).get(0), partnerDailyInvestment.getWalletAmount(), 
603
					partnerDailyInvestment.getInStockAmount(), 0,
607
					partnerDailyInvestment.getInStockAmount(), 0,
604
					partnerDailyInvestment.getUnbilledAmount(), partnerDailyInvestment.getGrnPendingAmount(),
608
					partnerDailyInvestment.getUnbilledAmount(), partnerDailyInvestment.getGrnPendingAmount(),
605
					partnerDailyInvestment.getMinInvestment(), partnerDailyInvestment.getTotalInvestment(),
609
					partnerDailyInvestment.getMinInvestment(), partnerDailyInvestment.getTotalInvestment(),
606
					partnerDailyInvestment.getShortInvestment());
610
					partnerDailyInvestment.getShortInvestment(),
-
 
611
					partnerDailyInvestment.getUnbilledQty());
607
			partnerRow.put(retailer.getEmail(), row);
612
			partnerRow.put(retailer.getEmail(), row);
608
			rows.add(row);
613
			rows.add(row);
609
 
614
 
610
		}
615
		}
611
		Map<String, Set<String>> storeGuyMap = new HashMap<>();
616
		Map<String, Set<String>> storeGuyMap = new HashMap<>();