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
8ce0a122
Commit
8ce0a122
authored
Nov 24, 2020
by
xiaoer.li@freemud.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
c68750a7
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/CalculationSharingDiscountService.java
+2
-2
No files found.
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/CalculationSharingDiscountService.java
View file @
8ce0a122
...
...
@@ -210,13 +210,13 @@ public class CalculationSharingDiscountService {
*/
private
void
setCommonDiscountGoods
(
List
<
CalculationSharingDiscountRequestDto
.
CalculationDiscountGoods
>
calculationDiscountGoodsList
,
CartGoods
cartGoods
)
{
log
.
info
(
"setCommonDiscountGoods:{}"
,
JSON
.
toJSONString
(
cartGoods
));
CalculationSharingDiscountRequestDto
.
CalculationDiscountGoods
calculationDiscountGoods
=
new
CalculationSharingDiscountRequestDto
.
CalculationDiscountGoods
();
calculationDiscountGoods
.
setGoodsId
(
cartGoods
.
getGoodsId
());
calculationDiscountGoods
.
setCartGoodsUid
(
cartGoods
.
getCartGoodsUid
());
calculationDiscountGoods
.
setGoodsQuantity
(
cartGoods
.
getQty
());
//if (cartGoods.getGoodsType().equals(GoodsTypeEnum.SET_MEAL_GOODS))
if
(
CollectionUtils
.
isNotEmpty
(
cartGoods
.
getProduct
Combo
List
())
||
CollectionUtils
.
isNotEmpty
(
cartGoods
.
getProductComboList
()))
{
if
(
CollectionUtils
.
isNotEmpty
(
cartGoods
.
getProduct
Group
List
())
||
CollectionUtils
.
isNotEmpty
(
cartGoods
.
getProductComboList
()))
{
calculationDiscountGoods
.
setOriginalPrice
(
cartGoods
.
getFinalPrice
()!=
null
?
cartGoods
.
getFinalPrice
()
:
cartGoods
.
getOriginalPrice
());
}
else
{
...
...
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