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
db7b035f
authored
Jul 24, 2018
by
chongli
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
赛事订单,vip,充值订单详情加入查询携程支付状态功能
parent
349b5da6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
62 additions
and
0 deletions
src/main/webapp/WEB-INF/templates/communeOrder/common/orderDetail.ftl
src/main/webapp/WEB-INF/templates/communeOrder/detail/orderDetail.ftl
src/main/webapp/WEB-INF/templates/eventActivityOrder/common/orderDetail.ftl
src/main/webapp/WEB-INF/templates/eventActivityOrder/common/orderDetailTeeTime.ftl
src/main/webapp/WEB-INF/templates/rechargeOrder/detail/orderDetail.ftl
src/main/webapp/WEB-INF/templates/vipmemberOrder/detail/orderDetail.ftl
src/main/webapp/WEB-INF/templates/communeOrder/common/orderDetail.ftl
View file @
db7b035f
...
...
@@ -29,6 +29,10 @@
<td>订单状态</td><td>${orderBean.orderStatusString!}</td>
<td></td><td></td>
</tr>
<tr>
<td>携程订单状态 <a id="J_getCtripOrderStatusBtn">获取</a></td><td><span id="orderStatusFromCtripResult"></span></td>
<td>余额使用情况</td><td><#if orderBean.prePayCardDeductFlag==1>已使用<#else>未使用</#if></td>
</tr>
</table>
</div>
src/main/webapp/WEB-INF/templates/communeOrder/detail/orderDetail.ftl
View file @
db7b035f
<#assign pageJsContent>
<script>
$("#J_getCtripOrderStatusBtn").click(function () {
$.ajax({
url: "/j/getOrderStatusFromCtrip/${orderBean.orderId}",
type: "get",
data: {
},
success: function (obj) {
$("#orderStatusFromCtripResult").html(obj.body);
}
});
});
</script>
</#assign>
<@com.layout title="订单详情" module="communeOrder" current="${current}" pageJs=pageJsContent>
<#include "../common/receiver.ftl">
...
...
src/main/webapp/WEB-INF/templates/eventActivityOrder/common/orderDetail.ftl
View file @
db7b035f
...
...
@@ -52,6 +52,10 @@
<td>订单状态</td><td>${orderBean.orderStatusString!}</td>
<td>预定途径</td><td>${orderBean.orderSourceString!}</td>
</tr>
<tr>
<td>携程订单状态 <a id="J_getCtripOrderStatusBtn">获取</a></td><td><span id="orderStatusFromCtripResult"></span></td>
<td>余额使用情况</td><td><#if orderBean.prePayCardDeductFlag==1>已使用<#else>未使用</#if></td>
</tr>
<tr>
<td>支付订单号</td><td>${orderBean.outTradeId!}</td>
<td></td><td></td>
...
...
src/main/webapp/WEB-INF/templates/eventActivityOrder/common/orderDetailTeeTime.ftl
View file @
db7b035f
...
...
@@ -68,6 +68,10 @@
<td>订单状态</td><td>${orderBean.orderStatusString!}</td>
<td>预定途径</td><td>${orderBean.orderSourceString!}</td>
</tr>
<tr>
<td>携程订单状态 <a id="J_getCtripOrderStatusBtn">获取</a></td><td><span id="orderStatusFromCtripResult"></span></td>
<td>余额使用情况</td><td><#if orderBean.prePayCardDeductFlag==1>已使用<#else>未使用</#if></td>
</tr>
<tr>
<td>支付订单号</td><td>${orderBean.outTradeId!}</td>
<td></td><td></td>
...
...
src/main/webapp/WEB-INF/templates/rechargeOrder/detail/orderDetail.ftl
View file @
db7b035f
<#assign pageJsContent>
<script>
$("#J_getCtripOrderStatusBtn").click(function () {
$.ajax({
url: "/j/getOrderStatusFromCtrip/${orderBean.orderId}",
type: "get",
data: {
},
success: function (obj) {
$("#orderStatusFromCtripResult").html(obj.body);
}
});
});
</script>
</#assign>
<@com.layout title="订单详情" module="rechargeOrder" current="${current}" pageJs=pageJsContent>
<div class = "div-orderDetail">
...
...
@@ -37,6 +51,10 @@
<td>订单状态</td><td>${orderBean.orderStatusString!}</td>
<td></td><td></td>
</tr>
<tr>
<td>携程订单状态 <a id="J_getCtripOrderStatusBtn">获取</a></td><td><span id="orderStatusFromCtripResult"></span></td>
<td>余额使用情况</td><td><#if orderBean.prePayCardDeductFlag==1>已使用<#else>未使用</#if></td>
</tr>
</table>
</div>
</@com.layout>
...
...
src/main/webapp/WEB-INF/templates/vipmemberOrder/detail/orderDetail.ftl
View file @
db7b035f
<#assign pageJsContent>
<script>
$("#J_getCtripOrderStatusBtn").click(function () {
$.ajax({
url: "/j/getOrderStatusFromCtrip/${orderBean.orderId}",
type: "get",
data: {
},
success: function (obj) {
$("#orderStatusFromCtripResult").html(obj.body);
}
});
});
</script>
</#assign>
<@com.layout title="订单详情" module="vipmemberOrder" current="${current}" pageJs=pageJsContent>
<div class = "div-orderDetail">
...
...
@@ -37,6 +51,10 @@
<td>订单状态</td><td>${orderBean.orderStatusString!}</td>
<td></td><td></td>
</tr>
<tr>
<td>携程订单状态 <a id="J_getCtripOrderStatusBtn">获取</a></td><td><span id="orderStatusFromCtripResult"></span></td>
<td>余额使用情况</td><td><#if orderBean.prePayCardDeductFlag==1>已使用<#else>未使用</#if></td>
</tr>
</table>
</div>
</@com.layout>
...
...
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