记得上下班打卡 | 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
a94db071
Commit
a94db071
authored
Sep 07, 2022
by
张国柄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
~admin:我的券包:创建发放券优化调整(页面停用针对`全部用户`的发放创建逻辑);
parent
5a9c1bbc
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
8 deletions
+11
-8
CandyMgtCouponAdminController.java
...troller/zhengzai/candy/CandyMgtCouponAdminController.java
+3
-0
add1.html
...n/resources/templates/zhengzai/candy/coupon/mgt/add1.html
+2
-2
add101.html
...resources/templates/zhengzai/candy/coupon/mgt/add101.html
+2
-2
add2.html
...n/resources/templates/zhengzai/candy/coupon/mgt/add2.html
+2
-2
add4.html
...n/resources/templates/zhengzai/candy/coupon/mgt/add4.html
+2
-2
No files found.
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/candy/CandyMgtCouponAdminController.java
View file @
a94db071
...
@@ -315,6 +315,9 @@ public class CandyMgtCouponAdminController extends BaseController {
...
@@ -315,6 +315,9 @@ public class CandyMgtCouponAdminController extends BaseController {
break
;
break
;
case
3
:
// 新增券领取类型(3-发放需领取)处理逻辑同(1-发放至用户)
case
3
:
// 新增券领取类型(3-发放需领取)处理逻辑同(1-发放至用户)
case
1
:
case
1
:
if
(!
Arrays
.
asList
(
1
,
2
).
contains
(
buildParam
.
getEventType
()))
{
return
AjaxResult
.
warn
(
"发送类型无效"
);
}
if
(
buildParam
.
getEventType
()
==
2
)
{
// 指定用户手机号
if
(
buildParam
.
getEventType
()
==
2
)
{
// 指定用户手机号
if
(
StringUtils
.
isBlank
(
buildParam
.
getEventLimit
()))
{
if
(
StringUtils
.
isBlank
(
buildParam
.
getEventLimit
()))
{
return
AjaxResult
.
warn
(
"请指定手机号"
);
return
AjaxResult
.
warn
(
"请指定手机号"
);
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/candy/coupon/mgt/add1.html
View file @
a94db071
...
@@ -205,7 +205,7 @@
...
@@ -205,7 +205,7 @@
<span
class=
"labelName"
>
发送类型:
</span>
<span
class=
"labelName"
>
发送类型:
</span>
<div
class=
"layui-input-block"
style=
"display: flex"
>
<div
class=
"layui-input-block"
style=
"display: flex"
>
<!-- <input type="radio" value="10" class="sendType" name="sendType" checked><span>全体用户</span>-->
<!-- <input type="radio" value="10" class="sendType" name="sendType" checked><span>全体用户</span>-->
<input
type=
"radio"
value=
"1"
class=
"sendType"
name=
"sendType"
><span>
会员
</span>
<input
type=
"radio"
value=
"1"
class=
"sendType"
name=
"sendType"
checked
><span>
会员
</span>
<input
type=
"radio"
value=
"2"
class=
"sendType"
name=
"sendType"
><span>
手机号
</span>
<input
type=
"radio"
value=
"2"
class=
"sendType"
name=
"sendType"
><span>
手机号
</span>
</div>
</div>
</div>
</div>
...
@@ -254,7 +254,7 @@
...
@@ -254,7 +254,7 @@
let
prefix
=
ctx
;
let
prefix
=
ctx
;
let
typeOne
=
'0'
;
// 类别
let
typeOne
=
'0'
;
// 类别
let
typeTwo
=
'0'
;
// 类型
let
typeTwo
=
'0'
;
// 类型
let
sendType
=
'1
0
'
;
// 发送类型
let
sendType
=
'1'
;
// 发送类型
let
searchVal
=
''
;
// 输入框内数据
let
searchVal
=
''
;
// 输入框内数据
let
searchData
=
[];
// 搜索总数据
let
searchData
=
[];
// 搜索总数据
let
showId
=
''
;
// 选中演出id
let
showId
=
''
;
// 选中演出id
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/candy/coupon/mgt/add101.html
View file @
a94db071
...
@@ -201,7 +201,7 @@
...
@@ -201,7 +201,7 @@
<span
class=
"labelName"
>
发送类型:
</span>
<span
class=
"labelName"
>
发送类型:
</span>
<div
class=
"layui-input-block"
style=
"display: flex"
>
<div
class=
"layui-input-block"
style=
"display: flex"
>
<!-- <input type="radio" value="10" class="sendType" name="sendType" checked><span>全体用户</span>-->
<!-- <input type="radio" value="10" class="sendType" name="sendType" checked><span>全体用户</span>-->
<input
type=
"radio"
value=
"1"
class=
"sendType"
name=
"sendType"
><span>
会员
</span>
<input
type=
"radio"
value=
"1"
class=
"sendType"
name=
"sendType"
checked
><span>
会员
</span>
<input
type=
"radio"
value=
"2"
class=
"sendType"
name=
"sendType"
><span>
手机号
</span>
<input
type=
"radio"
value=
"2"
class=
"sendType"
name=
"sendType"
><span>
手机号
</span>
</div>
</div>
</div>
</div>
...
@@ -249,7 +249,7 @@
...
@@ -249,7 +249,7 @@
let
prefix
=
ctx
;
let
prefix
=
ctx
;
let
typeOne
=
'3'
;
// 类别
let
typeOne
=
'3'
;
// 类别
let
typeTwo
=
'0'
;
// 类型
let
typeTwo
=
'0'
;
// 类型
let
sendType
=
'1
0
'
;
// 发送类型
let
sendType
=
'1'
;
// 发送类型
let
searchVal
=
''
;
// 输入框内数据
let
searchVal
=
''
;
// 输入框内数据
let
searchData
=
[];
// 搜索总数据
let
searchData
=
[];
// 搜索总数据
let
showId
=
''
;
// 选中演出id
let
showId
=
''
;
// 选中演出id
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/candy/coupon/mgt/add2.html
View file @
a94db071
...
@@ -208,7 +208,7 @@
...
@@ -208,7 +208,7 @@
<span
class=
"labelName"
>
发送类型:
</span>
<span
class=
"labelName"
>
发送类型:
</span>
<div
class=
"layui-input-block"
style=
"display: flex"
>
<div
class=
"layui-input-block"
style=
"display: flex"
>
<!-- <input type="radio" value="10" class="sendType" name="sendType" checked><span>全体用户</span>-->
<!-- <input type="radio" value="10" class="sendType" name="sendType" checked><span>全体用户</span>-->
<input
type=
"radio"
value=
"1"
class=
"sendType"
name=
"sendType"
><span>
会员
</span>
<input
type=
"radio"
value=
"1"
class=
"sendType"
name=
"sendType"
checked
><span>
会员
</span>
<input
type=
"radio"
value=
"2"
class=
"sendType"
name=
"sendType"
><span>
手机号
</span>
<input
type=
"radio"
value=
"2"
class=
"sendType"
name=
"sendType"
><span>
手机号
</span>
</div>
</div>
</div>
</div>
...
@@ -257,7 +257,7 @@
...
@@ -257,7 +257,7 @@
let
prefix
=
ctx
;
let
prefix
=
ctx
;
let
typeOne
=
'0'
;
// 类别
let
typeOne
=
'0'
;
// 类别
let
typeTwo
=
'0'
;
// 类型
let
typeTwo
=
'0'
;
// 类型
let
sendType
=
'1
0
'
;
// 发送类型
let
sendType
=
'1'
;
// 发送类型
let
searchVal
=
''
;
// 输入框内数据
let
searchVal
=
''
;
// 输入框内数据
let
searchData
=
[];
// 搜索总数据
let
searchData
=
[];
// 搜索总数据
let
showId
=
''
;
// 选中演出id
let
showId
=
''
;
// 选中演出id
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/candy/coupon/mgt/add4.html
View file @
a94db071
...
@@ -198,7 +198,7 @@
...
@@ -198,7 +198,7 @@
<span
class=
"labelName"
>
发送类型:
</span>
<span
class=
"labelName"
>
发送类型:
</span>
<div
class=
"layui-input-block"
style=
"display: flex"
>
<div
class=
"layui-input-block"
style=
"display: flex"
>
<!-- <input type="radio" value="10" class="sendType" name="sendType" checked><span>全体用户</span>-->
<!-- <input type="radio" value="10" class="sendType" name="sendType" checked><span>全体用户</span>-->
<input
type=
"radio"
value=
"1"
class=
"sendType"
name=
"sendType"
><span>
会员
</span>
<input
type=
"radio"
value=
"1"
class=
"sendType"
name=
"sendType"
checked
><span>
会员
</span>
<input
type=
"radio"
value=
"2"
class=
"sendType"
name=
"sendType"
><span>
手机号
</span>
<input
type=
"radio"
value=
"2"
class=
"sendType"
name=
"sendType"
><span>
手机号
</span>
</div>
</div>
</div>
</div>
...
@@ -230,7 +230,7 @@
...
@@ -230,7 +230,7 @@
let
prefix
=
ctx
;
let
prefix
=
ctx
;
let
typeOne
=
'2'
;
// 类别
let
typeOne
=
'2'
;
// 类别
let
typeTwo
=
'0'
;
// 类型
let
typeTwo
=
'0'
;
// 类型
let
sendType
=
'1
0
'
;
// 发送类型
let
sendType
=
'1'
;
// 发送类型
let
searchVal
=
''
;
// 输入框内数据
let
searchVal
=
''
;
// 输入框内数据
let
searchData
=
[];
// 搜索总数据
let
searchData
=
[];
// 搜索总数据
let
showId
=
''
;
// 选中演出id
let
showId
=
''
;
// 选中演出id
...
...
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