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
a9aee4e6
Commit
a9aee4e6
authored
Jul 21, 2020
by
xiaoer.li@freemud.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixbug 买一赠一判断
parent
5cd4c340
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/BuySendPromotionService.java
+3
-3
No files found.
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/BuySendPromotionService.java
View file @
a9aee4e6
...
...
@@ -249,12 +249,12 @@ public class BuySendPromotionService implements IPromotionService {
*/
private
void
putNewCartGoodsList
(
Map
<
String
,
ActivityCalculationDiscountResponseDto
.
CalculationDiscountResult
.
SendActivity
.
SendGoods
>
sendGoodsMap
,
CartGoods
cartGood
,
List
<
CartGoods
>
newCartGoodsList
,
boolean
manyOrSingle
)
{
if
(
sendGoodsMap
.
get
(
cartGood
.
get
Spu
Id
())
==
null
)
{
if
(
sendGoodsMap
.
get
(
cartGood
.
get
Goods
Id
())
==
null
)
{
return
;
}
if
(
manyOrSingle
)
{
// 多规格
if
(!
Objects
.
equals
(
sendGoodsMap
.
get
(
cartGood
.
getS
p
uId
()).
getGoodsId
(),
cartGood
.
getSkuId
()))
{
if
(!
Objects
.
equals
(
sendGoodsMap
.
get
(
cartGood
.
getS
k
uId
()).
getGoodsId
(),
cartGood
.
getSkuId
()))
{
return
;
}
}
else
{
...
...
@@ -264,7 +264,7 @@ public class BuySendPromotionService implements IPromotionService {
return
;
}
}
ActivityCalculationDiscountResponseDto
.
CalculationDiscountResult
.
SendActivity
.
SendGoods
sendGoods
=
sendGoodsMap
.
get
(
cartGood
.
get
Spu
Id
());
ActivityCalculationDiscountResponseDto
.
CalculationDiscountResult
.
SendActivity
.
SendGoods
sendGoods
=
sendGoodsMap
.
get
(
cartGood
.
get
Goods
Id
());
CartGoods
cartGoods
=
shoppingCartConvertAdapter
.
convent2CartGoods
(
cartGood
,
sendGoods
.
getNowPrice
());
cartGoods
.
setClassificationId
(
cartGood
.
getClassificationId
());
cartGoods
.
setClassificationName
(
cartGood
.
getClassificationName
());
...
...
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