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
3e5c97d2
Commit
3e5c97d2
authored
Dec 09, 2020
by
刘鹏飞
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
coco去掉日志
parent
f0587fb8
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
3 deletions
+2
-3
shopping-cart-application-service/src/main/java/cn/freemud/service/shoppingCart/impl/CocoShoppingCartRelationServiceImpl.java
+2
-3
No files found.
shopping-cart-application-service/src/main/java/cn/freemud/service/shoppingCart/impl/CocoShoppingCartRelationServiceImpl.java
View file @
3e5c97d2
...
@@ -49,7 +49,7 @@ public class CocoShoppingCartRelationServiceImpl implements ShoppingCartRelation
...
@@ -49,7 +49,7 @@ public class CocoShoppingCartRelationServiceImpl implements ShoppingCartRelation
discounts
.
add
(
discount
);
discounts
.
add
(
discount
);
});
});
}
}
ApiLog
.
info
(
"coco算行,shoppingCartGoodsResponseVo,discountResult"
,
shoppingCartGoodsResponseVo
,
discountResult
);
// 促销的活动信息和商品优惠信息给前端做展示、打标签用
// 促销的活动信息和商品优惠信息给前端做展示、打标签用
shoppingCartGoodsResponseVo
.
setDiscounts
(
discounts
);
shoppingCartGoodsResponseVo
.
setDiscounts
(
discounts
);
shoppingCartGoodsResponseVo
.
setGoods
(
discountResult
.
getGoods
());
shoppingCartGoodsResponseVo
.
setGoods
(
discountResult
.
getGoods
());
...
@@ -58,7 +58,7 @@ public class CocoShoppingCartRelationServiceImpl implements ShoppingCartRelation
...
@@ -58,7 +58,7 @@ public class CocoShoppingCartRelationServiceImpl implements ShoppingCartRelation
List
<
String
>
gifeProductIds
=
new
ArrayList
<>();
List
<
String
>
gifeProductIds
=
new
ArrayList
<>();
if
(
products
!=
null
&&
!
products
.
isEmpty
()){
if
(
products
!=
null
&&
!
products
.
isEmpty
()){
// 获取赠品的商品id
// 获取赠品的商品id
gifeProductIds
=
products
.
stream
().
filter
(
product
->
Objects
.
equals
(
product
.
getActivityType
(),
ActivityTypeEnum
.
TYPE_63
)).
map
(
CartGoods:
:
getGoodsId
).
collect
(
Collectors
.
toList
());
gifeProductIds
=
products
.
stream
().
filter
(
product
->
Objects
.
equals
(
product
.
getActivityType
(),
ActivityTypeEnum
.
TYPE_63
.
getCode
()
)).
map
(
CartGoods:
:
getGoodsId
).
collect
(
Collectors
.
toList
());
}
}
// 第二件优惠活动,在点餐页需要给优惠商品单独显示一行
// 第二件优惠活动,在点餐页需要给优惠商品单独显示一行
...
@@ -125,7 +125,6 @@ public class CocoShoppingCartRelationServiceImpl implements ShoppingCartRelation
...
@@ -125,7 +125,6 @@ public class CocoShoppingCartRelationServiceImpl implements ShoppingCartRelation
// 只要符合条件就需要设置为空
// 只要符合条件就需要设置为空
// 因为前端指挥在半价行、赠品行上打标
// 因为前端指挥在半价行、赠品行上打标
// 前端是从商品活动信息中查找活动,在商品列表中找商品
// 前端是从商品活动信息中查找活动,在商品列表中找商品
ApiLog
.
info
(
"coco算行,gifeProductIds,product,flag"
,
gifeProductIds
,
product
,(
gifeProductIds
.
contains
(
product
.
getGoodsId
())
||
!
Objects
.
equals
(
num
,
0
)));
if
(
gifeProductIds
.
contains
(
product
.
getGoodsId
())
||
!
Objects
.
equals
(
num
,
0
)){
if
(
gifeProductIds
.
contains
(
product
.
getGoodsId
())
||
!
Objects
.
equals
(
num
,
0
)){
product
.
setGoodsId
(
null
);
product
.
setGoodsId
(
null
);
}
}
...
...
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