记得上下班打卡 | 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
18c4dae8
Commit
18c4dae8
authored
Aug 10, 2022
by
胡佳晨
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
sweet 修改 添加 ar活动 演出拦截
parent
96e71d46
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
3 deletions
+12
-3
addNewActivity.html
...templates/zhengzai/store/placingOrder/addNewActivity.html
+3
-3
GoblinZhengzaiMarketServiceImpl.java
.../goblin/service/impl/GoblinZhengzaiMarketServiceImpl.java
+9
-0
No files found.
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/store/placingOrder/addNewActivity.html
View file @
18c4dae8
...
...
@@ -153,8 +153,8 @@
common
();
if
(
r
)
{
marketId
=
unescape
(
r
[
2
]);
$
(
".editDisabled"
).
attr
(
'disabled'
,
true
);
$
(
".editshow"
).
hide
()
//
$(".editDisabled").attr('disabled', true);
//
$(".editshow").hide()
let
data
=
{
marketId
}
...
...
@@ -245,7 +245,7 @@
}
$
(
".activityStore"
).
append
(
body
)
common
()
$
(
".itemDisabled"
).
attr
(
'disabled'
,
true
);
//
$(".itemDisabled").attr('disabled', true);
layui
.
use
(
'laydate'
,
function
(){
var
laydate
=
layui
.
laydate
;
//执行一个laydate实例
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/goblin/service/impl/GoblinZhengzaiMarketServiceImpl.java
View file @
18c4dae8
...
...
@@ -119,6 +119,11 @@ public class GoblinZhengzaiMarketServiceImpl implements IGoblinZhengzaiMarketSer
@Override
public
ResponseDto
<
String
>
zhengzaiInsert
(
String
purchaseName
,
String
performanceId
,
String
img
,
String
st
,
String
et
)
{
int
count
=
goblinSelfMarketingMapper
.
selectCount
(
Wrappers
.
lambdaUpdate
(
GoblinSelfMarketing
.
class
).
eq
(
GoblinSelfMarketing:
:
getPerformanceId
,
performanceId
));
if
(
count
>
0
){
return
ResponseDto
.
failure
(
"改演出已关联活动"
);
}
GoblinSelfMarketing
selfMarketing
=
GoblinSelfMarketing
.
getNew
();
String
SelfMarketId
=
IDGenerator
.
nextTimeId2
();
selfMarketing
.
setSelfMarketId
(
SelfMarketId
);
...
...
@@ -147,6 +152,10 @@ public class GoblinZhengzaiMarketServiceImpl implements IGoblinZhengzaiMarketSer
@Override
public
ResponseDto
<
Boolean
>
zhengzaiUpdate
(
String
marketId
,
String
purchaseName
,
String
performanceId
,
String
img
,
String
st
,
String
et
)
{
int
count
=
goblinSelfMarketingMapper
.
selectCount
(
Wrappers
.
lambdaUpdate
(
GoblinSelfMarketing
.
class
).
eq
(
GoblinSelfMarketing:
:
getPerformanceId
,
performanceId
));
if
(
count
>
1
){
return
ResponseDto
.
failure
(
"改演出已关联活动"
);
}
GoblinSelfMarketing
selfMarketing
=
GoblinSelfMarketing
.
getNew
();
selfMarketing
.
setSelfMarketId
(
marketId
);
selfMarketing
.
setName
(
purchaseName
);
...
...
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