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
4f8f9061
Commit
4f8f9061
authored
Aug 26, 2021
by
查志伟
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
去掉 修复免单活动时,C端展示问题(促销问题)
parent
2dea841c
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
6 deletions
+0
-6
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/CalculationCommonService.java
+0
-6
No files found.
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/CalculationCommonService.java
View file @
4f8f9061
...
@@ -135,12 +135,6 @@ public class CalculationCommonService {
...
@@ -135,12 +135,6 @@ public class CalculationCommonService {
cartGoods
.
setAmount
(
find
.
getRealAmount
());
cartGoods
.
setAmount
(
find
.
getRealAmount
());
cartGoods
.
setCurrentCouponDiscount
(
0
);
cartGoods
.
setCurrentCouponDiscount
(
0
);
cartGoods
.
setFinalPrice
(
find
.
getNowPrice
());
cartGoods
.
setFinalPrice
(
find
.
getNowPrice
());
// fix 免单情况,C端展示问题
int
activityNumber
=
0
;
for
(
CalculationSharingDiscountResponseDto
.
CalculationDiscountResult
.
Goods
.
GoodsDiscount
discount
:
find
.
getDiscounts
())
{
activityNumber
+=
discount
.
getActualGoodsNumber
();
}
cartGoods
.
setActivityNumber
(
activityNumber
);
if
(
CollectionUtils
.
isNotEmpty
(
find
.
getDiscounts
())){
if
(
CollectionUtils
.
isNotEmpty
(
find
.
getDiscounts
())){
CalculationSharingDiscountResponseDto
.
CalculationDiscountResult
.
Goods
.
GoodsDiscount
goodsDiscount
=
find
.
getDiscounts
().
stream
()
CalculationSharingDiscountResponseDto
.
CalculationDiscountResult
.
Goods
.
GoodsDiscount
goodsDiscount
=
find
.
getDiscounts
().
stream
()
.
filter
(
p
->
p
.
getActivityCode
().
equals
(
couponCode
)).
findFirst
().
orElse
(
null
);
.
filter
(
p
->
p
.
getActivityCode
().
equals
(
couponCode
)).
findFirst
().
orElse
(
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