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



                if (partnerCollectionPlan.getCollectionPlan() != ptam.getCollectionTarget()) {
                    float totalCollectionPlan = partnerCollectionPlan.getCollectionPlan() + 10000;
                    if (authUser.getId() == partnerCollectionPlan.getAuthId()) {
 
                        if (authUser.getEmailId().equals("tarun.verma@smartdukaan.com")
 
                                || ptam.getCollectionTarget() >= totalCollectionPlan) {
                            partnerCollectionPlan.setCollectionPlan(ptam.getCollectionTarget());
                            partnerCollectionPlan.setActive(true);
                            partnerCollectionPlan
                                    .setCommitedTimestamp(ptam.getCollectionCommitmentDate().atStartOfDay());

                        }
 
                    } else {
 
                        if (authUser.getEmailId().equals("tarun.verma@smartdukaan.com")
 
                                || ptam.getCollectionTarget() >= totalCollectionPlan) {
 
                            partnerCollectionPlan.setActive(false);
                            partnerCollectionPlan.setUpdatedTimestamp(LocalDateTime.now());
                            partnerCollectionPlan = new PartnerCollectionPlan();

                } else {
                    if (plan.getTargetPlan() != psp.getSecondaryPlan()) {
                        float totalSecondaryPlan = psp.getSecondaryPlan() + 10000;
                        if (authUser.getId() == plan.getAuthId()) {
                            if (authUser.getEmailId().equals("tarun.verma@smartdukaan.com")
 
                                    || plan.getTargetPlan() >= totalSecondaryPlan) {
                                psp.setSecondaryPlan(pspm.getValue().getTargetPlan());
                                psp.setCommitedTimestamp(ptam.getSecondaryCommitmentDate().atStartOfDay());
                                psp.setUpdatedTimestamp(LocalDateTime.now());
                                psp.setActive(true);

                            }
 
                        } else {
 
                            if (authUser.getEmailId().equals("tarun.verma@smartdukaan.com")
 
                                    || plan.getTargetPlan() >= totalSecondaryPlan) {
 
                                psp.setUpdatedTimestamp(LocalDateTime.now());
                                psp.setActive(false);
                                psp = new PartnerSecondaryPlan();

Subversion Repositories SmartDukaan

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

Rev 37354		Rev 37629
Line 2154...		Line 2154...
2154	`if (partnerCollectionPlan.getCollectionPlan() != ptam.getCollectionTarget()) {`	2154	`if (partnerCollectionPlan.getCollectionPlan() != ptam.getCollectionTarget()) {`
2155	`float totalCollectionPlan = partnerCollectionPlan.getCollectionPlan() + 10000;`	2155	`float totalCollectionPlan = partnerCollectionPlan.getCollectionPlan() + 10000;`
2156	`if (authUser.getId() == partnerCollectionPlan.getAuthId()) {`	2156	`if (authUser.getId() == partnerCollectionPlan.getAuthId()) {`
2157		2157
2158	`if (authUser.getEmailId().equals("tarun.verma@smartdukaan.com")`	2158	`if (authUser.getEmailId().equals("tarun.verma@smartdukaan.com")`
2159	`\|\| authUser.getEmailId().equals("rakesh.sonawane@smartdukaan.com")`	-
2160	`\|\| ptam.getCollectionTarget() >= totalCollectionPlan) {`	2159	`\|\| ptam.getCollectionTarget() >= totalCollectionPlan) {`
2161	`partnerCollectionPlan.setCollectionPlan(ptam.getCollectionTarget());`	2160	`partnerCollectionPlan.setCollectionPlan(ptam.getCollectionTarget());`
2162	`partnerCollectionPlan.setActive(true);`	2161	`partnerCollectionPlan.setActive(true);`
2163	`partnerCollectionPlan`	2162	`partnerCollectionPlan`
2164	`.setCommitedTimestamp(ptam.getCollectionCommitmentDate().atStartOfDay());`	2163	`.setCommitedTimestamp(ptam.getCollectionCommitmentDate().atStartOfDay());`
Line 2169...		Line 2168...
2169	`}`	2168	`}`
2170		2169
2171	`} else {`	2170	`} else {`
2172		2171
2173	`if (authUser.getEmailId().equals("tarun.verma@smartdukaan.com")`	2172	`if (authUser.getEmailId().equals("tarun.verma@smartdukaan.com")`
2174	`\|\| authUser.getEmailId().equals("rakesh.sonawane@smartdukaan.com")`	-
2175	`\|\| ptam.getCollectionTarget() >= totalCollectionPlan) {`	2173	`\|\| ptam.getCollectionTarget() >= totalCollectionPlan) {`
2176		2174
2177	`partnerCollectionPlan.setActive(false);`	2175	`partnerCollectionPlan.setActive(false);`
2178	`partnerCollectionPlan.setUpdatedTimestamp(LocalDateTime.now());`	2176	`partnerCollectionPlan.setUpdatedTimestamp(LocalDateTime.now());`
2179	`partnerCollectionPlan = new PartnerCollectionPlan();`	2177	`partnerCollectionPlan = new PartnerCollectionPlan();`
Line 2244...		Line 2242...
2244	`} else {`	2242	`} else {`
2245	`if (plan.getTargetPlan() != psp.getSecondaryPlan()) {`	2243	`if (plan.getTargetPlan() != psp.getSecondaryPlan()) {`
2246	`float totalSecondaryPlan = psp.getSecondaryPlan() + 10000;`	2244	`float totalSecondaryPlan = psp.getSecondaryPlan() + 10000;`
2247	`if (authUser.getId() == plan.getAuthId()) {`	2245	`if (authUser.getId() == plan.getAuthId()) {`
2248	`if (authUser.getEmailId().equals("tarun.verma@smartdukaan.com")`	2246	`if (authUser.getEmailId().equals("tarun.verma@smartdukaan.com")`
2249	`\|\| authUser.getEmailId().equals("rakesh.sonawane@smartdukaan.com")`	-
2250	`\|\| plan.getTargetPlan() >= totalSecondaryPlan) {`	2247	`\|\| plan.getTargetPlan() >= totalSecondaryPlan) {`
2251	`psp.setSecondaryPlan(pspm.getValue().getTargetPlan());`	2248	`psp.setSecondaryPlan(pspm.getValue().getTargetPlan());`
2252	`psp.setCommitedTimestamp(ptam.getSecondaryCommitmentDate().atStartOfDay());`	2249	`psp.setCommitedTimestamp(ptam.getSecondaryCommitmentDate().atStartOfDay());`
2253	`psp.setUpdatedTimestamp(LocalDateTime.now());`	2250	`psp.setUpdatedTimestamp(LocalDateTime.now());`
2254	`psp.setActive(true);`	2251	`psp.setActive(true);`
Line 2258...		Line 2255...
2258	`}`	2255	`}`
2259		2256
2260	`} else {`	2257	`} else {`
2261		2258
2262	`if (authUser.getEmailId().equals("tarun.verma@smartdukaan.com")`	2259	`if (authUser.getEmailId().equals("tarun.verma@smartdukaan.com")`
2263	`\|\| authUser.getEmailId().equals("rakesh.sonawane@smartdukaan.com")`	-
2264	`\|\| plan.getTargetPlan() >= totalSecondaryPlan) {`	2260	`\|\| plan.getTargetPlan() >= totalSecondaryPlan) {`
2265		2261
2266	`psp.setUpdatedTimestamp(LocalDateTime.now());`	2262	`psp.setUpdatedTimestamp(LocalDateTime.now());`
2267	`psp.setActive(false);`	2263	`psp.setActive(false);`
2268	`psp = new PartnerSecondaryPlan();`	2264	`psp = new PartnerSecondaryPlan();`