Subversion Repositories SmartDukaan

Rev

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

Rev 11972 Rev 11973
Line 399... Line 399...
399
            if(itemTexts!=null){
399
            if(itemTexts!=null){
400
            	List<Long> items = new ArrayList<Long>();
400
            	List<Long> items = new ArrayList<Long>();
401
            	for(ItemText itemText : itemTexts) {
401
            	for(ItemText itemText : itemTexts) {
402
            		items.add(itemText.getItemId());
402
            		items.add(itemText.getItemId());
403
            	}
403
            	}
-
 
404
            	log.info("Items before: " + items);
404
            	if(userinfo.isPrivateDealUser()){
405
            	if(userinfo.isPrivateDealUser()){
-
 
406
            		log.info("Private Deal user identified");
405
            		try {
407
            		try {
406
            			CatalogClient catalogClientService = new CatalogClient();
408
            			CatalogClient catalogClientService = new CatalogClient();
407
            			in.shop2020.model.v1.catalog.CatalogService.Client client1 = catalogClientService.getClient();
409
            			in.shop2020.model.v1.catalog.CatalogService.Client client1 = catalogClientService.getClient();
408
            			Set<Long> deals = client1.getAllActivePrivateDeals(items, 0).keySet();
410
            			Set<Long> deals = client1.getAllActivePrivateDeals(items, 0).keySet();
409
            			int lastIndex = 0;
411
            			int lastIndex = 0;
Line 423... Line 425...
423
            		}
425
            		}
424
            		items = new ArrayList<Long>();
426
            		items = new ArrayList<Long>();
425
            		for(ItemText itemText : itemTexts) {
427
            		for(ItemText itemText : itemTexts) {
426
                		items.add(itemText.getItemId());
428
                		items.add(itemText.getItemId());
427
                	}
429
                	}
-
 
430
            		log.info("Items after: " + items);
428
            	}
431
            	}
429
            	firstItem = items.get(0);
432
            	firstItem = items.get(0);
430
            	entityLogisticsEstimation = new Gson().toJson(items);
433
            	entityLogisticsEstimation = new Gson().toJson(items);
431
            	return;
434
            	return;
432
            }
435
            }