WebSVN – SmartDukaan – Diff – /trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java

 	PriceDropRepository priceDropRepository;
 	@Autowired
 	private SchemeService schemeService;
-	private static final String[] STOCK_AGEING_MAIL_LIST = new String[] { "amod.sen@smartdukaan.com",
+	private static final String[] STOCK_AGEING_MAIL_LIST = new String[] { "uday.singh@smartudkaan.com",
 			"adeel.yazdani@smartdukaan.com", "manoj.singh@smartdukaan.com", "kamini.sharma@smartdukaan.com",
-			"mohinder.mutreja@smartdukaan.com", "	ankit.bhatia@smartdukaan.com", "tarun.verma@smartdukaan.com",
+			"mohinder.mutreja@smartdukaan.com", "ankit.bhatia@smartdukaan.com", "tarun.verma@smartdukaan.com",
-			"chaitnaya.vats@smartdukaan.com", "kuldeep.kumar@smartdukaan.com", "prakash.rai@smartdukaan.com" };
+			"hemant.kaura@smartdukaan.com","rajat.gupta@smartdukaan.com", "kuldeep.kumar@smartdukaan.com", "prakash.rai@smartdukaan.com" };
 	private static final String[] ITEMWISE_PENDING_INDENT_MAIL_LIST = new String[] { "kamini.sharma@smartdukaan.com",
-			"prakash.rai@smartdukaan.com", "tarun.verma@smartdukaan.com", "chaitnaya.vats@smartdukaan.com",
+			"prakash.rai@smartdukaan.com", "tarun.verma@smartdukaan.com", "uday.singh@smartdukaan.com",
 			"kuldeep.kumar@smartdukaan.com" };
 	private List<OrderStatus> orderStatusList = Arrays.asList(OrderStatus.SUBMITTED_FOR_PROCESSING);
 	private Object[] REPORT_HEADERS = { "Store Code", "Firm Name", "Store Name", "State Manager", "Teritory Manager" };
 		List<FofoStore> fofoStores = fofoStoreRepository.selectActiveStores();
 		Map<Integer, CustomRetailer> customRetailerMap = retailerService
 				.getFofoRetailers(fofoStores.stream().map(x -> x.getId()).collect(Collectors.toList()));
 		List<String> headers = Arrays.asList("Code", "Firm Name", "Store Name", "State Manager", "Teritory/Team Lead",
-				"Wallet Amount", "In Stock Amount", "Activated Stock", "Return In Transit Stock", "Unbilled Amount",
+				"Wallet Amount", "In Stock Amount", "Activated Stock", "Return In Transit Stock", "Unbilled Amount", "Grn Pending Amount",
-				"Grn Pending Amount", "Min Investment", "Investment Amount", "Investment Short", "Unbilled Qty",
+				"Min Investment", "Investment Amount", "Investment Short", "Unbilled Qty", "Short Days");
-				"Short Days");
 		List<List<?>> rows = new ArrayList<>();
 		Map<Integer, List<?>> partnerRowsMap = new HashMap<>();
 		Map<Integer, List<Serializable>> partnerIdSalesHeaderMap = this.getPartnerIdSalesHeaders();
-		Map<Integer, Integer> shortDaysMap = partnerDailyInvestmentRepository
+		Map<Integer, Integer> shortDaysMap = partnerDailyInvestmentRepository.selectAll(LocalDate.now().withDayOfMonth(1), LocalDate.now())
-				.selectAll(LocalDate.now().withDayOfMonth(1), LocalDate.now()).stream().collect(Collectors.groupingBy(
+		.stream().collect(Collectors.groupingBy(x->x.getFofoId(),
-						x -> x.getFofoId(), Collectors.summingInt(x -> x.getShortPercentage() > 10 ? 1 : 0)));
+				Collectors.summingInt(x-> x.getShortPercentage() > 10 ? 1 : 0)));
 		for (FofoStore fofoStore : fofoStores) {
 			int fofoId = fofoStore.getId();
-			PartnerDailyInvestment partnerDailyInvestment = partnerInvestmentService.getInvestment(fofoId, 1);
+			PartnerDailyInvestment partnerDailyInvestment = partnerInvestmentService.getInvestment(fofoId,1);
 			partnerDailyInvestment.setDate(yesterDay);
 			try {
 				partnerDailyInvestmentRepository.persist(partnerDailyInvestment);
-				shortDaysMap.put(fofoId,
-						shortDaysMap.get(fofoId) + (partnerDailyInvestment.getShortPercentage() > 10 ? 1 : 0));
+				shortDaysMap.put(fofoId, shortDaysMap.get(fofoId) + (partnerDailyInvestment.getShortPercentage() > 10 ? 1 : 0));
 			} catch (Exception e) {
 				// ignore the exceptions during persist
+			}
 			CustomRetailer retailer = customRetailerMap.get(fofoStore.getId());
 				continue;
+			}
 			List<Serializable> row = partnerIdSalesHeaderMap.get(fofoStore.getId());
 			row.addAll(
 					Arrays.asList(partnerDailyInvestment.getWalletAmount(), partnerDailyInvestment.getInStockAmount(),
-							partnerDailyInvestment.getActivatedStockAmount() == 0 ? "-"
+							partnerDailyInvestment.getActivatedStockAmount() == 0 ? "-":"("+partnerDailyInvestment.getActivatedStockAmount()+")",
-									: "(" + partnerDailyInvestment.getActivatedStockAmount() + ")",
 , partnerDailyInvestment.getUnbilledAmount(), partnerDailyInvestment.getGrnPendingAmount(),
 							partnerDailyInvestment.getMinInvestment(), partnerDailyInvestment.getTotalInvestment(),
-							partnerDailyInvestment.getShortInvestment(), partnerDailyInvestment.getUnbilledQty(),
+							partnerDailyInvestment.getShortInvestment(), partnerDailyInvestment.getUnbilledQty(),shortDaysMap.get(fofoId)));
-							shortDaysMap.get(fofoId)));
 			partnerRowsMap.put(fofoStore.getId(), row);
 			rows.add(row);
+		}
 				if (!partnerEmailSalesMap.containsKey(cr.getEmail())) {
 					partnerEmailSalesMap.put(cr.getEmail(), new SaleRoles());
+				}
 				SaleRoles saleRoles = partnerEmailSalesMap.get(cr.getEmail());
 				AuthUser authUser = authUsersMap.get(position.getAuthUserId());
-				if (authUser == null) {
+				if(authUser==null) {
 					continue;
+				}
 				String name = authUser.getFirstName() + " " + authUser.getLastName();
 				if (position.getEscalationType().equals(EscalationType.L1)) {
 					saleRoles.getL1().add(name);
+	}
 	public void sendAgeingReport() throws Exception {
 		sendAgeingReport("kamini.sharma@smartdukaan.com", "prakash.rai@smartdukaan.com", "tarun.verma@smartdukaan.com",
-				"chaitnaya.vats@smartdukaan.com");
+				"hemant.kaura@smartdukaan.com");
+	}
 	public void moveImeisToPriceDropImeis() throws Exception {
 		List<PriceDrop> priceDrops = priceDropRepository.selectAll();
 		for (PriceDrop priceDrop : priceDrops) {
 				// check if pricedrop has been rolled out
 				List<UserWalletHistory> uwh = walletService.getAllByReference(inventoryItem.getFofoId(),
 						priceDropIMEI.getPriceDropId(), WalletReferenceType.PRICE_DROP);
 				if (uwh.size() > 0) {
 					Item item = itemRepository.selectById(inventoryItem.getItemId());
-					System.out.println(String.join("\t", Arrays.asList(priceDropIMEI.getImei(),
+					System.out.println(String.join("\t",
+							Arrays.asList(priceDropIMEI.getImei(), inventoryItem.getItemId() + "", item.getBrand(),
-							inventoryItem.getItemId() + "", item.getBrand(), item.getModelName(), item.getModelNumber(),
+									item.getModelName(), item.getModelNumber(), inventoryItem.getFofoId() + "",
-							inventoryItem.getFofoId() + "", customRetailer.getBusinessName(),
+									customRetailer.getBusinessName(), inventoryItem.getCreateTimestamp().format(dtf),
-							inventoryItem.getCreateTimestamp().format(dtf), priceDrop.getAffectedOn().format(dtf),
+									priceDrop.getAffectedOn().format(dtf),
-							priceDropIMEI.getUpdateTimestamp().format(dtf),
+									priceDropIMEI.getUpdateTimestamp().format(dtf),
-							inventoryItem.getUpdateTimestamp().format(dtf), priceDrop.getAutoPartnerPayout() + "",
+									inventoryItem.getUpdateTimestamp().format(dtf), priceDrop.getAutoPartnerPayout() + "",
-							inventoryItem.getLastScanType().equals(ScanType.DOA_OUT) + "")));
+									inventoryItem.getLastScanType().equals(ScanType.DOA_OUT) + "")));
+				}
+			}
+		}
+	}
 					FofoOrder fofoOrder = fofoOrderRepository.selectByOrderId(scanRecord.getOrderId());
 					String rollbackReason = "Scheme reversed for "
 							+ itemRepository.selectById(inventoryItem.getItemId()).getItemDescription() + "/Inv - "
 							+ fofoOrder.getInvoiceNumber();
 					walletService.rollbackAmountFromWallet(scanRecord.getFofoId(), sio.getAmount(),
-							scanRecord.getOrderId(), WalletReferenceType.SCHEME_OUT, rollbackReason,
+							scanRecord.getOrderId(), WalletReferenceType.SCHEME_OUT, rollbackReason, LocalDateTime.now());
-							LocalDateTime.now());
 					System.out.printf("Amount %f,SchemeId %d,Reason %s\n", sio.getAmount(), sio.getSchemeId(),
 							rollbackReason);
+				}
+			}
+		}
 			sendNotificationModel.setUserIds(Arrays.asList(authUserKeyMap.get(lead.getAssignTo())));
 			System.out.println(sendNotificationModel);
 			notificationService.sendNotification(sendNotificationModel);
+		}
+	}
 	public void notifyVisits() throws Exception {
-		List<FranchiseeVisit> franchiseeVisits = franchiseeVisitRepository
+		List<FranchiseeVisit> franchiseeVisits = franchiseeVisitRepository.selectVisitsScheduledBetweenDate(LocalDateTime.now().minusDays(15),
-				.selectVisitsScheduledBetweenDate(LocalDateTime.now().minusDays(15), LocalDateTime.now().plusHours(4));
+				LocalDateTime.now().plusHours(4));
 		Map<Integer, String> authUserEmailMap = authRepository.selectAllActiveUser().stream()
 				.collect(Collectors.toMap(x -> x.getId(), x -> x.getEmailId()));
 		Map<String, Integer> dtrEmailMap = dtrUserRepository
 				.selectAllByEmailIds(new ArrayList<>(authUserEmailMap.values())).stream()
 				.collect(Collectors.toMap(x -> x.getEmailId(), x -> x.getId()));
 		Map<Integer, Integer> authUserKeyMap = new HashMap<>();
 		for (Map.Entry<Integer, String> authUserEmail : authUserEmailMap.entrySet()) {
 			int authId = authUserEmail.getKey();
 			String email = authUserEmail.getValue();
 			authUserKeyMap.put(authId, dtrEmailMap.get(email));
+		}
 			if (authUserKeyMap.containsKey(visit.getAuthId())) {
 				continue;
+			}
 			SendNotificationModel sendNotificationModel = new SendNotificationModel();
 			String message = null;
-			if (visit.getFranchiseActivityId() == 0) {
+			if(visit.getFranchiseActivityId()==0) {
-				message = String.format(visitTemplate, visit.getPartnerName(),
+				 message = String.format(visitTemplate, visit.getPartnerName(), timeFormatter.format(visit.getSchelduleTimestamp()));
-						timeFormatter.format(visit.getSchelduleTimestamp()));
-				sendNotificationModel.setCampaignName("Franchisee visit Reminder");
+				 sendNotificationModel.setCampaignName("Franchisee visit Reminder");
 			} else {
-				message = String.format(followupTemplate, visit.getPartnerName(),
+				message = String.format(followupTemplate, visit.getPartnerName(), timeFormatter.format(visit.getSchelduleTimestamp()));
-						timeFormatter.format(visit.getSchelduleTimestamp()));
 				sendNotificationModel.setCampaignName("Franchisee followup Reminder");
+			}
 			sendNotificationModel.setMessage(message);
 			sendNotificationModel.setType("url");
 			sendNotificationModel.setUrl("https://app.smartdukaan.com/pages/home/notifications");

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-cron/src/main/java/com/smartdukaan/cron/scheduled/ScheduledTasks.java – Rev 26792 → 26862