Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
O
order-group
Overview
Overview
Details
Activity
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
order-group-application
order-group
Commits
8d15fa18
Commit
8d15fa18
authored
Mar 15, 2021
by
chongfu.liang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
a291b0d5
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletions
+3
-1
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/CouponPromotionService.java
+2
-1
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/promotion/CouponSharingService.java
+1
-0
No files found.
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/CouponPromotionService.java
View file @
8d15fa18
...
...
@@ -96,7 +96,7 @@ public class CouponPromotionService implements IPromotionService {
Map
<
String
,
CheckSpqInfoResponseDto
>
validCouponMap
=
calculationDiscountResult
==
null
?
new
HashMap
<>()
:
calculationDiscountResult
.
getValidCouponMap
();
Map
<
String
,
List
<
String
>>
spqIdToCartUuid
=
calculationDiscountResult
==
null
?
new
HashMap
<>()
:
calculationDiscountResult
.
getSpqIdToCartUuid
();
if
(
MapUtils
.
isNotEmpty
(
validCouponMap
)
&&
MapUtils
.
isNotEmpty
(
spqIdToCartUuid
)
&&
calculationDiscountResult
!=
null
&&
CollectionUtils
.
isNotEmpty
(
calculationDiscountResult
.
getCouponDiscounts
())
){
if
(
MapUtils
.
isNotEmpty
(
validCouponMap
)
&&
MapUtils
.
isNotEmpty
(
spqIdToCartUuid
)
&&
calculationDiscountResult
!=
null
){
List
<
String
>
activityCodeList
=
calculationDiscountResult
.
getCouponDiscounts
().
stream
().
map
(
p
->
p
.
getCouponCode
()).
collect
(
Collectors
.
toList
());
for
(
String
spqId
:
validCouponMap
.
keySet
())
{
CheckSpqInfoResponseDto
sqpInfo
=
validCouponMap
.
get
(
spqId
);
...
...
@@ -105,6 +105,7 @@ public class CouponPromotionService implements IPromotionService {
if
(
CollectionUtils
.
isNotEmpty
(
uuidList
)){
List
<
CartGoods
>
newCartList
=
cartGoodsList
.
stream
().
filter
(
p
->
!
uuidList
.
contains
(
p
.
getCartGoodsUid
())).
collect
(
Collectors
.
toList
());
assortmentSdkService
.
setShoppingCart
(
activityQueryDto
.
getPartnerId
(),
activityQueryDto
.
getStoreId
(),
userLoginInfoDto
.
getMemberId
(),
newCartList
,
null
,
null
,
this
.
shoppingCartBaseService
);
cartGoodsList
=
newCartList
;
CheckSpqInfoResponseDto
checkSpqInfoResponseDto
=
validCouponMap
.
get
(
spqId
);
shoppingCartGoodsResponseVo
.
setChanged
(
true
);
shoppingCartGoodsResponseVo
.
setToastMsg
(
"当前购物车金额低于【"
+
checkSpqInfoResponseDto
.
getCouponName
()
+
"】优惠券起用金额门槛,券已自动移除购物车"
);
...
...
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/promotion/CouponSharingService.java
View file @
8d15fa18
...
...
@@ -104,6 +104,7 @@ public class CouponSharingService {
if
(
CollectionUtils
.
isNotEmpty
(
uuidList
)){
List
<
CartGoods
>
newCartList
=
cartGoodsList
.
stream
().
filter
(
p
->
!
uuidList
.
contains
(
p
.
getCartGoodsUid
())).
collect
(
Collectors
.
toList
());
assortmentSdkService
.
setShoppingCart
(
partnerId
,
storeId
,
userId
,
newCartList
,
null
,
null
,
this
.
shoppingCartBaseService
);
cartGoodsList
=
newCartList
;
CheckSpqInfoResponseDto
checkSpqInfoResponseDto
=
validCouponMap
.
get
(
spqId
);
shoppingCartGoodsResponseVo
.
setChanged
(
true
);
shoppingCartGoodsResponseVo
.
setToastMsg
(
"当前购物车金额低于【"
+
checkSpqInfoResponseDto
.
getCouponName
()
+
"】优惠券起用金额门槛,券已自动移除购物车"
);
...
...
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