记得上下班打卡 | 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
e1dfa5de
Commit
e1dfa5de
authored
Jun 24, 2022
by
zhanggb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
~api:POS机代领券:部分商品券时+返回spuIds;
parent
3174514d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
2 deletions
+6
-2
GoblinCouponController.java
...net/service/goblin/controller/GoblinCouponController.java
+6
-2
No files found.
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/controller/GoblinCouponController.java
View file @
e1dfa5de
...
...
@@ -145,7 +145,9 @@ public class GoblinCouponController {
// return userCouponVoOptional.map(ResponseDto::success).orElseGet(() -> ResponseDto.failure(ErrorMapping.get("140054")));
if
(
userCouponVoOptional
.
isPresent
())
{
GoblinUserCouponVo
userCouponVo
=
userCouponVoOptional
.
get
();
userCouponVo
.
setSpuIds
(
goblinRedisUtils
.
getStoreCouponSpuIds
(
storeCouponId
));
if
(
StringUtils
.
equals
(
"1"
,
userCouponVo
.
getUseScope
()))
{
userCouponVo
.
setSpuIds
(
goblinRedisUtils
.
getStoreCouponSpuIds
(
storeCouponId
));
}
return
ResponseDto
.
success
(
userCouponVo
);
}
else
{
return
ResponseDto
.
failure
(
ErrorMapping
.
get
(
"140054"
));
...
...
@@ -158,7 +160,9 @@ public class GoblinCouponController {
.
filter
(
vo
->
vo
.
getStoreCouponId
().
equals
(
storeCouponId
)
&&
vo
.
getState
().
equals
(
1
)).
collect
(
Collectors
.
toList
());
// return ResponseDto.success(userCouponVoList.get(0));
GoblinUserCouponVo
userCouponVo
=
userCouponVoList
.
get
(
0
);
userCouponVo
.
setSpuIds
(
goblinRedisUtils
.
getStoreCouponSpuIds
(
storeCouponId
));
if
(
StringUtils
.
equals
(
"1"
,
userCouponVo
.
getUseScope
()))
{
userCouponVo
.
setSpuIds
(
goblinRedisUtils
.
getStoreCouponSpuIds
(
storeCouponId
));
}
return
ResponseDto
.
success
(
userCouponVo
);
}
return
ResponseDto
.
failure
(
ErrorMapping
.
get
(
"140053"
));
...
...
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