Subversion Repositories SmartDukaan

Rev

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

Rev 29276 Rev 29317
Line 1... Line 1...
1
package com.spice.profitmandi.web.controller;
1
package com.spice.profitmandi.web.controller;
2
 
2
 
3
import java.time.LocalDate;
-
 
4
import java.time.LocalDateTime;
3
import java.time.LocalDateTime;
5
import java.time.format.DateTimeFormatter;
-
 
6
import java.util.ArrayList;
4
import java.util.ArrayList;
7
import java.util.HashMap;
-
 
8
import java.util.HashSet;
-
 
9
import java.util.List;
5
import java.util.List;
10
import java.util.Map;
6
import java.util.Map;
11
import java.util.Set;
7
import java.util.Set;
12
import java.util.stream.Collectors;
8
import java.util.stream.Collectors;
13
 
9
 
Line 34... Line 30...
34
import com.spice.profitmandi.dao.entity.auth.AuthUser;
30
import com.spice.profitmandi.dao.entity.auth.AuthUser;
35
import com.spice.profitmandi.dao.entity.dtr.User;
31
import com.spice.profitmandi.dao.entity.dtr.User;
36
import com.spice.profitmandi.dao.entity.dtr.UserAccount;
32
import com.spice.profitmandi.dao.entity.dtr.UserAccount;
37
import com.spice.profitmandi.dao.entity.fofo.FofoStore;
33
import com.spice.profitmandi.dao.entity.fofo.FofoStore;
38
import com.spice.profitmandi.dao.entity.fofo.PartnerOnBoardingPanel;
34
import com.spice.profitmandi.dao.entity.fofo.PartnerOnBoardingPanel;
39
import com.spice.profitmandi.dao.entity.logistics.PostOffice;
-
 
40
import com.spice.profitmandi.dao.entity.user.FranchiseeActivity;
35
import com.spice.profitmandi.dao.entity.user.FranchiseeActivity;
41
import com.spice.profitmandi.dao.entity.user.FranchiseeVisit;
36
import com.spice.profitmandi.dao.entity.user.FranchiseeVisit;
42
import com.spice.profitmandi.dao.entity.user.Lead;
37
import com.spice.profitmandi.dao.entity.user.Lead;
43
import com.spice.profitmandi.dao.entity.user.LeadActivity;
38
import com.spice.profitmandi.dao.entity.user.LeadActivity;
44
import com.spice.profitmandi.dao.enumuration.dtr.FranchiseeActivityStatus;
39
import com.spice.profitmandi.dao.enumuration.dtr.FranchiseeActivityStatus;
45
import com.spice.profitmandi.dao.enumuration.dtr.FranchiseeVisitStatus;
40
import com.spice.profitmandi.dao.enumuration.dtr.FranchiseeVisitStatus;
46
import com.spice.profitmandi.dao.enumuration.dtr.LeadStatus;
41
import com.spice.profitmandi.dao.enumuration.dtr.LeadStatus;
47
import com.spice.profitmandi.dao.enumuration.dtr.TimelineStatus;
-
 
48
import com.spice.profitmandi.dao.enumuration.dtr.StoreTimeline;
42
import com.spice.profitmandi.dao.enumuration.dtr.StoreTimeline;
49
import com.spice.profitmandi.dao.model.CreateRefferalRequest;
43
import com.spice.profitmandi.dao.model.CreateRefferalRequest;
50
import com.spice.profitmandi.dao.model.OnBoardingTimelineModel;
44
import com.spice.profitmandi.dao.model.OnBoardingTimelineModel;
51
import com.spice.profitmandi.dao.model.UserCart;
45
import com.spice.profitmandi.dao.model.UserCart;
52
import com.spice.profitmandi.dao.repository.auth.AuthRepository;
46
import com.spice.profitmandi.dao.repository.auth.AuthRepository;
Line 60... Line 54...
60
import com.spice.profitmandi.dao.repository.dtr.UserAccountRepository;
54
import com.spice.profitmandi.dao.repository.dtr.UserAccountRepository;
61
import com.spice.profitmandi.dao.repository.dtr.UserRepository;
55
import com.spice.profitmandi.dao.repository.dtr.UserRepository;
62
import com.spice.profitmandi.service.user.RetailerService;
56
import com.spice.profitmandi.service.user.RetailerService;
63
import com.spice.profitmandi.service.user.StoreTimelineTatService;
57
import com.spice.profitmandi.service.user.StoreTimelineTatService;
64
import com.spice.profitmandi.web.req.CreateFranchiseeRequest;
58
import com.spice.profitmandi.web.req.CreateFranchiseeRequest;
65
 
-
 
66
import com.spice.profitmandi.web.res.Partner;
59
import com.spice.profitmandi.web.res.Partner;
67
 
60
 
68
import io.swagger.annotations.ApiImplicitParam;
61
import io.swagger.annotations.ApiImplicitParam;
69
import io.swagger.annotations.ApiImplicitParams;
62
import io.swagger.annotations.ApiImplicitParams;
70
 
63
 
Line 181... Line 174...
181
			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
174
			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
182
	public ResponseEntity<?> getLead(HttpServletRequest request, @RequestParam(name = "id") int id)
175
	public ResponseEntity<?> getLead(HttpServletRequest request, @RequestParam(name = "id") int id)
183
			throws ProfitMandiBusinessException {
176
			throws ProfitMandiBusinessException {
184
 
177
 
185
		List<LeadActivity> leadActivities = leadActivityRepository.selectBYLeadId(id);
178
		List<LeadActivity> leadActivities = leadActivityRepository.selectBYLeadId(id);
-
 
179
		Lead lead = leadRepository.selectById(id);
-
 
180
		lead.setLeadActivities(leadActivities);
186
		return responseSender.ok(leadActivities);
181
		return responseSender.ok(lead);
187
 
182
 
188
	}
183
	}
189
 
184
 
190
	@RequestMapping(value = "/leadUpdate", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
185
	@RequestMapping(value = "/leadUpdate", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
191
	@ApiImplicitParams({
186
	@ApiImplicitParams({