记得上下班打卡 | 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
3994a91b
Commit
3994a91b
authored
Sep 13, 2024
by
zhoujianping
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'zjp_admin_0910' into dev_20240809_1.1
parents
e2f4537f
b0563abd
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
146 additions
and
1 deletion
+146
-1
IKylinPerformancesAdminService.java
...e/kylin/service/admin/IKylinPerformancesAdminService.java
+10
-0
KylinPerformancesController.java
...ontroller/zhengzai/kylin/KylinPerformancesController.java
+35
-0
details.html
...ources/templates/zhengzai/kylin/performances/details.html
+18
-1
subscribe.html
...rces/templates/zhengzai/kylin/performances/subscribe.html
+60
-0
KylinPerformanceSubscribeTicketStatisticalExportDao.java
.../KylinPerformanceSubscribeTicketStatisticalExportDao.java
+17
-0
KylinPerformancesAdminServiceImpl.java
...kylin/service/impl/KylinPerformancesAdminServiceImpl.java
+6
-0
No files found.
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/admin/IKylinPerformancesAdminService.java
View file @
3994a91b
...
...
@@ -3,6 +3,7 @@ package com.liquidnet.service.kylin.service.admin;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.github.pagehelper.PageInfo
;
import
com.liquidnet.service.kylin.dao.*
;
import
com.liquidnet.service.kylin.dao.report.KylinPerformanceSubscribeTicketStatisticalDao
;
import
com.liquidnet.service.kylin.dto.param.PerformanceAdminListParam
;
import
com.liquidnet.service.kylin.dto.param.PerformanceMemberAuditParam
;
import
com.liquidnet.service.kylin.dto.param.SysDamaiParam
;
...
...
@@ -310,4 +311,13 @@ public interface IKylinPerformancesAdminService {
List
<
PerformanceOrderStatisticalDao
>
getPerformanceOrderStatisticalList
(
String
performancesId
);
List
<
PerformanceSponsorDao
>
getPerformanceSponsorList
(
String
sponsorType
);
/*
* @description: 获取预约信息
* @author: zjp
* @date: 2024/9/11 17:11
* @param: [performancesId]
* @return: com.liquidnet.service.kylin.dto.vo.admin.KylinPerformanceAgentVo
**/
List
<
KylinPerformanceSubscribeTicketStatisticalDao
>
getPerformanceSubscribe
(
String
performancesId
);
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinPerformancesController.java
View file @
3994a91b
...
...
@@ -7,13 +7,17 @@ import com.liquidnet.client.admin.common.core.controller.BaseController;
import
com.liquidnet.client.admin.common.core.domain.AjaxResult
;
import
com.liquidnet.client.admin.common.core.page.TableDataInfo
;
import
com.liquidnet.client.admin.common.enums.BusinessType
;
import
com.liquidnet.client.admin.common.utils.poi.ExcelUtil
;
import
com.liquidnet.client.admin.zhengzai.kylin.dto.KylinOrderImportDto
;
import
com.liquidnet.client.admin.zhengzai.kylin.dto.KylinPerformanceSubscribeTicketStatisticalExportDao
;
import
com.liquidnet.client.admin.zhengzai.kylin.dto.PerformanceOrderStatisCountResp
;
import
com.liquidnet.client.admin.zhengzai.stone.service.dto.StoneScoreListExportDto
;
import
com.liquidnet.commons.lang.util.JsonUtils
;
import
com.liquidnet.service.goblin.param.GoblinFrontCubeParam
;
import
com.liquidnet.service.kylin.dao.PerformanceAdminListDao
;
import
com.liquidnet.service.kylin.dao.PerformanceMemberAuditDao
;
import
com.liquidnet.service.kylin.dao.PerformanceOrderStatisticalDao
;
import
com.liquidnet.service.kylin.dao.report.KylinPerformanceSubscribeTicketStatisticalDao
;
import
com.liquidnet.service.kylin.dto.param.PerformanceAdminListParam
;
import
com.liquidnet.service.kylin.dto.param.PerformanceMemberAuditParam
;
import
com.liquidnet.service.kylin.dto.param.SysDamaiParam
;
...
...
@@ -188,7 +192,38 @@ public class KylinPerformancesController extends BaseController {
mmap
.
put
(
"kylinPerformancePayTxtVo"
,
result
);
return
prefix
+
"/payTxt"
;
}
/*
* @description: 预约统计
* @author: zjp
* @date: 2024/9/11 17:03
* @param: [performancesId, mmap]
* @return: java.lang.String
**/
@GetMapping
(
value
=
"/subscribe/{performancesId}"
)
public
String
subscribe
(
@PathVariable
(
"performancesId"
)
String
performancesId
,
ModelMap
mmap
)
{
List
<
KylinPerformanceSubscribeTicketStatisticalDao
>
result
=
kylinPerformancesService
.
getPerformanceSubscribe
(
performancesId
);
mmap
.
put
(
"subscribeStaticList"
,
result
);
mmap
.
put
(
"performancesId"
,
performancesId
);
return
prefix
+
"/subscribe"
;
}
@Log
(
title
=
"预约统计:导出列表"
)
@PostMapping
(
"/subscribe/export"
)
@ResponseBody
public
AjaxResult
subscribeExport
(
@RequestParam
(
"performancesId"
)
String
performancesId
)
{
List
<
KylinPerformanceSubscribeTicketStatisticalDao
>
list
=
kylinPerformancesService
.
getPerformanceSubscribe
(
performancesId
);
ArrayList
<
KylinPerformanceSubscribeTicketStatisticalExportDao
>
listExport
=
new
ArrayList
<>();
for
(
KylinPerformanceSubscribeTicketStatisticalDao
kylinPerformanceSubscribeTicketStatisticalDao
:
list
)
{
KylinPerformanceSubscribeTicketStatisticalExportDao
kylinPerformanceSubscribeTicketStatisticalExportDao
=
new
KylinPerformanceSubscribeTicketStatisticalExportDao
();
kylinPerformanceSubscribeTicketStatisticalExportDao
.
setTimeTitle
(
kylinPerformanceSubscribeTicketStatisticalDao
.
getTimeTitle
());
kylinPerformanceSubscribeTicketStatisticalExportDao
.
setTicketTimesTitle
(
kylinPerformanceSubscribeTicketStatisticalDao
.
getTicketTimesTitle
());
kylinPerformanceSubscribeTicketStatisticalExportDao
.
setSubscribeTotal
(
kylinPerformanceSubscribeTicketStatisticalDao
.
getSubscribeTotal
());
listExport
.
add
(
kylinPerformanceSubscribeTicketStatisticalExportDao
);
}
ExcelUtil
<
KylinPerformanceSubscribeTicketStatisticalExportDao
>
util
=
new
ExcelUtil
(
KylinPerformanceSubscribeTicketStatisticalExportDao
.
class
);
return
util
.
exportExcel
(
listExport
,
"预约统计"
);
}
//@RequiresPermissions("kylin:performances:view")
@PostMapping
(
value
=
"/agent/change"
)
@ResponseBody
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performances/details.html
View file @
3994a91b
...
...
@@ -41,6 +41,8 @@
</li>
<li
id=
"li-tab-9"
><a
data-toggle=
"tab"
href=
"#tab-9"
aria-expanded=
"false"
onclick=
"payTxtInfo()"
>
支付文案
</a>
</li>
<li
id=
"li-tab-11"
><a
data-toggle=
"tab"
href=
"#tab-11"
aria-expanded=
"false"
onclick=
"subscribeInfo()"
>
预约统计
</a>
</li>
</ul>
<div
class=
"tab-content"
>
<div
id=
"tab-1"
class=
"tab-pane"
>
...
...
@@ -343,6 +345,13 @@
height=
800px
frameborder=
0
></iframe>
</div>
</div>
<div
id=
"tab-11"
class=
"tab-pane"
>
<div
class=
"panel-body"
>
<iframe
id=
"subscribe_iframe"
name=
"subscribe_iframe"
marginwidth=
0
marginheight=
0
width=
100%
height=
800px
frameborder=
0
></iframe>
</div>
</div>
</div>
</div>
</div>
...
...
@@ -420,7 +429,11 @@
if
(
payTxt
==
"hidden"
)
{
document
.
getElementById
(
"li-tab-9"
).
style
.
display
=
"none"
;
}
//预约演出
var
subscribe
=
[[
$
{@
permission
.
hasPermi
(
'kylin:performances:subscribe'
)}]];
if
(
subscribe
==
"hidden"
)
{
document
.
getElementById
(
"li-tab-11"
).
style
.
display
=
"none"
;
}
if
(
auditStatus
==
1
||
fieldStatus
==
1
||
fieldStatus
==
2
||
auditStatus
==
2
)
{
document
.
getElementsByName
(
"auditBtn"
)[
0
].
style
.
display
=
"none"
;
}
...
...
@@ -533,6 +546,10 @@
function
payTxtInfo
()
{
document
.
getElementById
(
"pay_txt_iframe"
).
src
=
"../payTxt/"
+
'[[${kylinPerformanceMisVo.performancesId}]]'
.
replaceAll
(
"
\"
"
,
""
);
}
//预约统计
function
subscribeInfo
()
{
document
.
getElementById
(
"subscribe_iframe"
).
src
=
"../subscribe/"
+
'[[${kylinPerformanceMisVo.performancesId}]]'
.
replaceAll
(
"
\"
"
,
""
);
}
$
(
"#tab-nav-1"
).
bind
(
"click"
,
function
()
{
$
(
"#tab_iframe_1"
).
attr
(
"src"
,
prefix
+
"/performanceStatic/"
+
'[[${kylinPerformanceMisVo.performancesId}]]'
.
replaceAll
(
"
\"
"
,
""
));
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performances/subscribe.html
0 → 100644
View file @
3994a91b
<!DOCTYPE html>
<html
lang=
"zh"
xmlns:th=
"http://www.thymeleaf.org"
xmlns:shiro=
"http://www.pollix.at/thymeleaf/shiro"
>
<head>
<th:block
th:include=
"include :: header('预约统计')"
/>
</head>
<body
class=
"gray-bg"
>
<div
class=
"container-div"
>
<div
class=
"row"
>
<button
id=
"fun1"
type=
"button"
class=
"btn btn-w-m btn-success"
href=
"javascript:void(0)"
onclick=
"searchExport()"
>
导出
</button>
<table
class=
"col-sm-12 select-table table-bordered table table-stripped small m-t-md"
>
<thead>
<tr>
<th>
<div
class=
"cell"
>
场次
</div>
</th>
<th>
<div
class=
"cell"
>
票种
</div>
</th>
<th>
<div
class=
"cell"
>
预约人数
</div>
</th>
</tr>
</thead>
<tbody>
<tr
th:each=
"respBean,respBeanStat:${subscribeStaticList}"
>
<td>
<div
class=
"cell"
th:text=
"${respBean.ticketTimesTitle}"
>
-
</div>
</td>
<td>
<div
class=
"cell"
th:text=
"${respBean.timeTitle}"
>
-
</div>
</td>
<td>
<div
class=
"cell"
th:text=
"${respBean.subscribeTotal}"
>
-
</div>
</td>
</tr>
</tbody>
</table>
</div>
</div>
<th:block
th:include=
"include :: footer"
/>
<script
th:inline=
"javascript"
>
var
performancesId
=
[[
$
{
performancesId
}]];
var
prefix
=
ctx
+
"kylin/performances"
;
function
searchExport
(){
$
.
modal
.
loading
(
"正在导出数据,请稍后..."
);
$
.
post
(
prefix
+
'/subscribe/export'
,
{
performancesId
:
performancesId
},
function
(
result
)
{
if
(
result
.
code
==
web_status
.
SUCCESS
)
{
window
.
location
.
href
=
ctx
+
"common/download?fileName="
+
encodeURI
(
result
.
msg
)
+
"&delete="
+
true
;
}
else
{
$
.
modal
.
alertError
(
result
.
msg
);
}
$
.
modal
.
closeLoading
();
});
}
</script>
</body>
</html>
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/dto/KylinPerformanceSubscribeTicketStatisticalExportDao.java
0 → 100644
View file @
3994a91b
package
com
.
liquidnet
.
client
.
admin
.
zhengzai
.
kylin
.
dto
;
import
com.liquidnet.client.admin.common.annotation.Excel
;
import
lombok.Data
;
import
java.io.Serializable
;
@Data
public
class
KylinPerformanceSubscribeTicketStatisticalExportDao
implements
Serializable
,
Cloneable
{
@Excel
(
name
=
"场次"
,
cellType
=
Excel
.
ColumnType
.
STRING
)
private
String
ticketTimesTitle
;
@Excel
(
name
=
"票种"
,
cellType
=
Excel
.
ColumnType
.
STRING
)
private
String
timeTitle
;
@Excel
(
name
=
"预约人数"
,
cellType
=
Excel
.
ColumnType
.
NUMERIC
)
private
Integer
subscribeTotal
;
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinPerformancesAdminServiceImpl.java
View file @
3994a91b
...
...
@@ -19,6 +19,7 @@ import com.liquidnet.commons.lang.util.DateUtil;
import
com.liquidnet.service.goblin.dto.vo.SmileAgentVo
;
import
com.liquidnet.service.kylin.constant.KylinRedisConst
;
import
com.liquidnet.service.kylin.dao.*
;
import
com.liquidnet.service.kylin.dao.report.KylinPerformanceSubscribeTicketStatisticalDao
;
import
com.liquidnet.service.kylin.dto.param.*
;
import
com.liquidnet.service.kylin.dto.vo.admin.*
;
import
com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketEntitiesVo
;
...
...
@@ -971,6 +972,11 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
return
performancesMapper
.
getPerformanceSponsorList
(
sponsorType
);
}
@Override
public
List
<
KylinPerformanceSubscribeTicketStatisticalDao
>
getPerformanceSubscribe
(
String
performancesId
)
{
return
performancesMapper
.
getSubscribeTicketStatisticalByPerformancesId
(
performancesId
);
}
//删除演出下所有订单缓存(订单详情,订单列表)
public
void
delOrderTicketsRedis
(
KylinPerformanceMisVo
vo
)
{
//找到所有ticketId
...
...
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