Subversion Repositories SmartDukaan

Rev

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

Rev 26675 Rev 26694
Line 553... Line 553...
553
 
553
 
554
		Map<Integer, CustomRetailer> customRetailersMap = retailerService.getFofoRetailers(fofoIds);
554
		Map<Integer, CustomRetailer> customRetailersMap = retailerService.getFofoRetailers(fofoIds);
555
 
555
 
556
		model.addAttribute("customRetailersMap", customRetailersMap);
556
		model.addAttribute("customRetailersMap", customRetailersMap);
557
		model.addAttribute("itemCriteriaType", ItemCriteriaType.values());
557
		model.addAttribute("itemCriteriaType", ItemCriteriaType.values());
558
		model.addAttribute("partnerType", PartnerType.values());
-
 
559
		model.addAttribute("brands", brands);
558
		model.addAttribute("brands", brands);
560
		return "scheme_offer";
559
		return "scheme_offer";
561
 
560
 
562
	}
561
	}
563
 
562
 
Line 574... Line 573...
574
		offer.setAmountType(createOfferRequest.getAmountType());
573
		offer.setAmountType(createOfferRequest.getAmountType());
575
		offer.setStartDateTime(createOfferRequest.getStartDate());
574
		offer.setStartDateTime(createOfferRequest.getStartDate());
576
		offer.setEndDateTime(createOfferRequest.getEndDate());
575
		offer.setEndDateTime(createOfferRequest.getEndDate());
577
		offer.setPrice(createOfferRequest.getPrice());
576
		offer.setPrice(createOfferRequest.getPrice());
578
		offer.setCreatedTimestamp(LocalDateTime.now());
577
		offer.setCreatedTimestamp(LocalDateTime.now());
-
 
578
		offer.setSchemeType(createOfferRequest.getSchemeType());
579
		offer.setCriteria(createOfferRequest.getCriteria());
579
		offer.setCriteria(createOfferRequest.getCriteria());
580
		offer.setPartnerType(createOfferRequest.getPartnerType());
580
		offer.setPartnerType(createOfferRequest.getPartnerType());
581
 
581
 
582
		if (createOfferRequest.getItemCriteria().equals(ItemCriteriaType.Item_Model)) {
582
		if (createOfferRequest.getItemCriteria().equals(ItemCriteriaType.Item_Model)) {
583
			ItemTypeParams itemTypeParams = new ItemTypeParams();
583
			ItemTypeParams itemTypeParams = new ItemTypeParams();
Line 639... Line 639...
639
	public String createOffer(HttpServletRequest request, @RequestParam(name = "offset", defaultValue = "0") int offset,
639
	public String createOffer(HttpServletRequest request, @RequestParam(name = "offset", defaultValue = "0") int offset,
640
			@RequestParam(name = "limit", defaultValue = "10") int limit, Model model) throws Exception {
640
			@RequestParam(name = "limit", defaultValue = "10") int limit, Model model) throws Exception {
641
 
641
 
642
		List<Offer> offers = offerRepository.selectAll(offset, limit);
642
		List<Offer> offers = offerRepository.selectAll(offset, limit);
643
 
643
 
644
		Map<Integer, String> statusMap = this.offerStatus(offers);
-
 
645
 
-
 
646
		model.addAttribute("offers", offers);
644
		model.addAttribute("offers", offers);
647
		model.addAttribute("statusMap", statusMap);
-
 
-
 
645
 
648
		return "offer_history";
646
		return "offer_history";
649
 
647
 
650
	}
648
	}
651
 
649
 
652
	private Map<Integer, String> offerStatus(List<Offer> offers) {
650
	@RequestMapping(value = "/updateOfferStatus", method = RequestMethod.POST)
653
		Map<Integer, String> statusMap = new HashMap<>();
651
	public String updateOfferStatus(HttpServletRequest request, @RequestParam int id, Model model) throws Exception {
-
 
652
 
654
		for (Offer offer : offers) {
653
		Offer offer = offerRepository.selectById(id);
655
			LocalDateTime curDate = LocalDateTime.now();
-
 
656
			if (offer.getStartDateTime().isAfter(curDate)) {
-
 
657
				statusMap.put(offer.getId(), "Schedule");
654
		LOGGER.info("status" + offer.getStatus());
658
 
655
 
659
			} else if (offer.getEndDateTime().isBefore(curDate)) {
656
		if (offer.getStatus() == false) {
660
				statusMap.put(offer.getId(), "Closed");
657
			offer.setStatus(true);
661
			} else if (offer.getStartDateTime().isBefore(curDate) && offer.getEndDateTime().isAfter(curDate)) {
658
		} else {
662
				statusMap.put(offer.getId(), "Running");
659
			offer.setStatus(false);
663
			}
-
 
664
		}
660
		}
-
 
661
		model.addAttribute("response", mvcResponseSender.createResponseString(true));
-
 
662
		return "response";
665
 
663
 
666
		return statusMap;
-
 
667
	}
664
	}
668
 
665
 
669
	@RequestMapping(value = "/getOfferMargin", method = RequestMethod.GET)
666
	@RequestMapping(value = "/getOfferMargin", method = RequestMethod.GET)
670
	public String getOfferMargin(HttpServletRequest request,
667
	public String getOfferMargin(HttpServletRequest request,
671
			@RequestParam(name = "offerId", defaultValue = "0") int offerId, Model model) throws Exception {
668
			@RequestParam(name = "offerId", defaultValue = "0") int offerId, Model model) throws Exception {