Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
caosy
/
fun-admin
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
df1d5749
authored
Feb 06, 2018
by
Huang Linyu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
vip首单立减,vip随机立减功能后台资源页面开发
parent
e1df6635
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
63 additions
and
11 deletions
src/main/java/com/ctrip/fun/admin/form/golf/ResourcePriceForm.java
src/main/webapp/WEB-INF/templates/golf/courseResourceList.ftl
src/main/webapp/WEB-INF/templates/golf/resourcePriceForm.ftl
src/main/webapp/WEB-INF/templates/golf/resourcePriceList.ftl
src/main/java/com/ctrip/fun/admin/form/golf/ResourcePriceForm.java
View file @
df1d5749
...
...
@@ -79,6 +79,23 @@ public class ResourcePriceForm {
* 会员价格
*/
private
double
memberPrice
;
/**
* vip首单立减
*/
private
double
vipFirstReduction
;
/**
* vip随机立减最小值
*/
private
double
vipMinRandom
;
/**
* vip随机立减最大值
*/
private
double
vipMaxRandom
;
/**
* 会员返现
*/
...
...
@@ -109,6 +126,30 @@ public class ResourcePriceForm {
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
;
}
...
...
src/main/webapp/WEB-INF/templates/golf/courseResourceList.ftl
View file @
df1d5749
...
...
@@ -600,19 +600,14 @@
</div>
</div>
<div class="control-group ">
<label class="control-label" for="vipMinRandom">vip随机立减
最小值
</label>
<label class="control-label" for="vipMinRandom">vip随机立减
范围
</label>
<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>-
<input type="number" id="vipMaxRandom" name="vipMaxRandom" value="0" style="width: 70px;" required>元
</div>
</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 class="control-group ">
<label class="control-label" for="priceStatus">价格状态</label>
<select id="priceStatus" name="status">
...
...
src/main/webapp/WEB-INF/templates/golf/resourcePriceForm.ftl
View file @
df1d5749
...
...
@@ -102,6 +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.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
View file @
df1d5749
...
...
@@ -50,8 +50,10 @@
<th>返现</th>
<th>会员返现</th>
<th>预付款</th>
<th>vip首单立减</th>
<th>vip随机立减</th> <!--
<th>社员价</th>
<th>社员立减</th>
<th>社员立减</th>
-->
<th>社员嘉宾价</th>
<th>社员嘉宾立减</th>
<th>状态</th>
...
...
@@ -83,8 +85,10 @@
<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>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment