记得上下班打卡 | 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
5805a62c
Commit
5805a62c
authored
Jan 29, 2024
by
zhangguobing
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/20240123_COUPON_SPU' into 20240123_COUPON_SPU
parents
0b77cce6
ad62a2a8
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
9 deletions
+11
-9
KylinOrderTicketsServiceImpl.java
...vice/order/service/impl/KylinOrderTicketsServiceImpl.java
+11
-9
No files found.
liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/KylinOrderTicketsServiceImpl.java
View file @
5805a62c
...
...
@@ -324,18 +324,20 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
}
//判断新商品券
if
(
payOrderParam
.
getVoucherCode
()!=
null
)
{
CandyUserCouponAssocDto
couponAssocDto
=
dataUtils
.
getGoblinPlatformCoupon
(
payOrderParam
.
getVoucherCode
());
if
(
couponAssocDto
!=
null
)
{
if
(
couponAssocDto
!=
null
)
{
boolean
goblinPlatformCouponseCanUse
=
false
;
for
(
AdamEntersVo
adamEnters
:
entersVoList
)
{
if
(
couponAssocDto
.
getIdNo
().
equals
(
adamEnters
.
getIdCard
()))
{
if
(
couponAssocDto
.
getIdNo
().
equals
(
adamEnters
.
getIdCard
()))
{
goblinPlatformCouponseCanUse
=
true
;
}
}
if
(!
goblinPlatformCouponseCanUse
)
{
if
(!
goblinPlatformCouponseCanUse
)
{
return
ResponseDto
.
failure
(
"实名券与入场人信息不一致"
);
}
}
}
// 判断库存
int
surplusGeneral
=
orderUtils
.
changeSurplus
(
isPay
,
payOrderParam
.
getTicketId
(),
-
payOrderParam
.
getNumber
());
...
...
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