add the outdate res

src/main/java/com/ctrip/fun/golf/dao/assemble/AsmCourseResourceDao.java

@@ -632,8 +632,8 @@ public class AsmCourseResourceDao extends GenericHibernateDao<AsmCourseresource,
             cale2.add(Calendar.MONTH, 2);  
             cale2.set(Calendar.DAY_OF_MONTH, 1);  
             
-            sql1.append(" and a.priceDate>:startDate ");
-            sql2.append(" and a.priceDate>:startDate ");
+            sql1.append(" and a.priceDate>=:startDate ");
+            sql2.append(" and a.priceDate>=:startDate ");
             parameters.put("startDate", cale1.getTime());
             
             sql1.append(" and a.priceDate<:endDate ");

src/main/java/com/ctrip/fun/golf/dao/product/ResourcePriceDao.java

 package com.ctrip.fun.golf.dao.product;
 
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -14,12 +16,19 @@ import org.hibernate.transform.Transformers;
 
 import com.ctrip.fun.common.core.util.BeanConverter;
 import com.ctrip.fun.common.core.util.DateUtil;
+import com.ctrip.fun.common.core.util.StringUtils;
 import com.ctrip.fun.common.vo.SortDirectionEnum;
 import com.ctrip.fun.common.vo.order.OrderResourceBean;
+import com.ctrip.fun.common.vo.product.CommuneResourceBean;
+import com.ctrip.fun.common.vo.product.CommuneResourceQuery;
+import com.ctrip.fun.common.vo.product.CourseProductStatusEnum;
+import com.ctrip.fun.common.vo.product.CourseResourceStatusEnum;
+import com.ctrip.fun.common.vo.product.CourseStatusEnum;
 import com.ctrip.fun.common.vo.product.ProductTypeEnum;
 import com.ctrip.fun.common.vo.product.ResourcePriceBean;
 import com.ctrip.fun.common.vo.product.ResourcePriceQuery;
 import com.ctrip.fun.common.vo.product.ResourcePriceStatusEnum;
+import com.ctrip.fun.common.vo.product.ResourceRealTimeTeeTimeTypeEnum;
 import com.ctrip.fun.golf.dao.GenericHibernateDao;
 import com.ctrip.fun.golf.domain.order.Invoiceinfo;
 import com.ctrip.fun.golf.domain.product.ResourcePrice;
@@ -151,4 +160,56 @@ public class ResourcePriceDao extends GenericHibernateDao<ResourcePrice, Integer
           
         return result;
     }
+    
+    public List<CommuneResourceBean> getEventActivityResources(CommuneResourceQuery communeResourceQuery){
+     	String hql1 = "select pcp.`Name` as productName, pr.priceDate, pr.CashRebate as cashRebate, pr.communePrice, pr.communeMinus from prd_resourceprice pr join prd_courseresource pcr on pr.ResourceID=pcr.ID"
+    			+" AND pcr.`Status`=:resourceStatus AND pr.`Status` IN (:priceStatus) AND pcr.realTimeTeeTimeType =:realTimeTeeTimeType1 AND pcr.ResourceType=:resourceType"
+    			+" join prd_courseproduct pcp on pcp.ID = pcr.ProductID AND pcp.OfflineDate >= pr.priceDate AND pcp.PublishDate < pr.priceDate AND pcp.`Status` =:productStatus AND pcp.Type=:productType"
+    			+" join prd_course pc ON pc.ID = pcp.CourseID AND pc.`Status`<> :courseStatus AND (pc.DistrictID=:districtId OR pc.DistrictID2=:districtId)"
+    			+" WHERE pr.priceDate >= :startDate AND pr.priceDate < :endDate AND pr.communePrice IS NOT NULL";
+        String hql2 = "select pcp.`Name`as productName, pr.priceDate, pr.CashRebate as cashRebate, pr.communePrice, pr.communeMinus from prd_resourceprice pr join prd_courseresource pcr on pr.ResourceID=pcr.ID"
+    			+" AND pcr.`Status`=:resourceStatus AND pr.`Status` IN (:priceStatus) AND pcr.realTimeTeeTimeType =:realTimeTeeTimeType2 AND pcr.ResourceType=:resourceType"
+    			+" join prd_courseproduct pcp on pcp.ID = pcr.ProductID AND pcp.OfflineDate >= pr.priceDate AND pcp.PublishDate < pr.priceDate AND pcp.`Status` =:productStatus AND pcp.Type=:productType"
+    			+" join prd_course pc ON pc.ID = pcp.CourseID AND pc.`Status`<> :courseStatus AND (pc.DistrictID=:districtId OR pc.DistrictID2=:districtId)"
+    			+" WHERE pr.priceDate >= :startDate AND pr.priceDate < :endDate AND pr.communePrice IS NOT NULL"
+        		+" GROUP BY pcp.ID, pr.priceDate";
+        Query query = getSession().createSQLQuery(hql1 + " union "+"(" +hql2 + ")");
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");  
+        Calendar today = Calendar.getInstance();  
+        Calendar cale1 = Calendar.getInstance();  
+        cale1.add(Calendar.MONTH, 0);  
+        cale1.set(Calendar.DAY_OF_MONTH, 1);  
+        Date endDate = DateUtil.addDays(today.getTime(), -3);
+        
+        query.setParameter("startDate", format.format(cale1.getTime()));
+        query.setParameter("endDate", format.format(endDate));
+        
+        query.setParameter("districtId", communeResourceQuery.getCityId());
+        query.setParameter("resourceStatus", CourseResourceStatusEnum.VALID.getValue());
+        query.setParameter("resourceType", StringUtils.collectionToDelimitedString(communeResourceQuery.getResourceTypeList(), ","));
+        ArrayList<Integer> list = ResourcePriceStatusEnum.getValid(null, "queryCommuneResource");
+        query.setParameterList("priceStatus", list);
+        query.setParameter("productStatus", CourseProductStatusEnum.VALID.getValue());
+        query.setParameter("productType", ProductTypeEnum.EVENT_ACTIVITY.getValue());
+        query.setParameter("courseStatus", CourseStatusEnum.INVALID.getValue());
+        query.setParameter("realTimeTeeTimeType1", ResourceRealTimeTeeTimeTypeEnum.NORMAL.getValue());
+        query.setParameter("realTimeTeeTimeType2", ResourceRealTimeTeeTimeTypeEnum.REALTIME.getValue());
+        query.setResultTransformer(Transformers.ALIAS_TO_ENTITY_MAP);
+        
+        List<Map<String, Object>> result = query.list();
+        List<CommuneResourceBean> resources = new ArrayList<CommuneResourceBean>();
+        if(result != null){
+      	 for (Map<String, Object> map : result) {
+      		CommuneResourceBean bean = new CommuneResourceBean();
+      		 BeanConverter.populate(bean, map);
+      		resources.add(bean);
+			}
+      	  
+        }
+        
+        return resources;
+        
+    }
+    
+    
 }

src/main/java/com/ctrip/fun/golf/service/assemble/AsmCourseResourceService.java

@@ -527,6 +527,16 @@ public class AsmCourseResourceService {
     	
     }
 
+    
+    public List<CommuneResourceBean> getOutDateCommuneResources(CommuneResourceQuery communeResourceQuery){
+    	
+    	this.resourcePriceDao.getEventActivityResources(communeResourceQuery);
+    	
+    	
+    	return null;
+    	
+    }
+    
     /**
      * 查詢社员资源V3
      * 
@@ -594,6 +604,12 @@ public class AsmCourseResourceService {
             }
         }
         
+        //add by caosy: 增加已经从资源库asmresource表中删除的资源
+        
+        List<CommuneResourceBean> list2 = this.resourcePriceDao.getEventActivityResources(communeResourceQuery);
+        
+        list.addAll(list2);
+        
         List<CommuneResourceV4> v4list = new ArrayList<CommuneResourceV4>();
         if(list.size()>0){
     		DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
@@ -621,6 +637,7 @@ public class AsmCourseResourceService {
     			bean.setCashRebate(asm.getCashRebate());
     			bean.setCommunePrice(asm.getCommunePrice());
     			bean.setCommuneMinus(asm.getCommuneMinus());
+    			bean.setValidRes(asm.getProductId() != null? true:false);
 	    		if(index>=0){
 	    			CommuneResourceV4 v4 = v4list.get(index);
 	    			List<CommuneResourceV4PriceBean> priceBeanList = v4.getCourses();