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
64ff6af5
Commit
64ff6af5
authored
Jun 22, 2021
by
徐康
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature/xukang_20210609_麦咖啡p7v2' into qa
parents
177baf54
ff379a03
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 additions
and
0 deletions
+1
-0
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
+1
-0
No files found.
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
View file @
64ff6af5
...
@@ -1118,6 +1118,7 @@ public class ShoppingCartMCoffeeServiceImpl {
...
@@ -1118,6 +1118,7 @@ public class ShoppingCartMCoffeeServiceImpl {
if
(
ObjectUtils
.
notEqual
(
shoppingCartGoodsResponseVo
.
getFreightCouponCode
(),
freightCouponCode
))
{
if
(
ObjectUtils
.
notEqual
(
shoppingCartGoodsResponseVo
.
getFreightCouponCode
(),
freightCouponCode
))
{
assortmentSdkService
.
setShoppingCartCouponCode
(
partnerId
,
storeId
,
userId
,
shoppingCartGoodsResponseVo
.
getFreightCouponCode
(),
shoppingCartBaseService
,
SaveCouponType
.
FREIGHT_COUPON
.
getCode
());
assortmentSdkService
.
setShoppingCartCouponCode
(
partnerId
,
storeId
,
userId
,
shoppingCartGoodsResponseVo
.
getFreightCouponCode
(),
shoppingCartBaseService
,
SaveCouponType
.
FREIGHT_COUPON
.
getCode
());
}
}
shoppingCartGoodsResponseVo
.
getProducts
().
removeIf
(
o
->
"9998"
.
equals
(
o
.
getSkuId
()));
return
ResponseUtil
.
success
(
shoppingCartGoodsResponseVo
);
return
ResponseUtil
.
success
(
shoppingCartGoodsResponseVo
);
}
}
...
...
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