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
e1df6635
authored
Feb 05, 2018
by
Huang Linyu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove vipPrice
parent
74c89fc5
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
15 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 @
e1df6635
...
...
@@ -84,8 +84,6 @@ public class ResourcePriceForm {
*/
private
double
memberCashRebate
;
private
double
vipPrice
;
/**
* 社员价
*/
...
...
@@ -298,13 +296,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/webapp/WEB-INF/templates/golf/courseResourceList.ftl
View file @
e1df6635
...
...
@@ -593,10 +593,24 @@
</div>
</div>
<div class="control-group ">
<label class="control-label" for="vip
Price">vip价
</label>
<label class="control-label" for="vip
FirstReduction">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" 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 ">
...
...
src/main/webapp/WEB-INF/templates/golf/resourcePriceForm.ftl
View file @
e1df6635
...
...
@@ -102,7 +102,6 @@ $(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.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 @
e1df6635
...
...
@@ -46,7 +46,6 @@
<th>卖价</th>
<th>底价</th>
<th>会员价</th>
<th>vip价</th>
<th>佣金</th>
<th>返现</th>
<th>会员返现</th>
...
...
@@ -80,7 +79,6 @@
<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>
...
...
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