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

 				solrService.getSolrDocs(queryTerm, categoryId, offset, limit, sort, brand, subCategoryId, hotDeal),
 				hotDeal, userInfo.getRetailerId());
 		return responseSender.ok(dealResponse);
+	}
 	@ApiImplicitParams({
 			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
 	@RequestMapping(value = "/partnerStock", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
 	public ResponseEntity<?> partnerStock(HttpServletRequest request,
 			@RequestParam(value = "categoryId", required = false, defaultValue = "3") String categoryId,
+			}
+		}
 		return responseSender.ok(responseObject);
+	}
-	private List<FofoCatalogResponse> getCatalogResponse(JSONArray docs, boolean hotDeal, int fofoId)
+	private List<FofoCatalogResponse> getCatalogResponse(JSONArray docs, boolean hotDeal, int fofoId) throws Exception {
-			throws Exception {
 		List<FofoCatalogResponse> dealResponse = new ArrayList<>();
 		List<Integer> tagIds = Arrays.asList(4);
 		List<Integer> itemIds = new ArrayList<>();
 		if (docs.length() > 0) {
 			for (int i = 0; i < docs.length(); i++) {
+			}
 			if (itemIds.size() == 0) {
 				return dealResponse;
+			}
+		}
-		//get warehouse Id
+		// 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);
+		Map<Integer, List<SaholicPOItem>> poItemAvailabilityMap = saholicInventoryService.getSaholicPOItems()
+				.get(warehouseId);
 		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"));
 							fofoAvailabilityInfoMap.get(itemId).setMop((float) childItem.getDouble("mop_f"));
+						}
 					} else {
 						FofoAvailabilityInfo fdi = new FofoAvailabilityInfo();
 						List<SaholicCIS> currentAvailability = itemAvailabilityMap.get(itemId);
 						List<SaholicPOItem> poItemAvailability = poItemAvailabilityMap.get(itemId);
+						Map<Integer, SaholicCIS> map = null;
+						if (currentAvailability != null) {
+							map = currentAvailability.stream()
+									.collect(Collectors.toMap(SaholicCIS::getWarehouseFrom, x -> x));
+							if (poItemAvailability != null) {
+								for (SaholicPOItem saholicPOItem : poItemAvailability) {
+									if (map.containsKey(saholicPOItem.getWarehouseFrom())) {
+										map.get(saholicPOItem.getWarehouseFrom())
+												.setPopendingQty(saholicPOItem.getUnfulfilledQty());
+									} else {
+										SaholicCIS saholicCIS = new SaholicCIS();
+										saholicCIS.setAvailability(0);
+										saholicCIS.setReserved(0);
+										saholicCIS.setItemId(itemId);
+										saholicCIS.setPopendingQty(saholicPOItem.getUnfulfilledQty());
+										saholicCIS.setWarehouseFrom(saholicPOItem.getWarehouseFrom());
+										map.put(saholicPOItem.getWarehouseFrom(), saholicCIS);
+									}
+								}
+							}
+						} else {
+							map = new HashMap<>();
+							if (poItemAvailability != null) {
+								for (SaholicPOItem saholicPOItem : poItemAvailability) {
+									SaholicCIS saholicCIS = new SaholicCIS();
+									saholicCIS.setAvailability(0);
+									saholicCIS.setReserved(0);
+									saholicCIS.setItemId(itemId);
+									saholicCIS.setPopendingQty(saholicPOItem.getUnfulfilledQty());
+									saholicCIS.setWarehouseFrom(saholicPOItem.getWarehouseFrom());
+									map.put(saholicPOItem.getWarehouseFrom(), saholicCIS);
+								}
+							}
+						}
+						fdi.setSaholicCISList(new ArrayList<>(map.values()));
 						String poColor = "grey";
 						boolean active = false;
+						if (currentAvailability != null && currentAvailability.stream()
-						if(currentAvailability != null && currentAvailability.stream().collect(Collectors.summingInt(SaholicCIS::getNetavailability)) > 0) {
+								.collect(Collectors.summingInt(SaholicCIS::getNetavailability)) > 0) {
-								poColor = "green";
+							poColor = "green";
-								modelColorClass = "green";
+							modelColorClass = "green";
+						} else if (poItemAvailability != null && poItemAvailability.stream()
-						} else if (poItemAvailability != null && poItemAvailability.stream().collect(Collectors.summingInt(SaholicPOItem::getUnfulfilledQty)) > 0) {
+								.collect(Collectors.summingInt(SaholicPOItem::getUnfulfilledQty)) > 0) {
-							if(currentAvailability != null
+							if (currentAvailability != null && poItemAvailability.stream()
-							&& poItemAvailability.stream().collect(Collectors.summingInt(SaholicPOItem::getUnfulfilledQty))
+									.collect(Collectors.summingInt(SaholicPOItem::getUnfulfilledQty))
+									+ currentAvailability.stream()
-								+ currentAvailability.stream().collect(Collectors.summingInt(SaholicCIS::getNetavailability))
+											.collect(Collectors.summingInt(SaholicCIS::getNetavailability)) <= 0) {
-							<= 0) {
 								poColor = "grey";
 							} else {
 								poColor = "yellow";
-								if(modelColorClass!="green") {
+								if (modelColorClass != "green") {
 									modelColorClass = poColor;
+								}
+							}
+						}
 						fdi.setColorClass(poColor);
 						fdi.setActive(active);
 						fdi.setMrp(childItem.getDouble("mrp_f"));
 						fdi.setMop((float) childItem.getDouble("mop_f"));
 						fdi.setColor(childItem.has("color_s") ? childItem.getString("color_s") : "");
 						if (fdi.getColor().equalsIgnoreCase("any colour")) {
 							fdiAnyColour = fdi;
+						}
 						fdi.setTagId(childItem.getInt("tagId_i"));
 						fdi.setItem_id(itemId);
 						Float cashBack = schemeService.getItemSchemeCashBack().get(itemId);
 						cashBack = cashBack == null ? 0 : cashBack;
 						fdi.setCashback(cashBack);
 						fdi.setMinBuyQuantity(1);
 						if (hotDeal) {
-							if(currentAvailability != null ) {
+							if (currentAvailability != null) {
+								fdi.setAvailability(currentAvailability.stream()
-								fdi.setAvailability(currentAvailability.stream().collect(Collectors.summingInt(SaholicCIS::getNetavailability)));
+										.collect(Collectors.summingInt(SaholicCIS::getNetavailability)));
 							} else {
 								fdi.setAvailability(0);
+							}
 						} else {
 							fdi.setAvailability(100);
 						fdi.setQuantityStep(1);
 						fdi.setMaxQuantity(Math.min(fdi.getAvailability(), 100));
 						fofoAvailabilityInfoMap.put(itemId, fdi);
+					}
+				}
-				if(fdiAnyColour != null) {
+				if (fdiAnyColour != null) {
 					fdiAnyColour.setColorClass(modelColorClass);
+				}
+			}
 			if (fofoAvailabilityInfoMap.values().size() > 0) {
-				List<FofoAvailabilityInfo> availabilityList = fofoAvailabilityInfoMap.values()
+				List<FofoAvailabilityInfo> availabilityList = fofoAvailabilityInfoMap.values().stream()
-				.stream().sorted(Comparator.comparing(FofoAvailabilityInfo::getAvailability).reversed()).collect(Collectors.toList());
+						.sorted(Comparator.comparing(FofoAvailabilityInfo::getAvailability).reversed())
+						.collect(Collectors.toList());
 				ffdr.setItems(availabilityList);
 				dealResponse.add(ffdr);
+			}
+		}
-		}return dealResponse;
+		return dealResponse;
+	}
 	private List<FofoCatalogResponse> getCatalogSingleSkuResponse(JSONArray docs, Map<Integer, Integer> itemFilter,
 			boolean hotDeal) throws ProfitMandiBusinessException {

Subversion Repositories SmartDukaan

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