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



 
		model.addAttribute("customRetailersMap", customRetailersMap);
		model.addAttribute("itemCriteriaType", ItemCriteriaType.values());
		model.addAttribute("brands", brands);
		model.addAttribute("partnerCategories", PartnerType.values());
 
 
		return "scheme_offer";
 
	}
 
	@RequestMapping(value = "/createOffer", method = RequestMethod.POST)

		LOGGER.info("createOfferRequest" + createOfferRequest.getAmountOffer());
 
		Offer offer = new Offer();
		offer.setName(createOfferRequest.getName());
		offer.setDescription(createOfferRequest.getDescription());
		offer.setItemCreteria(createOfferRequest.getItemCriteria());
		offer.setTargetType(createOfferRequest.getTargetType());
		offer.setAmountType(createOfferRequest.getAmountType());
		offer.setStartDateTime(createOfferRequest.getStartDate());
		offer.setEndDateTime(createOfferRequest.getEndDate());
		offer.setPrice(createOfferRequest.getPrice());
		offer.setCreatedTimestamp(LocalDateTime.now());
		offer.setSchemeType(createOfferRequest.getSchemeType());
 
		offer.setCriteria(createOfferRequest.getCriteria());
		offer.setPartnerType(createOfferRequest.getPartnerType());
 
		if (createOfferRequest.getItemCriteria().equals(ItemCriteriaType.Item_Model)) {
			ItemTypeParams itemTypeParams = new ItemTypeParams();
			itemTypeParams.setCatalogId(createOfferRequest.getCatalogIds());
			SimpleItemType sit = new SimpleItemType(itemTypeParams);
			sit.setItemTypeParams(itemTypeParams);
			offer.setItemParam(gson.toJson(itemTypeParams));
		} else if (createOfferRequest.getItemCriteria().equals(ItemCriteriaType.Multiple_Brand)) {
			ItemTypeParams itemTypeParams = new ItemTypeParams();
			itemTypeParams.setBrands(createOfferRequest.getBrands());
			SimpleItemType sit = new SimpleItemType(itemTypeParams);
			sit.setItemTypeParams(itemTypeParams);
			offer.setItemParam(gson.toJson(itemTypeParams));
		}
 
		offerRepository.persist(offer);
		if (createOfferRequest.getFofoIds().isEmpty()) {
			List<Integer> fofoIds = fofoStoreRepository.selectActiveStores().stream().map(x -> x.getId())
					.collect(Collectors.toList());
			for (Integer fofoId : fofoIds) {
				PartnerType partnerType = partnerTypeChangeService.getTypeOnDate(fofoId,
						offer.getStartDateTime().toLocalDate());
				if (offer.getPartnerType().equals(partnerType)) {
					LOGGER.info("partnerType" + partnerType);
					LOGGER.info("fofoId" + fofoId);
 
					OfferPartner op = new OfferPartner();
					op.setFofoId(fofoId);
					op.setOfferId(offer.getId());
					offerPartnerRepository.persist(op);
				}
 
			}
		}
 
		else {

		Map<Integer, CustomRetailer> customRetailersMap = retailerService.getFofoRetailers(fofoIds);
		List<OfferPartner> offerPartners = offerPartnerRepository.selectByOfferId(offerId);
 
		LOGGER.info("offerId" + offer.getId());
 
		Map<Integer, Double> value = offerRepository.selectSumOfferByRetailer(offer.getStartDateTime(),
				offer.getEndDateTime(), 0, offer, true);
 
		LOGGER.info("value" + value);
		List<Offermargin> offerMargin = offerMarginRepository.selectByOfferId(offerId);
		Map<Integer, Double> partnerValueMap = new HashMap<>();
		Map<Integer, List<Double>> partnerMarginMap = new HashMap<Integer, List<Double>>();

 
		LOGGER.info("ExtendDatetime" + extendDatetime);
		LOGGER.info("schemeId" + offerId);
		Offer offer = offerRepository.selectById(offerId);
 
		offer.setEndDateTime(extendDatetime);
		offerRepository.persist(offer);
		model.addAttribute("response", mvcResponseSender.createResponseString(true));
 
		return "response";
	}

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/SchemeController.java – Rev 27361 → 27362

Rev 27361		Rev 27362
Line 656...		Line 656...
656		656
657	`model.addAttribute("customRetailersMap", customRetailersMap);`	657	`model.addAttribute("customRetailersMap", customRetailersMap);`
658	`model.addAttribute("itemCriteriaType", ItemCriteriaType.values());`	658	`model.addAttribute("itemCriteriaType", ItemCriteriaType.values());`
659	`model.addAttribute("brands", brands);`	659	`model.addAttribute("brands", brands);`
660	`model.addAttribute("partnerCategories", PartnerType.values());`	660	`model.addAttribute("partnerCategories", PartnerType.values());`
661	`model.addAttribute("warehouseRegion", ProfitMandiConstants.WAREHOUSE_MAP);`	-
662	`//model.addAttribute("brands", "");`	-
663	`return "scheme_offer";`	661	`return "scheme_offer";`
664		662
665	`}`	663	`}`
666		664
667	`@RequestMapping(value = "/createOffer", method = RequestMethod.POST)`	665	`@RequestMapping(value = "/createOffer", method = RequestMethod.POST)`
Line 670...		Line 668...
670	`LOGGER.info("createOfferRequest" + createOfferRequest.getAmountOffer());`	668	`LOGGER.info("createOfferRequest" + createOfferRequest.getAmountOffer());`
671		669
672	`Offer offer = new Offer();`	670	`Offer offer = new Offer();`
673	`offer.setName(createOfferRequest.getName());`	671	`offer.setName(createOfferRequest.getName());`
674	`offer.setDescription(createOfferRequest.getDescription());`	672	`offer.setDescription(createOfferRequest.getDescription());`
-		673	`offer.setItemCreteria(createOfferRequest.getItemCriteria());`
675	`offer.setTargetType(createOfferRequest.getTargetType());`	674	`offer.setTargetType(createOfferRequest.getTargetType());`
676	`offer.setAmountType(createOfferRequest.getAmountType());`	675	`offer.setAmountType(createOfferRequest.getAmountType());`
677	`offer.setStartDate(createOfferRequest.getStartDate());`	676	`offer.setStartDateTime(createOfferRequest.getStartDate());`
678	`offer.setEndDate(createOfferRequest.getEndDate());`	677	`offer.setEndDateTime(createOfferRequest.getEndDate());`
-		678	`offer.setPrice(createOfferRequest.getPrice());`
679	`offer.setCreatedTimestamp(LocalDateTime.now());`	679	`offer.setCreatedTimestamp(LocalDateTime.now());`
680	`offer.setSchemeType(createOfferRequest.getSchemeType());`	680	`offer.setSchemeType(createOfferRequest.getSchemeType());`
681	`//offer.setItemCreteria(createOfferRequest.getItemCriteria());`	-
682	`//offer.setCriteria(createOfferRequest.getCriteria());`	681	`offer.setCriteria(createOfferRequest.getCriteria());`
683	`//offer.setPartnerType(createOfferRequest.getPartnerType());`	682	`offer.setPartnerType(createOfferRequest.getPartnerType());`
684		683
685	`if (createOfferRequest.getItemCriteria().equals(ItemCriteriaType.Item_Model)) {`	684	`if (createOfferRequest.getItemCriteria().equals(ItemCriteriaType.Item_Model)) {`
686	`ItemTypeParams itemTypeParams = new ItemTypeParams();`	685	`ItemTypeParams itemTypeParams = new ItemTypeParams();`
687	`itemTypeParams.setCatalogId(createOfferRequest.getCatalogIds());`	686	`itemTypeParams.setCatalogId(createOfferRequest.getCatalogIds());`
688	`SimpleItemType sit = new SimpleItemType(itemTypeParams);`	687	`SimpleItemType sit = new SimpleItemType(itemTypeParams);`
689	`sit.setItemTypeParams(itemTypeParams);`	688	`sit.setItemTypeParams(itemTypeParams);`
690	`//offer.setItemParam(gson.toJson(itemTypeParams));`	689	`offer.setItemParam(gson.toJson(itemTypeParams));`
691	`} else if (createOfferRequest.getItemCriteria().equals(ItemCriteriaType.Multiple_Brand)) {`	690	`} else if (createOfferRequest.getItemCriteria().equals(ItemCriteriaType.Multiple_Brand)) {`
692	`ItemTypeParams itemTypeParams = new ItemTypeParams();`	691	`ItemTypeParams itemTypeParams = new ItemTypeParams();`
693	`itemTypeParams.setBrands(createOfferRequest.getBrands());`	692	`itemTypeParams.setBrands(createOfferRequest.getBrands());`
694	`SimpleItemType sit = new SimpleItemType(itemTypeParams);`	693	`SimpleItemType sit = new SimpleItemType(itemTypeParams);`
695	`sit.setItemTypeParams(itemTypeParams);`	694	`sit.setItemTypeParams(itemTypeParams);`
696	`//offer.setItemParam(gson.toJson(itemTypeParams));`	695	`offer.setItemParam(gson.toJson(itemTypeParams));`
697	`}`	696	`}`
698		697
699	`offerRepository.persist(offer);`	698	`offerRepository.persist(offer);`
700	`if (createOfferRequest.getFofoIds().isEmpty()) {`	699	`if (createOfferRequest.getFofoIds().isEmpty()) {`
701	`List<Integer> fofoIds = fofoStoreRepository.selectActiveStores().stream().map(x -> x.getId())`	700	`List<Integer> fofoIds = fofoStoreRepository.selectActiveStores().stream().map(x -> x.getId())`
702	`.collect(Collectors.toList());`	701	`.collect(Collectors.toList());`
703	`for (Integer fofoId : fofoIds) {`	702	`for (Integer fofoId : fofoIds) {`
704	`PartnerType partnerType = partnerTypeChangeService.getTypeOnDate(fofoId,`	703	`PartnerType partnerType = partnerTypeChangeService.getTypeOnDate(fofoId,`
705	`offer.getStartDate().toLocalDate());`	704	`offer.getStartDateTime().toLocalDate());`
706	`/*if (offer.getPartner().equals(partnerType)) {`	705	`if (offer.getPartnerType().equals(partnerType)) {`
707	`LOGGER.info("partnerType" + partnerType);`	706	`LOGGER.info("partnerType" + partnerType);`
708	`LOGGER.info("fofoId" + fofoId);`	707	`LOGGER.info("fofoId" + fofoId);`
709		708
710	`OfferPartner op = new OfferPartner();`	709	`OfferPartner op = new OfferPartner();`
711	`op.setFofoId(fofoId);`	710	`op.setFofoId(fofoId);`
712	`op.setOfferId(offer.getId());`	711	`op.setOfferId(offer.getId());`
713	`offerPartnerRepository.persist(op);`	712	`offerPartnerRepository.persist(op);`
714	`}*/`	713	`}`
715		714
716	`}`	715	`}`
717	`}`	716	`}`
718		717
719	`else {`	718	`else {`
Line 848...		Line 847...
848	`Map<Integer, CustomRetailer> customRetailersMap = retailerService.getFofoRetailers(fofoIds);`	847	`Map<Integer, CustomRetailer> customRetailersMap = retailerService.getFofoRetailers(fofoIds);`
849	`List<OfferPartner> offerPartners = offerPartnerRepository.selectByOfferId(offerId);`	848	`List<OfferPartner> offerPartners = offerPartnerRepository.selectByOfferId(offerId);`
850		849
851	`LOGGER.info("offerId" + offer.getId());`	850	`LOGGER.info("offerId" + offer.getId());`
852		851
853	`Map<Integer, Double> value = offerRepository.selectSumOfferByRetailer(offer.getStartDate(),`	852	`Map<Integer, Double> value = offerRepository.selectSumOfferByRetailer(offer.getStartDateTime(),`
854	`offer.getEndDate(), 0, offer, true);`	853	`offer.getEndDateTime(), 0, offer, true);`
855		854
856	`LOGGER.info("value" + value);`	855	`LOGGER.info("value" + value);`
857	`List<Offermargin> offerMargin = offerMarginRepository.selectByOfferId(offerId);`	856	`List<Offermargin> offerMargin = offerMarginRepository.selectByOfferId(offerId);`
858	`Map<Integer, Double> partnerValueMap = new HashMap<>();`	857	`Map<Integer, Double> partnerValueMap = new HashMap<>();`
859	`Map<Integer, List<Double>> partnerMarginMap = new HashMap<Integer, List<Double>>();`	858	`Map<Integer, List<Double>> partnerMarginMap = new HashMap<Integer, List<Double>>();`
Line 948...		Line 947...
948		947
949	`LOGGER.info("ExtendDatetime" + extendDatetime);`	948	`LOGGER.info("ExtendDatetime" + extendDatetime);`
950	`LOGGER.info("schemeId" + offerId);`	949	`LOGGER.info("schemeId" + offerId);`
951	`Offer offer = offerRepository.selectById(offerId);`	950	`Offer offer = offerRepository.selectById(offerId);`
952		951
953	`offer.setEndDate(extendDatetime);`	952	`offer.setEndDateTime(extendDatetime);`
954	`offerRepository.persist(offer);`	953	`offerRepository.persist(offer);`
955	`model.addAttribute("response", mvcResponseSender.createResponseString(true));`	954	`model.addAttribute("response", mvcResponseSender.createResponseString(true));`
956		955
957	`return "response";`	956	`return "response";`
958	`}`	957	`}`