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

 package com.spice.profitmandi.web.controller;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.stream.Collectors;
-import javax.servlet.http.HttpServletRequest;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.http.conn.HttpHostConnectException;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.json.JSONArray;
-import org.json.JSONObject;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import com.eclipsesource.json.Json;
 import com.eclipsesource.json.JsonArray;
 import com.eclipsesource.json.JsonObject;
 import com.eclipsesource.json.JsonValue;
 import com.google.gson.Gson;
 import com.spice.profitmandi.dao.repository.dtr.UserAccountRepository;
 import com.spice.profitmandi.dao.repository.fofo.CurrentInventorySnapshotRepository;
 import com.spice.profitmandi.dao.repository.fofo.SuggestedPoDetailRepository;
 import com.spice.profitmandi.dao.repository.fofo.SuggestedPoRepository;
 import com.spice.profitmandi.service.authentication.RoleManager;
-import com.spice.profitmandi.service.inventory.AvailabilityInfo;
-import com.spice.profitmandi.service.inventory.Bucket;
+import com.spice.profitmandi.service.inventory.*;
-import com.spice.profitmandi.service.inventory.FofoAvailabilityInfo;
-import com.spice.profitmandi.service.inventory.FofoCatalogResponse;
+import com.spice.profitmandi.service.pricecircular.PriceCircularItemModel;
-import com.spice.profitmandi.service.inventory.InventoryService;
+import com.spice.profitmandi.service.pricecircular.PriceCircularModel;
-import com.spice.profitmandi.service.inventory.ItemBucketService;
-import com.spice.profitmandi.service.inventory.ItemQuantityPojo;
-import com.spice.profitmandi.service.inventory.SaholicInventoryService;
+import com.spice.profitmandi.service.pricecircular.PriceCircularService;
 import com.spice.profitmandi.service.pricing.PricingService;
 import com.spice.profitmandi.service.scheme.SchemeService;
 import com.spice.profitmandi.web.res.DealBrands;
 import com.spice.profitmandi.web.res.DealObjectResponse;
 import com.spice.profitmandi.web.res.DealsResponse;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.http.conn.HttpHostConnectException;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import javax.servlet.http.HttpServletRequest;
+import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
 @Controller
 @Transactional(rollbackFor = Throwable.class)
 public class DealsController {
 	@Autowired
 	private SchemeService schemeService;
 	@Autowired
+	PriceCircularModel priceCircularModel;
+	@Autowired
 	private SaholicInventoryService saholicInventoryService;
 	@Autowired
 	private Mongo mongoClient;
 	@Autowired
 	private TagListingRepository tagListingRepository;
 	@Autowired
 	private ItemRepository itemRepository;
+	@Autowired
+	private PriceCircularService priceCircularService;
 	@Autowired
 	private RoleManager roleManagerService;
 	@Autowired
 		// get warehouse Id
 		int warehouseId = fofoStoreRepository.selectByRetailerId(fofoId).getWarehouseId();
 		Map<Integer, List<SaholicCIS>> itemAvailabilityMap = saholicInventoryService.getSaholicStock().get(warehouseId);
 		Map<Integer, List<SaholicPOItem>> poItemAvailabilityMap = saholicInventoryService.getSaholicPOItems()
 				.get(warehouseId);
+		List<Integer> catalogIds = new ArrayList<>();
+		for (int i = 0; i < docs.length(); i++) {
+			Map<Integer, FofoAvailabilityInfo> fofoAvailabilityInfoMap = new HashMap<>();
+			JSONObject doc = docs.getJSONObject(i);
+			catalogIds.add(doc.getInt("catalogId_i"));
+		}
+		PriceCircularModel priceCircularModel = priceCircularService.getPriceCircularByOffer(fofoId, catalogIds);
+		List<PriceCircularItemModel> priceCircularItemModels = priceCircularModel.getPriceCircularItemModels();
+		Map<Integer, PriceCircularItemModel> priceCircularItemModelMap = new HashMap<>();
+		if (priceCircularItemModels != null) {
+			priceCircularItemModels.stream().collect(Collectors.toMap(x -> x.getCatalogId(), x -> x));
+		}
 		for (int i = 0; i < docs.length(); i++) {
 			Map<Integer, FofoAvailabilityInfo> fofoAvailabilityInfoMap = new HashMap<>();
 			JSONObject doc = docs.getJSONObject(i);
 			FofoCatalogResponse ffdr = new FofoCatalogResponse();
 			ffdr.setCatalogId(doc.getInt("catalogId_i"));
 					float sellingPrice = (float) childItem.getDouble("sellingPrice_f");
 					if (fofoAvailabilityInfoMap.containsKey(itemId)) {
 						if (fofoAvailabilityInfoMap.get(itemId).getSellingPrice() > sellingPrice) {
 							fofoAvailabilityInfoMap.get(itemId).setSellingPrice(sellingPrice);
 							fofoAvailabilityInfoMap.get(itemId).setMop((float) childItem.getDouble("mop_f"));
+							PriceCircularItemModel priceCircularItemModel = priceCircularItemModels.get(ffdr.getCatalogId());
+							fofoAvailabilityInfoMap.get(itemId).setNlc(priceCircularItemModel == null ? 0 : priceCircularItemModel.getNetPrice2());
+						}
 					} else {
 						FofoAvailabilityInfo fdi = new FofoAvailabilityInfo();
 						List<SaholicCIS> currentAvailability = itemAvailabilityMap.get(itemId);
 						List<SaholicPOItem> poItemAvailability = null;
 						if (fdi.getColor().equalsIgnoreCase("any colour")) {
 							fdiAnyColour = fdi;
+						}
 						fdi.setTagId(childItem.getInt("tagId_i"));
 						fdi.setItem_id(itemId);
-						Float cashBack = schemeService.getItemSchemeCashBack().get(itemId);
+						Float cashBack = schemeService.getCatalogSchemeCashBack().get(ffdr.getCatalogId());
 						cashBack = cashBack == null ? 0 : cashBack;
 						fdi.setCashback(cashBack);
 						fdi.setMinBuyQuantity(1);
 						if (hotDeal) {
 							if (currentAvailability != null) {

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/DealsController.java – Rev 28696 → 30123