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
jenkins
order-group
Commits
6d07a8f8
Commit
6d07a8f8
authored
Dec 16, 2019
by
shuhu.hou@freemud.cn
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
套餐特价有份数限制,均摊翻倍不正确fixbug
parent
77fbc27e
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
1 deletions
+6
-1
shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/ActivityCalculationDiscountResponseDto.java
+4
-0
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/SetMealServiceImpl.java
+2
-1
No files found.
shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/ActivityCalculationDiscountResponseDto.java
View file @
6d07a8f8
...
@@ -197,6 +197,10 @@ public class ActivityCalculationDiscountResponseDto {
...
@@ -197,6 +197,10 @@ public class ActivityCalculationDiscountResponseDto {
* 活动类型
* 活动类型
*/
*/
private
Integer
type
;
private
Integer
type
;
/**
* 当前活动实际优惠的商品数量
*/
private
Integer
actualGoodsNumber
;
}
}
}
}
...
...
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/SetMealServiceImpl.java
View file @
6d07a8f8
...
@@ -138,7 +138,8 @@ public class SetMealServiceImpl implements IPromotionService {
...
@@ -138,7 +138,8 @@ public class SetMealServiceImpl implements IPromotionService {
return
""
;
return
""
;
}
}
if
(
numberMap
.
get
(
cartGoods
.
getGoodsId
())
==
null
)
{
if
(
numberMap
.
get
(
cartGoods
.
getGoodsId
())
==
null
)
{
numberMap
.
put
(
cartGoods
.
getGoodsId
(),
goodsMap
.
get
(
cartGoods
.
getGoodsId
()).
getActualGoodsNumber
());
int
actualGoodsNumber
=
goodsMap
.
get
(
cartGoods
.
getGoodsId
()).
getDiscounts
().
stream
().
mapToInt
(
ActivityCalculationDiscountResponseDto
.
CalculationDiscountResult
.
Goods
.
GoodsDiscount
::
getActualGoodsNumber
).
min
().
getAsInt
();
numberMap
.
put
(
cartGoods
.
getGoodsId
(),
actualGoodsNumber
);
}
}
// 可优惠数量
// 可优惠数量
Integer
number
=
numberMap
.
get
(
cartGoods
.
getGoodsId
());
Integer
number
=
numberMap
.
get
(
cartGoods
.
getGoodsId
());
...
...
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