Subversion Repositories SmartDukaan

Rev

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

Rev 26651 Rev 26652
Line 94... Line 94...
94
	@Autowired
94
	@Autowired
95
	private PricingService pricingService;
95
	private PricingService pricingService;
96
 
96
 
97
	@Autowired
97
	@Autowired
98
	private RetailerService retailerService;
98
	private RetailerService retailerService;
99
	
99
 
100
	@Autowired
100
	@Autowired
101
	private PendingOrderService   pendingOrderService;
101
	private PendingOrderService pendingOrderService;
102
 
102
 
103
	@Autowired
103
	@Autowired
104
	private CategoryRepository categoryRepository;
104
	private CategoryRepository categoryRepository;
105
 
105
 
106
	@Autowired
106
	@Autowired
Line 238... Line 238...
238
 
238
 
239
		return responseSender.ok(dealBrandsResponse);
239
		return responseSender.ok(dealBrandsResponse);
240
	}
240
	}
241
 
241
 
242
	@RequestMapping(value = "/store/otp/generateOTP", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
242
	@RequestMapping(value = "/store/otp/generateOTP", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
243
	public ResponseEntity<?> generateOtp(HttpServletRequest request, @RequestParam String email, @RequestParam String phone)
243
	public ResponseEntity<?> generateOtp(HttpServletRequest request, @RequestParam String email,
244
			throws Exception {
244
			@RequestParam String phone) throws Exception {
245
 
245
 
246
		return responseSender.ok(otpProcessor.generateOtp(email, phone, OtpType.PREBOOKING_ORDER));
246
		return responseSender.ok(otpProcessor.generateOtp(email, phone, OtpType.PREBOOKING_ORDER));
247
 
247
 
248
	}
248
	}
249
	
249
 
250
	@RequestMapping(value = "/store/confirmOrder", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
250
	@RequestMapping(value = "/store/confirmOrder", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
251
	public ResponseEntity<?> confirmCart(HttpServletRequest request, @RequestBody CreatePendingOrderRequest createPendingOrderRequest)
251
	public ResponseEntity<?> confirmCart(HttpServletRequest request,
252
			throws Exception {
252
			@RequestBody CreatePendingOrderRequest createPendingOrderRequest) throws Exception {
253
		UserInfo userInfo = (UserInfo) request.getAttribute("userInfo");
253
		UserInfo userInfo = (UserInfo) request.getAttribute("userInfo");
254
		Integer storeId = userInfo.getRetailerId();
254
		Integer storeId = userInfo.getRetailerId();
255
		createPendingOrderRequest.setFofoId(storeId);
255
		createPendingOrderRequest.setFofoId(storeId);
256
		this.
-
 
257
		pendingOrderService.createPendingOrder(createPendingOrderRequest);
256
		this.pendingOrderService.createPendingOrder(createPendingOrderRequest);
258
		return responseSender.ok(true);
257
		return responseSender.ok(true);
259
		
258
 
260
	}
259
	}
261
 
260
 
262
	@RequestMapping(value = "/store/address", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
261
	@RequestMapping(value = "/store/address", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
263
	@ApiImplicitParams({
262
	@ApiImplicitParams({
264
			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
263
			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
265
	@ApiOperation(value = "Get brand list and count for category")
264
	@ApiOperation(value = "Get brand list and count for category")
266
	public ResponseEntity<?> getAddress(HttpServletRequest request, @RequestBody AddCartRequest cartRequest)
265
	public ResponseEntity<?> getAddress(HttpServletRequest request)
267
			throws Exception {
266
			throws Exception {
268
		UserInfo userInfo = (UserInfo) request.getAttribute("userInfo");
267
		UserInfo userInfo = (UserInfo) request.getAttribute("userInfo");
269
		Integer storeId = userInfo.getRetailerId();
268
		Integer storeId = userInfo.getRetailerId();
270
		CustomRetailer customRetailer = retailerService.getFofoRetailer(storeId);
269
		CustomRetailer customRetailer = retailerService.getFofoRetailer(storeId);
271
		
270
 
272
		return responseSender.ok(customRetailer.getAddress());
271
		return responseSender.ok(customRetailer.getAddress());
273
		
272
 
274
	}
273
	}
-
 
274
 
275
		@RequestMapping(value = "/store/cart", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
275
	@RequestMapping(value = "/store/cart", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
276
		@ApiImplicitParams({
276
	@ApiImplicitParams({
277
			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
277
			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
278
		@ApiOperation(value = "Get brand list and count for category")
278
	@ApiOperation(value = "Get brand list and count for category")
279
		public ResponseEntity<?> cart(HttpServletRequest request, @RequestBody AddCartRequest cartRequest)
279
	public ResponseEntity<?> cart(HttpServletRequest request, @RequestBody AddCartRequest cartRequest)
280
				throws Exception {
280
			throws Exception {
281
		CartResponse cartResponse = new CartResponse();
281
		CartResponse cartResponse = new CartResponse();
282
		List<CartItemResponseModel> cartItemResponseModels = new ArrayList<>();
282
		List<CartItemResponseModel> cartItemResponseModels = new ArrayList<>();
283
		cartResponse.setCartItems(cartItemResponseModels);
283
		cartResponse.setCartItems(cartItemResponseModels);
284
 
284
 
285
		UserInfo userInfo = (UserInfo) request.getAttribute("userInfo");
285
		UserInfo userInfo = (UserInfo) request.getAttribute("userInfo");
Line 344... Line 344...
344
			cartItemResponseModels.add(cartItemResponseModel);
344
			cartItemResponseModels.add(cartItemResponseModel);
345
		}
345
		}
346
		ValidateCartResponse vc = new ValidateCartResponse(cartResponse, "Success", "Items added to cart successfully");
346
		ValidateCartResponse vc = new ValidateCartResponse(cartResponse, "Success", "Items added to cart successfully");
347
		return responseSender.ok(vc);
347
		return responseSender.ok(vc);
348
	}
348
	}
349
	
349
 
350
	private boolean validateCart(int storeId, List<CartItem> cartItems) {
350
	private boolean validateCart(int storeId, List<CartItem> cartItems) {
351
		return false;
351
		return false;
352
	}
352
	}
353
 
353
 
354
	private List<FofoCatalogResponse> getCatalogResponse(JSONArray docs, boolean hotDeal)
354
	private List<FofoCatalogResponse> getCatalogResponse(JSONArray docs, boolean hotDeal)