Subversion Repositories SmartDukaan

Rev

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

Rev 23781 Rev 23821
Line 143... Line 143...
143
		List<TagListing> tagListings = this.getTagListing(itemIds, retailerId);
143
		List<TagListing> tagListings = this.getTagListing(itemIds, retailerId);
144
		for(TagListing tagListing : tagListings){
144
		for(TagListing tagListing : tagListings){
145
			if(itemIdPrice.get(tagListing.getItemId()).getPrice() > tagListing.getMop()){
145
			if(itemIdPrice.get(tagListing.getItemId()).getPrice() > tagListing.getMop()){
146
				itemIdPrice.get(tagListing.getItemId()).setPrice(tagListing.getMop());
146
				itemIdPrice.get(tagListing.getItemId()).setPrice(tagListing.getMop());
147
				itemIdPrice.get(tagListing.getItemId()).setMop(true);
147
				itemIdPrice.get(tagListing.getItemId()).setMop(true);
-
 
148
				itemIdPrice.get(tagListing.getItemId()).setPurchasePrice(tagListing.getSellingPrice());
148
				itemIdPrice.get(tagListing.getItemId()).setMaxDiscountAmount(tagListing.getMaxDiscountPrice());
149
				itemIdPrice.get(tagListing.getItemId()).setMaxDiscountAmount(tagListing.getMaxDiscountPrice());
149
			}
150
			}
150
		}
151
		}
151
		return itemIdPrice;
152
		return itemIdPrice;
152
	}
153
	}
Line 196... Line 197...
196
		if(!purchasePriceItemIds.isEmpty()){
197
		if(!purchasePriceItemIds.isEmpty()){
197
			Map<Integer, Float> purchasePriceMap = this.getPurchasePrices(purchasePriceItemIds, retailerId);
198
			Map<Integer, Float> purchasePriceMap = this.getPurchasePrices(purchasePriceItemIds, retailerId);
198
			for(Map.Entry<Integer, Float> entry : purchasePriceMap.entrySet()){
199
			for(Map.Entry<Integer, Float> entry : purchasePriceMap.entrySet()){
199
				mopPriceModelMap.get(entry.getKey()).setMop(false);
200
				mopPriceModelMap.get(entry.getKey()).setMop(false);
200
				mopPriceModelMap.get(entry.getKey()).setPrice(entry.getValue());
201
				mopPriceModelMap.get(entry.getKey()).setPrice(entry.getValue());
-
 
202
				mopPriceModelMap.get(entry.getKey()).setPurchasePrice(entry.getValue());
201
				mopPriceModelMap.get(entry.getKey()).setMaxDiscountAmount(0);
203
				mopPriceModelMap.get(entry.getKey()).setMaxDiscountAmount(0);
202
			}
204
			}
203
		}
205
		}
204
		
206
		
205
		return mopPriceModelMap;
207
		return mopPriceModelMap;