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/integral/UserMemberIntegralLogService.java

@@ -194,7 +194,8 @@ public class UserMemberIntegralLogService extends GenericService<UserMemberInteg
     }
 
     public void giveWorkPoint() {
-        this.giveEventActivityWorkPoint();
+        //取消社员参加赛事送公分
+    	//this.giveEventActivityWorkPoint();
     }
 
     /**

src/main/java/com/ctrip/fun/golf/service/order/EventActivityOrderService.java

@@ -496,7 +496,7 @@ public class EventActivityOrderService extends
     @Override
     protected boolean beforePlaceOrder(EventActivityOrderBean eventActivityOrderBean) {
     	
-    	this.checkCommuneIdentity(eventActivityOrderBean);
+//    	this.checkCommuneIdentity(eventActivityOrderBean);
     	
         this.checkTotalCashRebate(eventActivityOrderBean);