WebSVN – SmartDukaan – Diff – /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/LeadController.java

 				startDate = LocalDate.now().minusDays(1).atStartOfDay();
 				endDate = LocalDate.now().minusDays(1).atTime(LocalTime.MAX);
+			}
 			List<PartnerDailyInvestment> partnerDailyInvestments = partnerDailyInvestmentRepository
-					.selectAll(fofoIdList, startDate.minusDays(1).toLocalDate());
+					.selectAll(fofoIdList, startDate.minusDays(3).toLocalDate());
 			if (!partnerDailyInvestments.isEmpty()) {
 				partnerDailyInvestmentMap = partnerDailyInvestments.stream()
 						.collect(Collectors.toMap(x -> x.getFofoId(), x -> x));
+			}
 			Map<Integer, CustomRetailer> customRetailers = retailerService.getFofoRetailers(fofoIdList);
 			Map<Integer, PartnerCollectionPlanModel> collectionPlans = userWalletRepository
-					.getPartnerWiseTargetCollections(fofoIdList, startDate, endDate).stream()
+					.getPartnerWiseTargetCollections(fofoIdList, startDate).stream()
 					.collect(Collectors.toMap(x -> x.getFofoId(), x -> x));
 			LOGGER.info("collectionPlans {}", collectionPlans);
 			Map<Integer, List<PartnerSecondaryPlanModel>> partnerSecondayPlans = orderRepository
 					ptam.setWalletAmount(partnerDailyInvestmentMap.get(fofoId).getWalletAmount());
 					ptam.setShortInvestment(partnerDailyInvestmentMap.get(fofoId).getShortInvestment());
+				}
 				if (collectionPlans.get(fofoId) != null) {
+					PartnerCollectionPlanModel collectionPlan = collectionPlans.get(fofoId);
-					Integer authId = collectionPlans.get(fofoId).getAuthId();
+					Integer authId = collectionPlan.getAuthId();
 					LOGGER.info("authId" + authId);
 					if (authId != null && authId == authUser.getId()) {
+						if (collectionPlan.getTargetPlan() != null && collectionPlan.getCommittedDate() != null) {
-						if (collectionPlans.get(fofoId).getTargetPlan() != null) {
+							if (collectionPlan.getCommittedDate().isEqual(startDate)) {
-							totalPartnerTargetCollection += collectionPlans.get(fofoId).getTargetPlan();
+								totalPartnerTargetCollection += collectionPlan.getTargetPlan();
+							}
+						}
-						if (collectionPlans.get(fofoId).getAchievementPlan() != null) {
+						if (collectionPlan.getAchievementPlan() != null) {
-							totalPartnerAchievementCollection += collectionPlans.get(fofoId).getAchievementPlan();
+							totalPartnerAchievementCollection += collectionPlan.getAchievementPlan();
+						}
+					}
 					if (authId != null && authId != authUser.getId()) {
 						ptam.setAuthUser(authRepository.selectById(authId));
 						ptam.setCollectionColor("red");
+					}
 					if (collectionPlans.get(fofoId).getTargetPlan() != null) {
-						ptam.setCollectionTarget(collectionPlans.get(fofoId).getTargetPlan());
+						ptam.setCollectionTarget(collectionPlan.getTargetPlan());
+					}
 					if (collectionPlans.get(fofoId).getAchievementPlan() != null) {
-						ptam.setCollectionAchievement(collectionPlans.get(fofoId).getAchievementPlan());
+						ptam.setCollectionAchievement(collectionPlan.getAchievementPlan());
+					}
+					if (collectionPlan.getCommittedDate() != null) {
+						ptam.setCollectionCommitmentDate(collectionPlan.getCommittedDate().toLocalDate());
+					}
+				}
 				PartnerSecondaryPlanModel otherPartnerSecondaryPlanModel = null;
 				Map<String, PartnerSecondaryPlanModel> secondaryModelMap = new HashMap<>();
 				if (partnerSecondayPlans.get(fofoId) != null) {
 					long otherBrandSecondary = 0;
 					for (PartnerSecondaryPlanModel pspm : partnerSecondayPlans.get(fofoId)) {
 						Integer authId = pspm.getAuthId();
 						if (!brands.contains(pspm.getBrand())) {
 							if (pspm.getAchievementPlan() != null) {
 								otherBrandSecondary += pspm.getAchievementPlan();
+							}
 						} else {
 							otherPartnerSecondaryPlanModel = pspm;
+						}
 						if (pspm.getTargetPlan() != null) {
 							totalSecondaryPlan += pspm.getTargetPlan();
+						}
 						if (pspm.getAchievementPlan() != null) {
 							totalSecondaryAchivement += pspm.getAchievementPlan();
+						}
+						if (pspm.getCommittedDate() != null) {
+							ptam.setSecondaryCommitmentDate(pspm.getCommittedDate().toLocalDate());
+						}
 						if (authId != null && authId == authUser.getId()) {
-							if (pspm.getTargetPlan() != null) {
+							if (pspm.getTargetPlan() != null && pspm.getCommittedDate() != null) {
+								if (pspm.getCommittedDate().isEqual(startDate)) {
-								totalPartnerTargetSecondary += pspm.getTargetPlan();
+									totalPartnerTargetSecondary += pspm.getTargetPlan();
+								}
+							}
 							if (pspm.getAchievementPlan() != null) {
 								totalPartnerAchievementSecondary += pspm.getAchievementPlan();
+							}
 					if (secondaryModelMap.containsKey("Others")) {
 						PartnerSecondaryPlanModel psp = secondaryModelMap.get("Others");
 						psp.setAchievementPlan(otherBrandSecondary);
 					} else {
 						secondaryModelMap.put("Others", new PartnerSecondaryPlanModel(fofoId, "Others", (long) 0,
-								otherBrandSecondary, authUser.getId()));
+								otherBrandSecondary, authUser.getId(), null));
+					}
 					for (String brand : brands) {
 						if (!secondaryModelMap.containsKey(brand)) {
-							secondaryModelMap.put(brand,
+							secondaryModelMap.put(brand, new PartnerSecondaryPlanModel(fofoId, brand, (long) 0,
-									new PartnerSecondaryPlanModel(fofoId, brand, (long) 0, (long) 0, authUser.getId()));
+									(long) 0, authUser.getId(), null));
+						}
+					}
 					for (Entry<String, PartnerSecondaryPlanModel> secondaryModelEntry : secondaryModelMap.entrySet()) {
 						Integer authId = secondaryModelEntry.getValue().getAuthId();
 						if (authId != null && authId != authUser.getId()) {
 							secondaryModelEntry.getValue().setAuthUser(authRepository.selectById(authId));
 							ptam.setSecondaryColor("red");
+						}
+					}
 					ptam.setPartnerSecondaryModel(secondaryModelMap);
 					ptam.setTotalSecondaryPlan(totalSecondaryPlan);
 					ptam.setTotalSecondaryAchievement(totalSecondaryAchivement);
 				} else {
 					for (String brand : brands) {
 						PartnerSecondaryPlanModel pspm = new PartnerSecondaryPlanModel();
 						pspm.setAchievementPlan((long) 0);
 						pspm.setTargetPlan((long) 0);
 						pspm.setBrand(brand);
 						pspm.setFofoId(fofoId);
 						secondaryModelMap.put(brand, pspm);
+					}
 					ptam.setPartnerSecondaryModel(secondaryModelMap);
+				}
 				ptams.add(ptam);
+			}
 		LOGGER.info("ptam" + ptam);
 		AuthUser authUser = authRepository.selectByGmailId(ptam.getCreatedBy());
+		if (ptam.getCollectionCommitmentDate().isAfter(LocalDate.now())
+				|| ptam.getCollectionCommitmentDate().isEqual(LocalDate.now())) {
-		PartnerCollectionPlan partnerCollectionPlan = partnerCollectionPlanRepository.selectByLocalDate(LocalDate.now(),
+			PartnerCollectionPlan partnerCollectionPlan = partnerCollectionPlanRepository
-				ptam.getFofoId(), true);
+					.selectByLocalDate(LocalDate.now(), ptam.getFofoId(), true);
-		LOGGER.info("pcp" + partnerCollectionPlan);
+			LOGGER.info("pcp" + partnerCollectionPlan);
-		if (partnerCollectionPlan == null) {
+			if (partnerCollectionPlan == null) {
-			if (ptam.getCollectionTarget() > 0) {
+				if (ptam.getCollectionTarget() > 0) {
-				partnerCollectionPlan = new PartnerCollectionPlan();
+					partnerCollectionPlan = new PartnerCollectionPlan();
-				partnerCollectionPlan.setCreateTimestamp(LocalDateTime.now());
+					partnerCollectionPlan.setCreateTimestamp(LocalDateTime.now());
-				partnerCollectionPlan.setAuthId(authUser.getId());
+					partnerCollectionPlan.setAuthId(authUser.getId());
-				partnerCollectionPlan.setFofoId(ptam.getFofoId());
+					partnerCollectionPlan.setFofoId(ptam.getFofoId());
-				partnerCollectionPlan.setActive(true);
+					partnerCollectionPlan.setActive(true);
-				partnerCollectionPlan.setCollectionPlan(ptam.getCollectionTarget());
+					partnerCollectionPlan.setCollectionPlan(ptam.getCollectionTarget());
-				partnerCollectionPlan.setUpdatedTimestamp(LocalDateTime.now());
+					partnerCollectionPlan.setUpdatedTimestamp(LocalDateTime.now());
-				partnerCollectionPlanRepository.persist(partnerCollectionPlan);
-			}
-		} else {
-			if (partnerCollectionPlan.getCollectionPlan() != ptam.getCollectionTarget()) {
-				float totalCollectionPlan = partnerCollectionPlan.getCollectionPlan() + 10000;
-				if (authUser.getId() == partnerCollectionPlan.getAuthId()) {
-					if (ptam.getCollectionTarget() >= totalCollectionPlan) {
-						partnerCollectionPlan.setCollectionPlan(ptam.getCollectionTarget());
+					partnerCollectionPlan.setCommitedTimestamp(ptam.getCollectionCommitmentDate().atStartOfDay());
-						partnerCollectionPlan.setActive(true);
-						partnerCollectionPlan.setUpdatedTimestamp(LocalDateTime.now());
+					partnerCollectionPlanRepository.persist(partnerCollectionPlan);
-					} else {
-						throw new ProfitMandiBusinessException("collection target", "",
-								"collection target should be more than " + totalCollectionPlan);
-					}
+				}
-				} else {
+			} else {
+				if (partnerCollectionPlan.getCollectionPlan() != ptam.getCollectionTarget()) {
+					float totalCollectionPlan = partnerCollectionPlan.getCollectionPlan() + 10000;
+					if (authUser.getId() == partnerCollectionPlan.getAuthId()) {
-					if (ptam.getCollectionTarget() >= totalCollectionPlan) {
+						if (ptam.getCollectionTarget() >= totalCollectionPlan) {
+							partnerCollectionPlan.setCollectionPlan(ptam.getCollectionTarget());
+							partnerCollectionPlan.setActive(true);
+							partnerCollectionPlan
+									.setCommitedTimestamp(ptam.getCollectionCommitmentDate().atStartOfDay());
+							partnerCollectionPlan.setUpdatedTimestamp(LocalDateTime.now());
+						} else {
+							throw new ProfitMandiBusinessException("collection target", "",
+									"collection target should be more than " + totalCollectionPlan);
+						}
-						partnerCollectionPlan.setActive(false);
-						partnerCollectionPlan.setUpdatedTimestamp(LocalDateTime.now());
-						partnerCollectionPlan = new PartnerCollectionPlan();
-						partnerCollectionPlan.setCreateTimestamp(LocalDateTime.now());
-						partnerCollectionPlan.setAuthId(authUser.getId());
-						partnerCollectionPlan.setFofoId(ptam.getFofoId());
-						partnerCollectionPlan.setActive(true);
-						partnerCollectionPlan.setCollectionPlan(ptam.getCollectionTarget());
-						partnerCollectionPlan.setUpdatedTimestamp(LocalDateTime.now());
-						partnerCollectionPlanRepository.persist(partnerCollectionPlan);
 					} else {
+						if (ptam.getCollectionTarget() >= totalCollectionPlan) {
+							partnerCollectionPlan.setActive(false);
+							partnerCollectionPlan.setUpdatedTimestamp(LocalDateTime.now());
+							partnerCollectionPlan = new PartnerCollectionPlan();
+							partnerCollectionPlan.setCreateTimestamp(LocalDateTime.now());
+							partnerCollectionPlan.setAuthId(authUser.getId());
+							partnerCollectionPlan.setFofoId(ptam.getFofoId());
+							partnerCollectionPlan.setActive(true);
+							partnerCollectionPlan
+									.setCommitedTimestamp(ptam.getSecondaryCommitmentDate().atStartOfDay());
+							partnerCollectionPlan.setCollectionPlan(ptam.getCollectionTarget());
+							partnerCollectionPlan.setUpdatedTimestamp(LocalDateTime.now());
+							partnerCollectionPlanRepository.persist(partnerCollectionPlan);
+						} else {
-						throw new ProfitMandiBusinessException("collection target", "",
+							throw new ProfitMandiBusinessException("collection target", "",
-								"collection target should be more than " + totalCollectionPlan);
+									"collection target should be more than " + totalCollectionPlan);
+						}
+					}
+				}
+				if (partnerCollectionPlan.getCommitedTimestamp()
+						.isBefore(ptam.getCollectionCommitmentDate().atStartOfDay())
+						&& partnerCollectionPlan.getCollectionPlan() == ptam.getCollectionTarget()) {
+					partnerCollectionPlan.setCommitedTimestamp(ptam.getCollectionCommitmentDate().atStartOfDay());
+					partnerCollectionPlan.setUpdatedTimestamp(LocalDateTime.now());
+				}
+			}
+		} else {
+			throw new ProfitMandiBusinessException("Date", "",
+					"you can't select the back date" + ptam.getCollectionCommitmentDate());
+		}
 		for (Entry<String, PartnerSecondaryPlanModel> pspm : ptam.getPartnerSecondaryModel().entrySet()) {
-			PartnerSecondaryPlanModel plan = pspm.getValue();
-			PartnerSecondaryPlan psp = partnerSecondaryPlanRepository.selectByLocalDateBrand(plan.getBrand(),
-					LocalDate.now(), ptam.getFofoId(), true);
-			LOGGER.info("psp" + psp);
-			if (psp == null) {
-				if (plan.getTargetPlan() > 0) {
-					psp = new PartnerSecondaryPlan();
-					psp.setAuthId(authUser.getId());
-					psp.setBrand(pspm.getKey());
-					psp.setFofoId(pspm.getValue().getFofoId());
-					psp.setSecondaryPlan(pspm.getValue().getTargetPlan());
-					psp.setCreateTimestamp(LocalDateTime.now());
-					psp.setUpdatedTimestamp(LocalDateTime.now());
-					psp.setActive(true);
-					partnerSecondaryPlanRepository.persist(psp);
-				}
+			if (ptam.getCollectionCommitmentDate().isAfter(LocalDate.now())
+					|| ptam.getCollectionCommitmentDate().isEqual(LocalDate.now())) {
+				PartnerSecondaryPlanModel plan = pspm.getValue();
+				PartnerSecondaryPlan psp = partnerSecondaryPlanRepository.selectByLocalDateBrand(plan.getBrand(),
+						LocalDate.now(), ptam.getFofoId(), true);
+				LOGGER.info("psp" + psp);
-			} else {
+				if (psp == null) {
-				if (plan.getTargetPlan() != psp.getSecondaryPlan()) {
+					if (plan.getTargetPlan() > 0) {
-					float totalSecondaryPlan = psp.getSecondaryPlan() + 10000;
+						psp = new PartnerSecondaryPlan();
-					if (authUser.getId() == plan.getAuthId()) {
+						psp.setAuthId(authUser.getId());
+						psp.setBrand(pspm.getKey());
-						if (plan.getTargetPlan() >= totalSecondaryPlan) {
+						psp.setFofoId(pspm.getValue().getFofoId());
-							psp.setSecondaryPlan(pspm.getValue().getTargetPlan());
+						psp.setSecondaryPlan(pspm.getValue().getTargetPlan());
+						psp.setCreateTimestamp(LocalDateTime.now());
-							psp.setUpdatedTimestamp(LocalDateTime.now());
+						psp.setUpdatedTimestamp(LocalDateTime.now());
+						psp.setCommitedTimestamp(ptam.getSecondaryCommitmentDate().atStartOfDay());
-							psp.setActive(true);
+						psp.setActive(true);
-						} else {
-							throw new ProfitMandiBusinessException("secondary target", "",
+						partnerSecondaryPlanRepository.persist(psp);
-									"secondary target should be more than " + totalSecondaryPlan);
-						}
+					}
-					} else {
+				} else {
+					if (plan.getTargetPlan() != psp.getSecondaryPlan()) {
+						float totalSecondaryPlan = psp.getSecondaryPlan() + 10000;
+						if (authUser.getId() == plan.getAuthId()) {
+							if (plan.getTargetPlan() >= totalSecondaryPlan) {
+								psp.setSecondaryPlan(pspm.getValue().getTargetPlan());
+								psp.setCommitedTimestamp(ptam.getSecondaryCommitmentDate().atStartOfDay());
+								psp.setUpdatedTimestamp(LocalDateTime.now());
+								psp.setActive(true);
+							} else {
+								throw new ProfitMandiBusinessException("secondary target", "",
+										"secondary target should be more than " + totalSecondaryPlan);
+							}
-						if (plan.getTargetPlan() >= totalSecondaryPlan) {
+						} else {
-							psp.setUpdatedTimestamp(LocalDateTime.now());
+							if (plan.getTargetPlan() >= totalSecondaryPlan) {
-							psp.setActive(false);
+								psp.setUpdatedTimestamp(LocalDateTime.now());
+								psp.setActive(false);
-							psp = new PartnerSecondaryPlan();
+								psp = new PartnerSecondaryPlan();
-							psp.setAuthId(authUser.getId());
+								psp.setAuthId(authUser.getId());
-							psp.setBrand(pspm.getKey());
+								psp.setBrand(pspm.getKey());
-							psp.setFofoId(pspm.getValue().getFofoId());
+								psp.setFofoId(pspm.getValue().getFofoId());
-							psp.setSecondaryPlan(pspm.getValue().getTargetPlan());
+								psp.setSecondaryPlan(pspm.getValue().getTargetPlan());
+								psp.setCommitedTimestamp(ptam.getSecondaryCommitmentDate().atStartOfDay());
-							psp.setCreateTimestamp(LocalDateTime.now());
+								psp.setCreateTimestamp(LocalDateTime.now());
-							psp.setUpdatedTimestamp(LocalDateTime.now());
+								psp.setUpdatedTimestamp(LocalDateTime.now());
-							psp.setActive(true);
+								psp.setActive(true);
-							partnerSecondaryPlanRepository.persist(psp);
+								partnerSecondaryPlanRepository.persist(psp);
-						} else {
+							} else {
-							throw new ProfitMandiBusinessException("secondary target", "",
+								throw new ProfitMandiBusinessException("secondary target", "",
-									"secondary target should be more than " + totalSecondaryPlan);
+										"secondary target should be more than " + totalSecondaryPlan);
+							}
+						}
+					}
+					if (psp.getCommitedTimestamp().isBefore(ptam.getSecondaryCommitmentDate().atStartOfDay())
+							&& plan.getTargetPlan() == psp.getSecondaryPlan()) {
+						psp.setCommitedTimestamp(ptam.getSecondaryCommitmentDate().atStartOfDay());
+						psp.setUpdatedTimestamp(LocalDateTime.now());
+					}
+				}
+			} else {
+				throw new ProfitMandiBusinessException("Date", "",
+						"you can't select the back date" + ptam.getSecondaryCommitmentDate());
+			}
+		}
 		return responseSender.ok(true);
+	}
+}

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/LeadController.java – Rev 30110 → 30137