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
fc37aa2c
authored
Jan 16, 2018
by
Huang Linyu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
后台下单不能返现
parent
3270e950
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
src/main/java/com/ctrip/fun/admin/controller/order/OpCourseOrderController.java
src/main/webapp/WEB-INF/templates/golf/resourcePriceForm.ftl
src/main/java/com/ctrip/fun/admin/controller/order/OpCourseOrderController.java
View file @
fc37aa2c
...
...
@@ -1162,7 +1162,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
()));
List
<
CourseOrderResourceBean
>
orderResourceList
=
new
ArrayList
<
CourseOrderResourceBean
>();
orderResourceList
.
add
(
orderResource
);
...
...
@@ -1200,7 +1200,7 @@ public class OpCourseOrderController extends AbstractOpOrderController<CourseOrd
}
// offline支付不支持返现
placeOrder
.
setCashRebate
(
null
);
placeOrder
.
setCashRebate
(
BigDecimal
.
valueOf
(
resource
.
getCashRebate
()*
playerList
.
size
())
);
switch
(
resource
.
getPaymentType
())
{
case
1
:
// 预付
...
...
src/main/webapp/WEB-INF/templates/golf/resourcePriceForm.ftl
View file @
fc37aa2c
...
...
@@ -82,10 +82,10 @@ $(function () {
<label class="control-label" for="theDate">时间</label>
<div class="controls" style="">
<#if id??>
<input id="theDate" name="theDate" value="${form.theDate??}" placeholder="时间" class="datepicker input-medium" required="" type="text" />
<#else>
<input id="theDate" name="theDate" value="" placeholder="时间" class="datepicker input-medium" required="" type="text" />
<div class="pp" style="background-image:url(${staticServer}/pic/calendar.jpg);width: 40px;height: 30px;">
<#else>
<input id="theDate" name="theDate" value="${form.theDate??}" placeholder="时间" class="datepicker input-medium" required="" type="text" />
</#if>
</div>
...
...
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