Subversion Repositories SmartDukaan

Rev

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

Rev 11964 Rev 11970
Line 26... Line 26...
26 
import java.util.Calendar;
 26 
import java.util.Calendar;
27 
import java.util.GregorianCalendar;
 27 
import java.util.GregorianCalendar;
28 
import java.util.HashMap;
 28 
import java.util.HashMap;
29 
import java.util.List;
 29 
import java.util.List;
30 
import java.util.Map;
 30 
import java.util.Map;
- 
 
 31 
import java.util.Set;
31 
 
 32 
 
32 
import net.sf.ehcache.CacheManager;
 33 
import net.sf.ehcache.CacheManager;
33 
 
 34 
 
34 
import org.apache.commons.lang.StringUtils;
 35 
import org.apache.commons.lang.StringUtils;
35 
import org.apache.log4j.Logger;
 36 
import org.apache.log4j.Logger;
Line 398... Line 399...
398 
            if(itemTexts!=null){
 399 
            if(itemTexts!=null){
399 
            	List<Long> items = new ArrayList<Long>();
 400 
            	List<Long> items = new ArrayList<Long>();
400 
            	for(ItemText itemText : itemTexts) {
 401 
            	for(ItemText itemText : itemTexts) {
401 
            		items.add(itemText.getItemId());
 402 
            		items.add(itemText.getItemId());
402 
            	}
 403 
            	}
- 
 
 404 
            	if(userinfo.isPrivateDealUser()){
- 
 
 405 
            		try {
- 
 
 406 
            			CatalogClient catalogClientService = new CatalogClient();
- 
 
 407 
            			in.shop2020.model.v1.catalog.CatalogService.Client client1 = catalogClientService.getClient();
- 
 
 408 
            			Set<Long> deals = client1.getAllActivePrivateDeals(items, 0).keySet();
- 
 
 409 
            			int lastIndex = 0;
- 
 
 410 
            			for(int i=0;i<itemTexts.size();i++) {
- 
 
 411 
            				ItemText it = itemTexts.get(i);
- 
 
 412 
            				if(it.getDisplayText().equals("NOTIFY ME")) {
- 
 
 413 
            					break;
- 
 
 414 
            				}
- 
 
 415 
                    		if(deals.contains(it.getItemId()) && i != lastIndex) {
- 
 
 416 
                    			itemTexts.add(lastIndex,itemTexts.remove(i));
- 
 
 417 
                    			lastIndex++;
- 
 
 418 
                    		}
- 
 
 419 
                    	}
- 
 
 420 
            		} catch (Exception e1) {
- 
 
 421 
            			log.warn("Unable to get items by catalog id", e1);
- 
 
 422 
            			redirectUrl = "/";
- 
 
 423 
            		}
- 
 
 424 
            	}
403 
            	firstItem = items.get(0);
 425 
            	firstItem = items.get(0);
404 
            	entityLogisticsEstimation = new Gson().toJson(items);
 426 
            	entityLogisticsEstimation = new Gson().toJson(items);
405 
            	return;
 427 
            	return;
406 
            }
 428 
            }
407 
        } catch (Exception e1) {
 429 
        } catch (Exception e1) {