Merge branch 'release' into f-6.6.6

src/main/java/com/ctrip/fun/admin/controller/order/OpCourseOrderController.java

@@ -1179,7 +1179,7 @@ public class OpCourseOrderController extends AbstractOpOrderController<CourseOrd
         orderResource.setResourceName(resource.getResourceName());
         orderResource.setSalePrice(salePrice);
         orderResource.setTeeTime(resource.getTeeTime().toString());
-        orderResource.setCashRebate(BigDecimal.valueOf(resource.getCashRebate()));
+        orderResource.setCashRebate(BigDecimal.valueOf(resource.getCashRebate()).multiply(BigDecimal.valueOf(playerList.size())));
         List<CourseOrderResourceBean> orderResourceList = new ArrayList<CourseOrderResourceBean>();
         orderResourceList.add(orderResource);
 

src/main/resources/config/spring-security.xml

@@ -23,7 +23,7 @@
 		<sec:intercept-url pattern="/order/orderList/list_refund" access="ROLE_CTRIP_PAY,ROLE_OP,ROLE_DEV,ROLE_PROD,ROLE_RISK,ROLE_ASSIST" />
 		<sec:intercept-url pattern="/order/detail" access="ROLE_CTRIP_PAY,ROLE_OP,ROLE_DEV,ROLE_PROD,ROLE_RISK,ROLE_ASSIST" />
 		<sec:intercept-url pattern="/order/**" access="ROLE_OP,ROLE_DEV,ROLE_PROD,ROLE_RISK,ROLE_ASSIST,ROLE_ORDER_COURSE" />
-		<sec:intercept-url pattern="/communeOrder/**" access="ROLE_OP,ROLE_DEV,ROLE_PROD,ROLE_RISK,ROLE_ASSIST,ROLE_COMMUNEORDER" />
+		<sec:intercept-url pattern="/communeOrder/**" access="ROLE_DEV,ROLE_COMMUNEORDER" />
 		<sec:intercept-url pattern="/eventActivityOrder/**" access="ROLE_OP,ROLE_DEV,ROLE_PROD,ROLE_RISK,ROLE_ASSIST,ROLE_ACTIVITY_ORDER" />
 		<sec:intercept-url pattern="/rechargeOrder/**" access="ROLE_OP,ROLE_DEV,ROLE_PROD,ROLE_RISK,ROLE_ASSIST,ROLE_RECHARGEORDER" />
 		<sec:intercept-url pattern="/accounting/**" access="ROLE_OP,ROLE_FINANCE,ROLE_DEV,ROLE_PROD,ROLE_ASSIST,ROLE_ACCOUNT" />

src/main/webapp/resource/datepickerRefactor/js/jquery.ui.datepickerRefactor.js

@@ -891,6 +891,9 @@ $.extend(Datepicker.prototype, {
 			(period == 'M' ? this._get(inst, 'showCurrentAtPos') : 0), // undo positioning
 			period);
 		this._updateDatepicker(inst);
+		if(!targetDateInput.val()){
+			$.datepicker._eraseAllData();
+		}
 	},
 
 	/* Action for current link. */