Subversion Repositories SmartDukaan

Rev

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

Rev 30818 Rev 30821
Line 763... Line 763...
763 
							}
 763 
							}
764 
						}
 764 
						}
765 
 
 765 
 
766 
						ptam.setCollectionTarget(targetCollection);
 766 
						ptam.setCollectionTarget(targetCollection);
767 
					}
 767 
					}
768 
					if (collectionPlan.getAchievementPlan() != null && collectionPlan.getWalletTimestamp() != null
 - 
 
769 
							&& collectionPlan.getWalletTimestamp().toLocalDate().equals(startDate.toLocalDate())
 - 
 
770 
							&& collectionPlan.getTargetPlan() != null) {
 - 
 
771 
						if (authId != null && authId == authUser.getId()) {
 - 
 
772 
 
 - 
 
773 
							totalPartnerAchievementCollection += collectionPlan.getAchievementPlan();
 - 
 
774 
						}
 - 
 
775 
						ptam.setCollectionAchievement(collectionPlan.getAchievementPlan());
 - 
 
776 
					}
 - 
 
777 
 
 768 
 
778 
					if (authId != null && authId != authUser.getId()) {
 769 
					if (authId != null && authId != authUser.getId()) {
779 
						ptam.setAuthUser(authRepository.selectById(authId));
 770 
						ptam.setAuthUser(authRepository.selectById(authId));
780 
 
 771 
 
781 
					}
 772 
					}
782 
 
 773 
 
783 
					if (collectionPlan.getCommittedDate() != null) {
 774 
					if (collectionPlan.getCommittedDate() != null) {
784 
 
 775 
 
785 
						ptam.setCollectionCommitmentDate(collectionPlan.getCommittedDate().toLocalDate());
 776 
						ptam.setCollectionCommitmentDate(collectionPlan.getCommittedDate().toLocalDate());
786 
					}
 777 
					}
- 
 
 778 
 
- 
 
 779 
					if (collectionPlan.getRank() == 2 && collectionPlan.getAchievementPlan() != null
- 
 
 780 
							&& collectionPlan.getWalletTimestamp() != null
- 
 
 781 
							&& collectionPlan.getWalletTimestamp().toLocalDate().equals(startDate.toLocalDate())) {
- 
 
 782 
						if (authId != null && authId == authUser.getId()) {
- 
 
 783 
 
- 
 
 784 
							totalPartnerAchievementCollection += collectionPlan.getAchievementPlan();
- 
 
 785 
						}
- 
 
 786 
						ptam.setCollectionAchievement(collectionPlan.getAchievementPlan());
- 
 
 787 
					} else if (collectionPlan.getCommittedDate().toLocalDate().isEqual(startDate.toLocalDate())
- 
 
 788 
							&& collectionPlan.getAchievementPlan() != null) {
- 
 
 789 
						if (authId != null && authId == authUser.getId()) {
- 
 
 790 
 
- 
 
 791 
							totalPartnerAchievementCollection += collectionPlan.getAchievementPlan();
- 
 
 792 
						}
- 
 
 793 
						ptam.setCollectionAchievement(collectionPlan.getAchievementPlan());
- 
 
 794 
 
- 
 
 795 
					}
787 
				}
 796 
				}
788 
 
 797 
 
789 
				// Secondary
 798 
				// Secondary
790 
 
 799 
 
791 
				PartnerSecondaryPlanModel otherPartnerSecondaryPlanModel = null;
 800 
				PartnerSecondaryPlanModel otherPartnerSecondaryPlanModel = null;