记得上下班打卡 | 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
8e9cd456
Commit
8e9cd456
authored
Jun 03, 2021
by
胡佳晨
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
会员信息配置 修改提交
parent
63a0b483
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
190 additions
and
65 deletions
+190
-65
PerformanceMemberAuditParam.java
.../service/kylin/dto/param/PerformanceMemberAuditParam.java
+0
-1
TicketMemberAuditParam.java
...idnet/service/kylin/dto/param/TicketMemberAuditParam.java
+1
-1
KylinPerformancesController.java
...ontroller/zhengzai/kylin/KylinPerformancesController.java
+9
-0
details.html
...ources/templates/zhengzai/kylin/performances/details.html
+4
-2
memberInfo.html
...ces/templates/zhengzai/kylin/performances/memberInfo.html
+176
-61
No files found.
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/PerformanceMemberAuditParam.java
View file @
8e9cd456
...
@@ -6,7 +6,6 @@ import lombok.Data;
...
@@ -6,7 +6,6 @@ import lombok.Data;
import
java.util.List
;
import
java.util.List
;
@ApiModel
@Data
@Data
public
class
PerformanceMemberAuditParam
{
public
class
PerformanceMemberAuditParam
{
@ApiModelProperty
(
value
=
"演出id"
)
@ApiModelProperty
(
value
=
"演出id"
)
...
...
liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/TicketMemberAuditParam.java
View file @
8e9cd456
...
@@ -11,7 +11,7 @@ import java.math.BigDecimal;
...
@@ -11,7 +11,7 @@ import java.math.BigDecimal;
public
class
TicketMemberAuditParam
{
public
class
TicketMemberAuditParam
{
@ApiModelProperty
(
value
=
"票id"
)
@ApiModelProperty
(
value
=
"票id"
)
private
String
ticketsId
;
private
String
ticketsId
;
@ApiModelProperty
(
value
=
"
演出
名称"
)
@ApiModelProperty
(
value
=
"
票
名称"
)
private
String
title
;
private
String
title
;
@ApiModelProperty
(
value
=
"会员优惠价格"
)
@ApiModelProperty
(
value
=
"会员优惠价格"
)
private
BigDecimal
priceDiscountMember
;
private
BigDecimal
priceDiscountMember
;
...
...
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 @
8e9cd456
...
@@ -8,6 +8,7 @@ import com.liquidnet.client.admin.zhengzai.kylin.service.impl.KylinPerformancesA
...
@@ -8,6 +8,7 @@ import com.liquidnet.client.admin.zhengzai.kylin.service.impl.KylinPerformancesA
import
com.liquidnet.service.kylin.dao.PerformanceAdminListDao
;
import
com.liquidnet.service.kylin.dao.PerformanceAdminListDao
;
import
com.liquidnet.service.kylin.dao.PerformanceMemberAuditDao
;
import
com.liquidnet.service.kylin.dao.PerformanceMemberAuditDao
;
import
com.liquidnet.service.kylin.dto.param.PerformanceAdminListParam
;
import
com.liquidnet.service.kylin.dto.param.PerformanceAdminListParam
;
import
com.liquidnet.service.kylin.dto.param.PerformanceMemberAuditParam
;
import
com.liquidnet.service.kylin.dto.vo.partner.KylinPerformanceMisVo
;
import
com.liquidnet.service.kylin.dto.vo.partner.KylinPerformanceMisVo
;
import
org.apache.shiro.authz.annotation.RequiresPermissions
;
import
org.apache.shiro.authz.annotation.RequiresPermissions
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
@@ -79,4 +80,12 @@ public class KylinPerformancesController extends BaseController {
...
@@ -79,4 +80,12 @@ public class KylinPerformancesController extends BaseController {
mmap
.
put
(
"performanceMemberAuditDao"
,
result
);
mmap
.
put
(
"performanceMemberAuditDao"
,
result
);
return
prefix
+
"/memberInfo"
;
return
prefix
+
"/memberInfo"
;
}
}
@RequiresPermissions
(
"kylin:performances:member:change"
)
@PostMapping
(
value
=
"/memberInfo/submit"
)
@ResponseBody
public
AjaxResult
memberInfo
(
PerformanceMemberAuditParam
performanceMemberAuditParam
)
{
boolean
result
=
kylinPerformancesService
.
performanceMemberChange
(
performanceMemberAuditParam
);
return
toAjax
(
result
);
}
}
}
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performances/details.html
View file @
8e9cd456
...
@@ -216,7 +216,7 @@
...
@@ -216,7 +216,7 @@
</div>
</div>
<div
id=
"tab-3"
class=
"tab-pane"
>
<div
id=
"tab-3"
class=
"tab-pane"
>
<div
class=
"panel-body"
>
<div
class=
"panel-body"
>
<iframe
id=
"content_iframe"
name=
"content_iframe"
marginwidth=
0
marginheight=
0
width=
100%
height=
100%
frameborder=
0
></iframe>
<iframe
id=
"content_iframe"
name=
"content_iframe"
marginwidth=
0
marginheight=
0
width=
100%
height=
800px
frameborder=
0
></iframe>
</div>
</div>
</div>
</div>
</div>
</div>
...
@@ -269,6 +269,8 @@
...
@@ -269,6 +269,8 @@
"rejectTxt"
:
auditRejectTxt
"rejectTxt"
:
auditRejectTxt
};
};
$
.
operate
.
post
(
prefix
+
"/audit"
,
param
,
function
(
res
)
{
$
.
operate
.
post
(
prefix
+
"/audit"
,
param
,
function
(
res
)
{
// $.modal.close();
$
.
table
.
refresh
();
});
});
}
}
}
}
...
@@ -279,7 +281,7 @@
...
@@ -279,7 +281,7 @@
//会员详情
//会员详情
function
memberInfo
()
{
function
memberInfo
()
{
document
.
getElementById
(
"content_iframe"
).
src
=
"../memberInfo/"
+
'[[${kylinPerformanceMisVo.performancesId}]]'
;
document
.
getElementById
(
"content_iframe"
).
src
=
"../memberInfo/"
+
'[[${kylinPerformanceMisVo.performancesId}]]'
.
replaceAll
(
"
\"
"
,
""
)
;
}
}
</script>
</script>
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performances/memberInfo.html
View file @
8e9cd456
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