记得上下班打卡 | 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
633754be
Commit
633754be
authored
Mar 17, 2022
by
胡佳晨
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改判断 从如果是会员 或者 用了券就可以走会员时间,改为如果是老会员或者会员券的情况下还得是会员购买逻辑才可以走会员时间
parent
72c1aa15
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
payTxt.html
...sources/templates/zhengzai/kylin/performances/payTxt.html
+1
-1
KylinOrderTicketsServiceImpl.java
...vice/order/service/impl/KylinOrderTicketsServiceImpl.java
+3
-3
No files found.
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performances/payTxt.html
View file @
633754be
...
@@ -29,7 +29,7 @@
...
@@ -29,7 +29,7 @@
<div
class=
"form-group"
>
<div
class=
"form-group"
>
<label
class=
"col-sm-3 control-label is-required"
>
支付文案:
</label>
<label
class=
"col-sm-3 control-label is-required"
>
支付文案:
</label>
<div
class=
"col-sm-8"
>
<div
class=
"col-sm-8"
>
<input
name=
"payTxt"
th:value=
"${ticket.payTxt}"
onkeyup=
"value=value.replace(/[^\w\u4E00-\u9FA5]/g, '')"
class=
"form-control"
type=
"text"
maxlength=
"16"
>
<input
name=
"payTxt"
th:value=
"${ticket.payTxt}"
class=
"form-control"
type=
"text"
maxlength=
"16"
>
</div>
</div>
<button
type=
"button"
class=
"btn btn-w-m btn-success"
onclick=
"submitHandler(this)"
>
<button
type=
"button"
class=
"btn btn-w-m btn-success"
onclick=
"submitHandler(this)"
>
保存
保存
...
...
liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/KylinOrderTicketsServiceImpl.java
View file @
633754be
...
@@ -250,7 +250,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
...
@@ -250,7 +250,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
}
}
}
}
if
(
isMember
||
advanceMap
!=
null
)
{
if
(
(
isOldMember
||
advanceMap
!=
null
)
&&
memberType
==
1
)
{
if
(
DateUtil
.
compareStrDay
(
DateUtil
.
getNowTime
(),
memberTimeStart
)
==
-
1
)
{
if
(
DateUtil
.
compareStrDay
(
DateUtil
.
getNowTime
(),
memberTimeStart
)
==
-
1
)
{
orderUtils
.
backAdvanceCoupon
(
payOrderParam
.
getAdvanceCode
(),
uid
);
orderUtils
.
backAdvanceCoupon
(
payOrderParam
.
getAdvanceCode
(),
uid
);
return
ResponseDto
.
failure
(
ErrorMapping
.
get
(
"20011"
));
//未开始
return
ResponseDto
.
failure
(
ErrorMapping
.
get
(
"20011"
));
//未开始
...
@@ -613,7 +613,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
...
@@ -613,7 +613,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
if
(
orderTickets
.
getPriceActual
().
compareTo
(
BigDecimal
.
valueOf
(
0
))
>
0
)
{
if
(
orderTickets
.
getPriceActual
().
compareTo
(
BigDecimal
.
valueOf
(
0
))
>
0
)
{
String
name
=
dataUtils
.
getTicketPayTxt
(
ticketData
.
getTicketsId
());
String
name
=
dataUtils
.
getTicketPayTxt
(
ticketData
.
getTicketsId
());
if
(
name
.
equals
(
""
))
{
if
(
name
.
equals
(
""
))
{
name
=
"正在现场"
;
name
=
"正在现场"
;
}
}
// 调用支付
// 调用支付
...
@@ -741,7 +741,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
...
@@ -741,7 +741,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
KylinOrderTicketEntitiesVo
entitiesData
=
orderTicketData
.
getEntitiesVoList
().
get
(
0
);
KylinOrderTicketEntitiesVo
entitiesData
=
orderTicketData
.
getEntitiesVoList
().
get
(
0
);
String
name
=
dataUtils
.
getTicketPayTxt
(
orderTicketData
.
getTicketId
());
String
name
=
dataUtils
.
getTicketPayTxt
(
orderTicketData
.
getTicketId
());
if
(
name
.
equals
(
""
))
{
if
(
name
.
equals
(
""
))
{
name
=
"正在现场"
;
name
=
"正在现场"
;
}
}
LinkedMultiValueMap
<
String
,
String
>
httpData
=
ObjectUtil
.
cloneLinkedMultiValueMapStringAndString
();
LinkedMultiValueMap
<
String
,
String
>
httpData
=
ObjectUtil
.
cloneLinkedMultiValueMapStringAndString
();
...
...
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