Merge branch 'f-6.6.6' of 192.168.10.6:caosy/fun-admin 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/java/com/ctrip/fun/admin/form/golf/ResourcePriceForm.java

@@ -79,13 +79,28 @@ public class ResourcePriceForm {
      * 会员价格
      */
     private double memberPrice; 
+    
+    /**
+     * vip首单立减
+     */
+    private double vipFirstReduction;
+    
+    /**
+     * vip随机立减最小值
+     */
+    private double vipMinRandom;
+    
+    /**
+     * vip随机立减最大值
+     */
+    private double vipMaxRandom;
+
+    
     /**
      * 会员返现
      */
     private double memberCashRebate;
     
-    private double vipPrice;
-    
     /**
      * 社员价
      */
@@ -111,7 +126,31 @@ public class ResourcePriceForm {
     
 
 
-    public int getCurrency() {
+    public double getVipFirstReduction() {
+		return vipFirstReduction;
+	}
+
+	public double getVipMinRandom() {
+		return vipMinRandom;
+	}
+
+	public double getVipMaxRandom() {
+		return vipMaxRandom;
+	}
+
+	public void setVipFirstReduction(double vipFirstReduction) {
+		this.vipFirstReduction = vipFirstReduction;
+	}
+
+	public void setVipMinRandom(double vipMinRandom) {
+		this.vipMinRandom = vipMinRandom;
+	}
+
+	public void setVipMaxRandom(double vipMaxRandom) {
+		this.vipMaxRandom = vipMaxRandom;
+	}
+
+	public int getCurrency() {
         return currency;
     }
 
@@ -298,13 +337,5 @@ public class ResourcePriceForm {
 	public void setSize(int size) {
 		this.size = size;
 	}
-
-	public double getVipPrice() {
-		return vipPrice;
-	}
-
-	public void setVipPrice(double vipPrice) {
-		this.vipPrice = vipPrice;
-	}
     
 }

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/WEB-INF/templates/golf/courseResourceList.ftl

@@ -593,13 +593,22 @@
                     </div>
                 </div>
                 <div class="control-group ">
-                    <label class="control-label" for="vipPrice">vip价</label>
+                    <label class="control-label" for="vipFirstReduction">vip首单立减</label>
 
                     <div class="controls">
-                        <input type="number" id="vipPrice" name="vipPrice" value="0" required>
+                        <input type="number" id="vipFirstReduction" name="vipFirstReduction" value="0" required>
                     </div>
                 </div>
                 <div class="control-group ">
+                    <label class="control-label" for="vipMinRandom">vip随机立减范围</label>
+
+                    <div class="controls">
+                        <input type="number" id="vipMinRandom" name="vipMinRandom" value="0" style="width: 70px;" required>-
+                        <input type="number" id="vipMaxRandom" name="vipMaxRandom" value="0" style="width: 70px;" required>元
+                    </div>
+                </div>
+           
+                <div class="control-group ">
                     <label class="control-label" for="priceStatus">价格状态</label>
                     <select id="priceStatus" name="status">
                         <option value="0">请选择</option>

src/main/webapp/WEB-INF/templates/golf/resourcePriceForm.ftl

@@ -102,7 +102,18 @@ $(function () {
                 <@form.textInput "form.salePrice" "class=\"input-medium\"" "卖价" "number"/>
                 <@form.textInput "form.floorPrice" "class=\"input-medium\"" "底价" "number"/>
                 <@form.textInput "form.memberPrice" "class=\"input-medium\"" "会员价" "number"/>
-                <@form.textInput "form.vipPrice" "class=\"input-medium\"" "VIP价" "number"/>
+                <@form.textInput "form.vipFirstReduction" "class=\"input-medium\"" "vip首单立减" "number"/>
+                <@form.textInput "form.vipMinRandom" "class=\"input-medium\"" "vip随机立减最小值" "number"/>
+                <@form.textInput "form.vipMaxRandom" "class=\"input-medium\"" "vip首单立减最大值" "number"/>
+         <!--    
+                <div class="long_content_div control-group ">
+                    <label class="control-label" for="vipMinRandom">vip随机立减范围</label>
+                    <div class="controls">
+                        <input type="number" id="vipMinRandom" name="vipMinRandom" value="${form.vipMinRandom!}" style="width: 70px;" required> -
+                        <input type="number" id="vipMaxRandom" name="vipMaxRandom" value="${form.vipMaxRandom!}" style="width: 70px;" required>元
+                    </div>
+                </div>
+                -->
                 <@form.singleSelect "form.status" enums["com.ctrip.fun.common.vo.product.ResourcePriceStatusEnum"] "" "状态"/>
                 <@form.textInput "form.cashRebate" "class=\"input-medium\"" "返现" "number"/>
                 <@form.textInput "form.memberCashRebate" "class=\"input-medium\"" "会员返现" "number"/>

src/main/webapp/WEB-INF/templates/golf/resourcePriceList.ftl

@@ -46,13 +46,14 @@
         <th>卖价</th>
         <th>底价</th>
         <th>会员价</th>
-        <th>vip价</th>
         <th>佣金</th>
         <th>返现</th>
         <th>会员返现</th>
         <th>预付款</th>
+        <th>vip首单立减</th>
+        <th>vip随机立减</th>    <!--
         <th>社员价</th>
-        <th>社员立减</th>
+        <th>社员立减</th>   -->
         <th>社员嘉宾价</th>
         <th>社员嘉宾立减</th>
         <th>状态</th>
@@ -80,13 +81,14 @@
             <td>${item.salePrice}</td>
             <td>${item.floorPrice}</td>
             <td>${item.memberPrice}</td>
-            <td>${item.vipPrice}</td>
             <td>${item.commission}</td>
             <td>${item.cashRebate}</td>
             <td>${item.memberCashRebate}</td>
             <td>${item.prepaidPrice}</td>
-            <td>${item.communePrice!}</td>
-            <td>${item.communeMinus!}</td>
+            <td>${item.vipFirstReduction}</td>
+            <td>${item.vipMinRandom} ~ ${item.vipMaxRandom}</td>
+       <!--     <td>${item.communePrice!}</td>
+            <td>${item.communeMinus!}</td>-->
             <td>${item.communeGuestPrice!}</td>
             <td>${item.communeGuestMinus!}</td>
             <td>${item.getStatusDisplay()}</td>

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. */