Toggle navigation
Toggle navigation
This project
Loading...
Sign in
ufo
/
yohoufo-fore
·
Commits
Go to a project
GitLab
Go to group
Project
Activity
Files
Commits
Pipelines
0
Builds
0
Graphs
Milestones
Issues
0
Merge Requests
0
Members
Labels
Wiki
Forks
Network
Create a new issue
Download as
Email Patches
Plain Diff
Browse Files
Authored by
TANLING
5 years ago
Commit
583911270d19452c8a30b63d5a1e05c397d996f9
1 parent
c7f6a6e5
fix
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
promotion/src/main/java/com/yohoufo/promotion/service/impl/CollectiveCouponService.java
promotion/src/main/java/com/yohoufo/promotion/service/impl/CollectiveCouponService.java
View file @
5839112
...
...
@@ -203,7 +203,7 @@ public class CollectiveCouponService {
condition
.
setUseLimitType
(
Byte
.
valueOf
(
couponUseLimitTypeEnum
.
getLimitType
()));
List
<
Coupon
>
top
=
couponViewMapper
.
selectByAssociatedPrdNCouponType
(
condition
);
logger
.
info
(
"getCouponTopListOfPrdDetail condition {} top {}"
,
condition
,
top
);
datas
=
productLimitValueFilter
.
filter
(
datas
,
req
.
getProductId
());
top
=
productLimitValueFilter
.
filter
(
top
,
req
.
getProductId
());
if
(
CollectionUtils
.
isNotEmpty
(
top
)){
datas
.
add
(
top
.
get
(
0
));
}
...
...
@@ -218,7 +218,7 @@ public class CollectiveCouponService {
}
condition
.
setCouponType
(
couponTypeEnum
.
getCode
());
List
<
Coupon
>
shippingTop
=
couponViewMapper
.
selectByAssociatedPrdNCouponType
(
condition
);
datas
=
productLimitValueFilter
.
filter
(
datas
,
req
.
getProductId
());
shippingTop
=
productLimitValueFilter
.
filter
(
shippingTop
,
req
.
getProductId
());
logger
.
info
(
"getCouponTopListOfPrdDetail condition {} top {}"
,
condition
,
shippingTop
);
if
(
CollectionUtils
.
isNotEmpty
(
shippingTop
)){
datas
.
add
(
shippingTop
.
get
(
0
));
...
...
Please
register
or
login
to post a comment