Commit fc37aa2c by Huang Linyu

后台下单不能返现

parent 3270e950
......@@ -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: // 预付
......
......@@ -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>
......
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