Merge branch 'f-6.6.4' of 192.168.10.6:caosy/fun-golf-service into f-6.6.4

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

@@ -896,7 +896,7 @@ public class AsmCourseResourceDao extends GenericHibernateDao<AsmCourseresource,
         sqlUnion.append(" UNION ( ");
         sqlUnion.append(sql2.toString());
         sqlUnion.append(" )");
-        sqlUnion.append(" ) u ");
+        sqlUnion.append(" ) u order by u.priceDate");
         
         sql.append(sqlUnion.toString());
         sql_count.append(sqlUnion.toString());

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

@@ -602,16 +602,18 @@ public class AsmCourseResourceService {
 	    		String priceDateStr = df.format(priceDate);
 	    		int index = containDate(v4list,priceDateStr);
 	    		CommuneResourceV4PriceBean bean = new CommuneResourceV4PriceBean();
-	    		String productName = asm.getProductName();
-	    		//System.out.println(productName.getBytes());
+	    		
+	    		String productName = asm.getProductName().replace("神秘场", "").replace("-", "");
 	    		String simpleProductName = "";
 	    		if(productName!=null && productName.length()>2){
-		            int endIndex = productName.indexOf("爱玩公社");
+		            int endIndex = productName.indexOf("爱玩");
 		            if(endIndex>=2){
 		            	simpleProductName = productName.substring(2,endIndex);
 	    			}else{
+	    				endIndex = productName.indexOf("活动日");
 	    				simpleProductName = productName.substring(2);
 	    			}
+		            
 	    		}else{
 	    			simpleProductName = productName;
 	    		}
@@ -641,7 +643,7 @@ public class AsmCourseResourceService {
     }
 
     /**
-     * 判断某个 List<Map<Date, List<CommuneResourceBean>>> v4list  是否包含key为priceDate的Map元素
+     * 判断某个 List<CommuneResourceV4> v4list  是否包含CommuneResourceV4.priceDate为priceDateStr的元素
      * @param priceDateStr 
      * @param v4list 
      * @param v4list