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
e3af43f5
Commit
e3af43f5
authored
Mar 15, 2021
by
chongfu.liang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
2a0ae096
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
1 deletions
+4
-1
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/CalculationSharingDiscountService.java
+0
-1
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/promotion/GiftSharingService.java
+4
-0
No files found.
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/CalculationSharingDiscountService.java
View file @
e3af43f5
...
@@ -217,7 +217,6 @@ public class CalculationSharingDiscountService {
...
@@ -217,7 +217,6 @@ public class CalculationSharingDiscountService {
cartGoods
.
setActivityType
(
ActivityTypeEnum
.
TYPE_104
.
getCode
());
cartGoods
.
setActivityType
(
ActivityTypeEnum
.
TYPE_104
.
getCode
());
cartGoods
.
setActualQty
(
cartGoods
.
getQty
());
cartGoods
.
setActualQty
(
cartGoods
.
getQty
());
cartGoods
.
setQty
(
qtyMap
.
get
(
key
));
cartGoods
.
setQty
(
qtyMap
.
get
(
key
));
if
(
ObjectUtils
.
equals
(
cartGoods
.
getQty
(),
0
)){
if
(
ObjectUtils
.
equals
(
cartGoods
.
getQty
(),
0
)){
CalculationSharingDiscountResponseDto
.
CalculationDiscountResult
.
Goods
goods
=
sharingDiscountResponseDto
.
getResult
().
getGoods
().
stream
().
filter
(
p
->
cartGoods
.
getCartGoodsUid
().
equals
(
p
.
getOriginalGoodsUid
())).
findFirst
().
orElse
(
null
);
CalculationSharingDiscountResponseDto
.
CalculationDiscountResult
.
Goods
goods
=
sharingDiscountResponseDto
.
getResult
().
getGoods
().
stream
().
filter
(
p
->
cartGoods
.
getCartGoodsUid
().
equals
(
p
.
getOriginalGoodsUid
())).
findFirst
().
orElse
(
null
);
if
(
goods
!=
null
){
if
(
goods
!=
null
){
...
...
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/promotion/GiftSharingService.java
View file @
e3af43f5
...
@@ -163,6 +163,10 @@ public class GiftSharingService {
...
@@ -163,6 +163,10 @@ public class GiftSharingService {
sendGoods
.
setDiscounts
(
goodsDiscounts
);
sendGoods
.
setDiscounts
(
goodsDiscounts
);
goodsList
.
add
(
sendGoods
);
goodsList
.
add
(
sendGoods
);
sendQty
+=
discount
.
getActualGoodsNumber
();
sendQty
+=
discount
.
getActualGoodsNumber
();
if
(
goods
.
getDiscountAmount
()
!=
null
&&
discount
.
getDiscount
()
!=
null
){
goods
.
setDiscountAmount
(
goods
.
getDiscountAmount
()
-
discount
.
getDiscount
());
}
}
}
qtyMap
.
put
(
goods
.
getCartGoodsUid
(),
goods
.
getGoodsQuantity
()
-
sendQty
);
qtyMap
.
put
(
goods
.
getCartGoodsUid
(),
goods
.
getGoodsQuantity
()
-
sendQty
);
}
}
...
...
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