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

src/main/java/com/ctrip/fun/golf/service/basic/PrePayCardService.java

@@ -245,7 +245,7 @@ public class PrePayCardService extends GenericService<PrePayCardDao, PrePayCard,
         	  if(isVipGrade){
         	  if(isVipGrade){
         		  //前提是社员
         		  //前提是社员
         		  Date againTime = userExt.getCommuneAgainTime();
         		  Date againTime = userExt.getCommuneAgainTime();
-        		  if(enableToRenew(againTime)){
+//        		  if(enableToRenew(againTime)){
         			  //续费当前时间大于上次生效时间半年后算续费
         			  //续费当前时间大于上次生效时间半年后算续费
         			  Date outDate = DateUtil.addDateField(userExt.getCommuneAgainTime(), Calendar.YEAR, 1);
         			  Date outDate = DateUtil.addDateField(userExt.getCommuneAgainTime(), Calendar.YEAR, 1);
         			  if(DateUtil.getDistinceDay(new Date(), outDate) < 0){
         			  if(DateUtil.getDistinceDay(new Date(), outDate) < 0){
@@ -256,10 +256,10 @@ public class PrePayCardService extends GenericService<PrePayCardDao, PrePayCard,
         				  userExt.setCommuneAgainTime(DateUtil.addDateField(outDate, Calendar.DATE, 1));
         				  userExt.setCommuneAgainTime(DateUtil.addDateField(outDate, Calendar.DATE, 1));
         			  }
         			  }
         			  userExt.setCommuneYears(userExt.getCommuneYears()+1);
         			  userExt.setCommuneYears(userExt.getCommuneYears()+1);
-        		  }else{
-        			  rightResponse.setBody("请不要重复续费，谢谢！");
-        			  return rightResponse;
-        		  };
+//        		  }else{
+//        			  rightResponse.setBody("请不要重复续费，谢谢！");
+//        			  return rightResponse;
+//        		  };
         	  }else{
         	  }else{
         		  rightResponse.setBody("您还不是社员，请用社员卡充值！");
         		  rightResponse.setBody("您还不是社员，请用社员卡充值！");
     			  return rightResponse;
     			  return rightResponse;