Subversion Repositories SmartDukaan

Rev

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

Rev 19091 Rev 19110
Line 35... Line 35...
35 
import java.util.GregorianCalendar;
 35 
import java.util.GregorianCalendar;
36 
import java.util.HashMap;
 36 
import java.util.HashMap;
37 
import java.util.List;
 37 
import java.util.List;
38 
import java.util.Map;
 38 
import java.util.Map;
39 
import java.util.Map.Entry;
 39 
import java.util.Map.Entry;
- 
 
 40 
import java.util.Set;
40 
 
 41 
 
41 
import net.sf.ehcache.CacheManager;
 42 
import net.sf.ehcache.CacheManager;
42 
 
 43 
 
43 
import org.slf4j.Logger;
 44 
import org.slf4j.Logger;
44 
import org.slf4j.LoggerFactory;
 45 
import org.slf4j.LoggerFactory;
Line 110... Line 111...
110 
				for(Entry<Long, List<Order>> entry : transactionOrdersMap.entrySet()){
 111 
				for(Entry<Long, List<Order>> entry : transactionOrdersMap.entrySet()){
111 
					List<Order> txnOrders = entry.getValue();
 112 
					List<Order> txnOrders = entry.getValue();
112 
					Collections.sort(txnOrders,new OrderPromisedShippingComparator());
 113 
					Collections.sort(txnOrders,new OrderPromisedShippingComparator());
113 
					transactionOrdersMap.put(entry.getKey(), txnOrders);
 114 
					transactionOrdersMap.put(entry.getKey(), txnOrders);
114 
				}
 115 
				}
- 
 
 116
- 
 
 117 
				Set<Long> transactionIds = transactionOrdersMap.keySet();
- 
 
 118
- 
 
 119 
				List<Long> transactionIdList = new ArrayList<Long>(transactionIds);
- 
 
 120
- 
 
 121 
				Collections.sort(transactionIdList);
115 
 
 122 
 
116 
				for(Entry<Long, List<Order>> entry : transactionOrdersMap.entrySet()){
 123 
				for(Long transactionId : transactionIdList){
117 
					orders.addAll(entry.getValue());
 124 
					orders.addAll(transactionOrdersMap.get(transactionId));
118 
				}
 125 
				}
119 
			}
 126 
			}
120
127
121 
		}catch(Exception e){
 128 
		}catch(Exception e){
122 
			e.printStackTrace();
 129 
			e.printStackTrace();