记得上下班打卡 | git大法好,push需谨慎
Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
liquidnet-bus-v1
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
董敬伟
liquidnet-bus-v1
Commits
bb8e849f
Commit
bb8e849f
authored
Sep 26, 2021
by
胡佳晨
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
admin 增加 初始化 transferStatus = 5 的转赠状态
更改为可转赠状态
parent
05cd0fb5
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
86 additions
and
26 deletions
+86
-26
IKylinOrderTicketsAdminService.java
...e/kylin/service/admin/IKylinOrderTicketsAdminService.java
+3
-0
KylinOrderTicketsController.java
...ontroller/zhengzai/kylin/KylinOrderTicketsController.java
+14
-6
orderList.html
...s/templates/zhengzai/kylin/order/orderList/orderList.html
+8
-0
performancesStatic.html
...lates/zhengzai/kylin/performances/performancesStatic.html
+1
-1
KylinOrderTicketsAdminServiceImpl.java
...kylin/service/impl/KylinOrderTicketsAdminServiceImpl.java
+60
-19
No files found.
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/admin/IKylinOrderTicketsAdminService.java
View file @
bb8e849f
...
...
@@ -23,4 +23,7 @@ public interface IKylinOrderTicketsAdminService {
//订单详情
OrderDetailsAdminVo
orderDetails
(
String
orderId
);
//初始化订单转赠 [只支持退回订单 transferStatus = 5]
String
initTransfer
(
String
orderId
);
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinOrderTicketsController.java
View file @
bb8e849f
...
...
@@ -27,8 +27,7 @@ import java.util.List;
*/
@Controller
@RequestMapping
(
"/kylin/order"
)
public
class
KylinOrderTicketsController
extends
BaseController
{
public
class
KylinOrderTicketsController
extends
BaseController
{
private
String
prefix
=
"zhengzai/kylin/order"
;
@Autowired
...
...
@@ -39,8 +38,7 @@ public class KylinOrderTicketsController extends BaseController
@RequiresPermissions
(
"kylin:order:orderlist:view"
)
@GetMapping
(
"/orderList"
)
public
String
tickets
()
{
public
String
tickets
()
{
return
prefix
+
"/orderList/orderList"
;
}
...
...
@@ -51,8 +49,7 @@ public class KylinOrderTicketsController extends BaseController
@RequiresPermissions
(
"kylin:order:orderlist:list"
)
@PostMapping
(
"/orderList/list"
)
@ResponseBody
public
TableDataInfo
list
(
OrderListReq
orderListReq
)
{
public
TableDataInfo
list
(
OrderListReq
orderListReq
)
{
startPage
();
List
<
OrderTicketsListDao
>
list
=
iKylinOrderTicketsAdminService
.
orderList
(
orderListReq
);
return
getDataTable
(
list
);
...
...
@@ -84,4 +81,15 @@ public class KylinOrderTicketsController extends BaseController
ajax
.
put
(
"value"
,
performanceSponsorList
);
return
ajax
;
}
/**
* 获取第三方列表
*/
@Log
(
title
=
"演出订单-初始化转赠 [只支持 transferStatus = 5]]"
,
businessType
=
BusinessType
.
LIST
)
@GetMapping
(
"/orderList/initTransfer"
)
@ResponseBody
public
AjaxResult
initTransfer
(
@RequestParam
(
"orderId"
)
String
orderId
)
{
String
result
=
iKylinOrderTicketsAdminService
.
initTransfer
(
orderId
);
return
this
.
success
(
result
);
}
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/order/orderList/orderList.html
View file @
bb8e849f
...
...
@@ -116,6 +116,7 @@
<th:block
th:include=
"include :: bootstrap-typeahead-js"
/>
<script
th:inline=
"javascript"
>
var
detailFlag
=
[[
$
{@
permission
.
hasPermi
(
'kylin:order:orderlist:detail'
)}]];
var
transferFlag
=
[[
$
{@
permission
.
hasPermi
(
'kylin:order:orderlist:transferInit'
)}]];
var
prefix
=
ctx
+
"kylin/order/orderList"
;
var
orderStatusDic
=
[[
$
{@
dict
.
getType
(
'zhengzai_order_status'
)}]];
var
getTicketTypeDic
=
[[
$
{@
dict
.
getType
(
'zhengzai_get_ticket_type'
)}]];
...
...
@@ -201,6 +202,7 @@
formatter
:
function
(
value
,
row
,
index
)
{
var
actions
=
[];
actions
.
push
(
'<a class="btn btn-warning btn-xs '
+
detailFlag
+
'" href="javascript:void(0)" onclick="$.operate.detail(
\'
'
+
row
.
orderTicketsId
+
'
\'
)"><i class="fa fa-search"></i>详细</a>'
);
actions
.
push
(
'<a class="btn btn-warning btn-xs '
+
transferFlag
+
'" href="javascript:void(0)" onclick="f(
\'
'
+
row
.
orderTicketsId
+
'
\'
)"><i class="fa fa-search"></i>初始化</a>'
);
return
actions
.
join
(
''
);
}
}]
...
...
@@ -219,6 +221,12 @@
}).
on
(
'onUnsetSelectValue'
,
function
(
e
)
{
console
.
log
(
"onUnsetSelectValue"
);
});
function
f
(
id
)
{
$
.
post
(
prefix
+
"/kylin/initTransfer"
,{
orderId
:
id
},
function
(
res
)
{
alert
(
res
.
msg
)
});
}
</script>
</body>
</html>
\ No newline at end of file
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performances/performancesStatic.html
View file @
bb8e849f
...
...
@@ -67,7 +67,7 @@
</div>
</div>
</div>
<table
class=
"col-sm-12 select-table table-bordered"
>
<table
class=
"col-sm-12 select-table table-bordered
table table-stripped small m-t-md
"
>
<thead>
<tr>
<th>
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinOrderTicketsAdminServiceImpl.java
View file @
bb8e849f
This diff is collapsed.
Click to expand it.
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