Commit df1d5749 by Huang Linyu

vip首单立减,vip随机立减功能后台资源页面开发

parent e1df6635
...@@ -79,6 +79,23 @@ public class ResourcePriceForm { ...@@ -79,6 +79,23 @@ public class ResourcePriceForm {
* 会员价格 * 会员价格
*/ */
private double memberPrice; private double memberPrice;
/**
* vip首单立减
*/
private double vipFirstReduction;
/**
* vip随机立减最小值
*/
private double vipMinRandom;
/**
* vip随机立减最大值
*/
private double vipMaxRandom;
/** /**
* 会员返现 * 会员返现
*/ */
...@@ -109,7 +126,31 @@ public class ResourcePriceForm { ...@@ -109,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; return currency;
} }
......
...@@ -600,19 +600,14 @@ ...@@ -600,19 +600,14 @@
</div> </div>
</div> </div>
<div class="control-group "> <div class="control-group ">
<label class="control-label" for="vipMinRandom">vip随机立减最小值</label> <label class="control-label" for="vipMinRandom">vip随机立减范围</label>
<div class="controls"> <div class="controls">
<input type="number" id="vipMinRandom" name="vipMinRandom" value="0" required> <input type="number" id="vipMinRandom" name="vipMinRandom" value="0" style="width: 70px;" required>-
</div> <input type="number" id="vipMaxRandom" name="vipMaxRandom" value="0" style="width: 70px;" required>元
</div>
<div class="control-group ">
<label class="control-label" for="vipMaxRandom">vip随机立减最大值</label>
<div class="controls">
<input type="number" id="vipMaxRandom" name="vipMaxRandom" value="0" required>
</div> </div>
</div> </div>
<div class="control-group "> <div class="control-group ">
<label class="control-label" for="priceStatus">价格状态</label> <label class="control-label" for="priceStatus">价格状态</label>
<select id="priceStatus" name="status"> <select id="priceStatus" name="status">
......
...@@ -102,6 +102,18 @@ $(function () { ...@@ -102,6 +102,18 @@ $(function () {
<@form.textInput "form.salePrice" "class=\"input-medium\"" "卖价" "number"/> <@form.textInput "form.salePrice" "class=\"input-medium\"" "卖价" "number"/>
<@form.textInput "form.floorPrice" "class=\"input-medium\"" "底价" "number"/> <@form.textInput "form.floorPrice" "class=\"input-medium\"" "底价" "number"/>
<@form.textInput "form.memberPrice" "class=\"input-medium\"" "会员价" "number"/> <@form.textInput "form.memberPrice" "class=\"input-medium\"" "会员价" "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.singleSelect "form.status" enums["com.ctrip.fun.common.vo.product.ResourcePriceStatusEnum"] "" "状态"/>
<@form.textInput "form.cashRebate" "class=\"input-medium\"" "返现" "number"/> <@form.textInput "form.cashRebate" "class=\"input-medium\"" "返现" "number"/>
<@form.textInput "form.memberCashRebate" "class=\"input-medium\"" "会员返现" "number"/> <@form.textInput "form.memberCashRebate" "class=\"input-medium\"" "会员返现" "number"/>
......
...@@ -50,8 +50,10 @@ ...@@ -50,8 +50,10 @@
<th>返现</th> <th>返现</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>
<th>社员嘉宾立减</th> <th>社员嘉宾立减</th>
<th>状态</th> <th>状态</th>
...@@ -83,8 +85,10 @@ ...@@ -83,8 +85,10 @@
<td>${item.cashRebate}</td> <td>${item.cashRebate}</td>
<td>${item.memberCashRebate}</td> <td>${item.memberCashRebate}</td>
<td>${item.prepaidPrice}</td> <td>${item.prepaidPrice}</td>
<td>${item.communePrice!}</td> <td>${item.vipFirstReduction}</td>
<td>${item.communeMinus!}</td> <td>${item.vipMinRandom} ~ ${item.vipMaxRandom}</td>
<!-- <td>${item.communePrice!}</td>
<td>${item.communeMinus!}</td>-->
<td>${item.communeGuestPrice!}</td> <td>${item.communeGuestPrice!}</td>
<td>${item.communeGuestMinus!}</td> <td>${item.communeGuestMinus!}</td>
<td>${item.getStatusDisplay()}</td> <td>${item.getStatusDisplay()}</td>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment