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

 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.ListIterator;
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletRequest;
 import com.spice.profitmandi.common.model.SchemeItems;
 import com.spice.profitmandi.common.model.SchemeModel;
 import com.spice.profitmandi.common.util.ExcelUtils;
 import com.spice.profitmandi.common.util.StringUtils;
 import com.spice.profitmandi.common.web.util.ResponseSender;
+import com.spice.profitmandi.dao.entity.catalog.Item;
 import com.spice.profitmandi.dao.entity.catalog.Offer;
 import com.spice.profitmandi.dao.entity.catalog.OfferPartner;
 import com.spice.profitmandi.dao.entity.catalog.Offermargin;
 import com.spice.profitmandi.dao.entity.catalog.Scheme;
 import com.spice.profitmandi.dao.entity.fofo.PartnerType;
+import com.spice.profitmandi.dao.entity.fofo.PrebookingListing;
 import com.spice.profitmandi.dao.entity.fofo.SchemeItem;
 import com.spice.profitmandi.dao.enumuration.catalog.ItemCriteriaType;
 import com.spice.profitmandi.dao.model.AmountMarginModel;
 import com.spice.profitmandi.dao.model.CreateOfferRequest;
 import com.spice.profitmandi.dao.model.CreateSchemeRequest;
 		model.addAttribute("customRetailersMap", customRetailersMap);
 		model.addAttribute("itemCriteriaType", ItemCriteriaType.values());
 		model.addAttribute("brands", brands);
 		model.addAttribute("partnerCategories", PartnerType.values());
-		model.addAttribute("warehouseRegion", ProfitMandiConstants.WAREHOUSE_MAP);
-		// model.addAttribute("brands", "");
 		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.setStartDate(createOfferRequest.getStartDate());
+		offer.setStartDateTime(createOfferRequest.getStartDate());
-		offer.setEndDate(createOfferRequest.getEndDate());
+		offer.setEndDateTime(createOfferRequest.getEndDate());
+		offer.setPrice(createOfferRequest.getPrice());
 		offer.setCreatedTimestamp(LocalDateTime.now());
 		offer.setSchemeType(createOfferRequest.getSchemeType());
-		// offer.setItemCreteria(createOfferRequest.getItemCriteria());
-		// offer.setCriteria(createOfferRequest.getCriteria());
+		offer.setCriteria(createOfferRequest.getCriteria());
-		// offer.setPartnerType(createOfferRequest.getPartnerType());
+		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));
+			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));
+			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.getStartDate().toLocalDate());
+						offer.getStartDateTime().toLocalDate());
-				/*
-				 * if (offer.getPartner().equals(partnerType)) { LOGGER.info("partnerType" +
+				if (offer.getPartnerType().equals(partnerType)) {
+					LOGGER.info("partnerType" + partnerType);
-				 * partnerType); LOGGER.info("fofoId" + fofoId);
+					LOGGER.info("fofoId" + fofoId);
-				 *
-				 * OfferPartner op = new OfferPartner(); op.setFofoId(fofoId);
+					OfferPartner op = new OfferPartner();
+					op.setFofoId(fofoId);
+					op.setOfferId(offer.getId());
-				 * op.setOfferId(offer.getId()); offerPartnerRepository.persist(op); }
+					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.getStartDate(), offer.getEndDate(),
+		Map<Integer, Double> value = offerRepository.selectSumOfferByRetailer(offer.getStartDateTime(),
-, offer, true);
+				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("partnerMarginMap" + partnerMarginMap);
 		LOGGER.info("partnerValueMap" + partnerValueMap);
 		LOGGER.info("shortageAmount" + shortageAmount);
-		/*
-		 * ItemTypeParams scp = gson.fromJson(offer.getItemParam(),
+		ItemTypeParams scp = gson.fromJson(offer.getItemParam(), ItemTypeParams.class);
-		 * ItemTypeParams.class); if
-		 * (offer.getItemCriteria().equals(ItemCriteriaType.Multiple_Brand)) {
+		if (offer.getItemCriteria().equals(ItemCriteriaType.Multiple_Brand)) {
-		 * List<String> brands = scp.getBrands(); model.addAttribute("brands", brands);
+			List<String> brands = scp.getBrands();
+			model.addAttribute("brands", brands);
+		}
-		 * } if (offer.getItemCriteria().equals(ItemCriteriaType.Item_Model)) {
+		if (offer.getItemCriteria().equals(ItemCriteriaType.Item_Model)) {
-		 * List<Integer> catalogIds = scp.getCatalogId(); List<Item> newList = new
+			List<Integer> catalogIds = scp.getCatalogId();
+			List<Item> newList = new ArrayList<>();
-		 * ArrayList<>(); Set<Integer> catalogId = new HashSet<>(); List<Item> items =
+			Set<Integer> catalogId = new HashSet<>();
-		 * itemRepository.selectAllByCatalogIds(catalogIds.stream().collect(Collectors.
+			List<Item> items = itemRepository.selectAllByCatalogIds(catalogIds.stream().collect(Collectors.toSet()));
-		 * toSet())); for (Item item : items) { if
+			for (Item item : items) {
-		 * (catalogId.add(item.getCatalogItemId())) { newList.add(item); } }
+				if (catalogId.add(item.getCatalogItemId())) {
+					newList.add(item);
+				}
+			}
-		 * model.addAttribute("items", newList); }
+			model.addAttribute("items", newList);
-		 */
+		}
 		model.addAttribute("partnerMarginMap", partnerMarginMap);
 		model.addAttribute("partnerValueMap", partnerValueMap);
 		model.addAttribute("customRetailersMap", customRetailersMap);
 		model.addAttribute("offerMargin", offerMargin);
 		model.addAttribute("offer", offer);
 		LOGGER.info("ExtendDatetime" + extendDatetime);
 		LOGGER.info("schemeId" + offerId);
 		Offer offer = offerRepository.selectById(offerId);
-		offer.setEndDate(extendDatetime);
+		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 27377 → 27387