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
7e465ef8
Commit
7e465ef8
authored
Jun 16, 2021
by
徐康
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
默认选中赠品
parent
80c556a9
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
0 deletions
+17
-0
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
+17
-0
No files found.
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
View file @
7e465ef8
...
...
@@ -239,6 +239,23 @@ public class ShoppingCartMCoffeeServiceImpl {
// 促销活动的优惠金额计算
calculationService
.
updateShoppingCartGoodsDiscount
(
partnerId
,
storeId
,
userId
,
appId
,
orderType
,
assortmentCustomerInfoVo
.
isMemberPaid
(),
menuType
,
receiveId
,
couponCode
,
oldCartGoodsList
,
coupons
,
new
ArrayList
<>(),
shoppingCartGoodsResponseVo
,
null
,
null
);
if
(
null
!=
shoppingCartGoodsResponseVo
.
getActivityTip
()
&&
CollectionUtils
.
isNotEmpty
(
shoppingCartGoodsResponseVo
.
getActivityTip
().
getActivityList
()))
{
Optional
<
ActivityList
>
activityListOptional
=
shoppingCartGoodsResponseVo
.
getActivityTip
().
getActivityList
().
stream
().
filter
(
o
->
ActivityTypeEnum
.
TYPE_230
.
getCode
().
equals
(
o
.
getTipType
())).
findFirst
();
if
(
activityListOptional
.
isPresent
())
{
List
<
CartGoods
>
cartSendGoodsList
=
assortmentSdkService
.
getShoppingCartSendGoods
(
partnerId
,
storeId
,
userId
,
sessionId
,
""
,
shoppingCartBaseService
);
if
(
CollectionUtils
.
isEmpty
(
cartSendGoodsList
)
||
activityListOptional
.
get
().
getMcCafeSendGoodsList
().
stream
().
noneMatch
(
o
->
o
.
getSkuId
().
equals
(
cartSendGoodsList
.
get
(
0
).
getSkuId
())))
{
MCoffeeAddGoodsRequestVo
selectGoodsRequest
=
new
MCoffeeAddGoodsRequestVo
();
BeanUtils
.
copyProperties
(
addShoppingCartGoodsRequestVo
,
selectGoodsRequest
);
selectGoodsRequest
.
setSkuId
(
activityListOptional
.
get
().
getMcCafeSendGoodsList
().
get
(
0
).
getSkuId
());
selectGoodsRequest
.
setSpuId
(
activityListOptional
.
get
().
getMcCafeSendGoodsList
().
get
(
0
).
getSkuId
());
selectSendGoods
(
selectGoodsRequest
);
}
}
}
assortmentSdkService
.
setShoppingCart
(
partnerId
,
storeId
,
userId
,
oldCartGoodsList
,
null
,
tableNumber
,
this
.
shoppingCartBaseService
);
newCartGoods
=
oldCartGoodsList
;
}
...
...
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