Subversion Repositories SmartDukaan

Rev

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

Rev 30334 Rev 30340
Line 717... Line 717...
717 
					}
 717 
					}
718 
 
 718 
 
719 
				} else if (collectionModel.getCommittedDate().toLocalDate().isBefore(LocalDate.now())
 719 
				} else if (collectionModel.getCommittedDate().toLocalDate().isBefore(LocalDate.now())
720 
						&& collectionModel.getAchievementPlan() < 5000) {
 720 
						&& collectionModel.getAchievementPlan() < 5000) {
721 
					collectionModel.setRank(2);
 721 
					collectionModel.setRank(2);
- 
 
 722 
 
722 
				} else {
 723 
				} else {
723 
 
 724 
 
724 
					collectionModel.setRank(5);
 725 
					collectionModel.setRank(5);
725 
					if (!collectionModel.getCreatedDate().toLocalDate().equals(LocalDate.now())) {
 726 
					if (!collectionModel.getCreatedDate().toLocalDate().equals(LocalDate.now())) {
726 
						collectionModel.setTargetPlan((long) 0);
 727 
						collectionModel.setTargetPlan((long) 0);
727 
					}
 728 
					}
728 
				}
 729 
				}
729 
 
 730 
 
- 
 
 731 
				if (todayTarget.get(collectionModel.getFofoId()) != null) {
- 
 
 732 
					if (todayTarget.get(collectionModel.getFofoId()).getCreateTimestamp().toLocalDate()
- 
 
 733 
							.isEqual(LocalDate.now())) {
- 
 
 734 
						collectionModel
- 
 
 735 
								.setTargetPlan((long) todayTarget.get(collectionModel.getFofoId()).getCollectionPlan());
- 
 
 736 
						collectionModel
- 
 
 737 
								.setCommittedDate(todayTarget.get(collectionModel.getFofoId()).getCommitedTimestamp());
- 
 
 738 
 
- 
 
 739 
						collectionModel.setAuthId(todayTarget.get(collectionModel.getFofoId()).getAuthId());
- 
 
 740 
					}
- 
 
 741 
				}
- 
 
 742 
 
730 
			}
 743 
			}
731 
			LOGGER.info("updatedList {}", foundCollections);
 744 
			LOGGER.info("updatedList {}", foundCollections);
732 
			Map<Integer, List<PartnerSecondaryPlanModel>> partnerSecondayPlans = orderRepository
 745 
			Map<Integer, List<PartnerSecondaryPlanModel>> partnerSecondayPlans = orderRepository
733 
					.selectPartnerSecondaryGroupByBrand(fofoIdList, startDate.toLocalDate()).stream()
 746 
					.selectPartnerSecondaryGroupByBrand(fofoIdList, startDate.toLocalDate()).stream()
734 
					.collect(Collectors.groupingBy(x -> x.getFofoId()));
 747 
					.collect(Collectors.groupingBy(x -> x.getFofoId()));