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/service/assemble/AsmCourseResourceService.java

@@ -627,7 +627,7 @@ public class AsmCourseResourceService {
 		            	simpleProductName = productName.substring(2,endIndex);
 		            	simpleProductName = productName.substring(2,endIndex);
 	    			}else{
 	    			}else{
 	    				endIndex = productName.indexOf("活动日");
 	    				endIndex = productName.indexOf("活动日");
-	    				simpleProductName = productName.substring(2);
+	    				simpleProductName = productName.substring(2,endIndex);
 	    			}
 	    			}
 		            
 		            
 	    		}else{
 	    		}else{