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
75c1ee68
Commit
75c1ee68
authored
Jul 21, 2020
by
xiaoer.li@freemud.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
去掉赠品max判断
parent
a9aee4e6
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
7 deletions
+7
-7
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/BuySendPromotionService.java
+7
-7
No files found.
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/BuySendPromotionService.java
View file @
75c1ee68
...
...
@@ -81,11 +81,11 @@ public class BuySendPromotionService implements IPromotionService {
//Todo
List
<
String
>
activitySpuIds
=
new
ArrayList
<>();
Map
<
String
,
ActivityCalculationDiscountResponseDto
.
CalculationDiscountResult
.
SendActivity
.
SendGoods
>
sendGoodsMap
=
new
HashMap
<>();
Map
<
String
,
Integer
>
maxNums
=
new
HashMap
<>();
//
Map<String, Integer> maxNums = new HashMap<>();
for
(
ActivityCalculationDiscountResponseDto
.
CalculationDiscountResult
.
SendActivity
activityList
:
sendActivityLists
)
{
for
(
ActivityCalculationDiscountResponseDto
.
CalculationDiscountResult
.
SendActivity
.
SendGoods
sendGood
:
activityList
.
getSendGoods
())
{
sendGoodsMap
.
put
(
sendGood
.
getGoodsId
(),
sendGood
);
maxNums
.
put
(
sendGood
.
getGoodsId
(),
activityList
.
getMaxNum
());
//
maxNums.put(sendGood.getGoodsId(), activityList.getMaxNum());
activitySpuIds
.
add
(
sendGood
.
getGoodsId
());
}
}
...
...
@@ -130,11 +130,11 @@ public class BuySendPromotionService implements IPromotionService {
}
*/
for
(
CartGoods
cartGoods
:
newCartGoodsList
)
{
Integer
max
=
maxNums
.
get
(
cartGoods
.
getGoodsId
());
//if (max <= 0) continue;
if
(
max
<
cartGoods
.
getQty
())
{
cartGoods
.
setQty
(
max
);
}
//
Integer max = maxNums.get(cartGoods.getGoodsId());
//
//
if (max <= 0) continue;
//
if (max < cartGoods.getQty()) {
//
cartGoods.setQty(max);
//
}
givePackAmount
=
givePackAmount
+
cartGoods
.
getPackPrice
()
*
cartGoods
.
getQty
();
giveTotalAmount
=
giveTotalAmount
+
cartGoods
.
getOriginalPrice
()
*
cartGoods
.
getQty
();
cartGoods
.
setOriginalAmount
(
cartGoods
.
getOriginalPrice
()
*
cartGoods
.
getQty
());
...
...
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