Subversion Repositories SmartDukaan

Rev

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

Rev 30753 Rev 30957
Line 390... Line 390...
390
	public ResponseEntity<?> processOfferRequest(HttpServletRequest request, @PathVariable int offerId, Model model)
390
	public ResponseEntity<?> processOfferRequest(HttpServletRequest request, @PathVariable int offerId, Model model)
391
			throws Exception {
391
			throws Exception {
392
		CreateOfferRequest createOfferRequest = offerService.getOffer(0, offerId);
392
		CreateOfferRequest createOfferRequest = offerService.getOffer(0, offerId);
393
		if (createOfferRequest.getSchemeType().equals(OfferSchemeType.SELLIN)) {
393
		if (createOfferRequest.getSchemeType().equals(OfferSchemeType.SELLIN)) {
394
			offerRepository.processSellin(createOfferRequest);
394
			offerRepository.processSellin(createOfferRequest);
-
 
395
		} else if (createOfferRequest.getSchemeType().equals(OfferSchemeType.ACTIVATION)) {
-
 
396
			offerRepository.processActivationtOffer(createOfferRequest);
395
		}
397
		}
396
		return responseSender.ok(true);
398
		return responseSender.ok(true);
397
	}
399
	}
398
 
400
 
399
	@RequestMapping(value = "/offerDownload", method = RequestMethod.GET)
401
	@RequestMapping(value = "/offerDownload", method = RequestMethod.GET)
Line 423... Line 425...
423
							"Item Criteria", "Start", "End", "Created", "Partner Id", "Partner Name", "Partner Code",
425
							"Item Criteria", "Start", "End", "Created", "Partner Id", "Partner Name", "Partner Code",
424
							"Base Purchase", "Achieved Target", "Eligible Purchase", "Slab Amount", "Slab Amount Type", "Payout Value(Rs.)",
426
							"Base Purchase", "Achieved Target", "Eligible Purchase", "Slab Amount", "Slab Amount Type", "Payout Value(Rs.)",
425
							"Eligible IMEIs"
427
							"Eligible IMEIs"
426
					), listOfRows);
428
					), listOfRows);
427
		} else {
429
		} else {
428
 
-
 
429
			for (OfferRowModel offerRowModel : offerRowModels) {
430
			for (OfferRowModel offerRowModel : offerRowModels) {
430
				CustomRetailer customRetailer = retailerService.getFofoRetailer(offerRowModel.getFofoId());
431
				CustomRetailer customRetailer = retailerService.getFofoRetailer(offerRowModel.getFofoId());
431
				listOfRows.add(Arrays.asList(createOfferRequest.getId(), createOfferRequest.getName(),
432
				listOfRows.add(Arrays.asList(createOfferRequest.getId(), createOfferRequest.getName(),
432
						createOfferRequest.getTargetType(), createOfferRequest.getSchemeType(),
433
						createOfferRequest.getTargetType(), createOfferRequest.getSchemeType(),
433
						createOfferRequest.getBrandShareTerms(), createOfferRequest.getSellinPercentage(),
434
						createOfferRequest.getBrandShareTerms(), createOfferRequest.getSellinPercentage(),