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
5843e8d3
Commit
5843e8d3
authored
Mar 08, 2021
by
xiaoer.li@freemud.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
modify:空购物车
parent
015a53e8
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/FullPromotionService.java
+2
-2
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/FullSubtractionActivityServiceImpl.java
+2
-2
No files found.
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/FullPromotionService.java
View file @
5843e8d3
...
@@ -185,11 +185,11 @@ public class FullPromotionService implements IPromotionService {
...
@@ -185,11 +185,11 @@ public class FullPromotionService implements IPromotionService {
// 提示语:满5元可获赠奶茶*2,炸鸡*1
// 提示语:满5元可获赠奶茶*2,炸鸡*1
//阶梯满赠
//阶梯满赠
notInShopping
.
setSatisfy
(
WebUtil
.
formatAmount
(
benefitBeanDto
.
getThresholdAmount
()
*
1.00
/
100
).
toString
());
notInShopping
.
setSatisfy
(
WebUtil
.
formatAmount
(
benefitBeanDto
.
getThresholdAmount
()
*
1.00
/
100
).
toString
());
if
(
GiftTypeEnum
.
TYPE_1
.
equals
(
activityResponseDto
.
getActivitySubType
()))
{
if
(
GiftTypeEnum
.
TYPE_1
.
getType
().
equals
(
activityResponseDto
.
getActivitySubType
()))
{
notInShopping
.
setTipType
(
6
);
notInShopping
.
setTipType
(
6
);
}
}
//每满赠
//每满赠
else
if
(
GiftTypeEnum
.
TYPE_2
.
equals
(
activityResponseDto
.
getActivitySubType
()))
{
else
if
(
GiftTypeEnum
.
TYPE_2
.
getType
().
equals
(
activityResponseDto
.
getActivitySubType
()))
{
notInShopping
.
setTipType
(
7
);
notInShopping
.
setTipType
(
7
);
}
}
for
(
BenefitBeanDto
beanDto
:
benefitBeanDtos
)
{
for
(
BenefitBeanDto
beanDto
:
benefitBeanDtos
)
{
...
...
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/FullSubtractionActivityServiceImpl.java
View file @
5843e8d3
...
@@ -266,11 +266,11 @@ public class FullSubtractionActivityServiceImpl {
...
@@ -266,11 +266,11 @@ public class FullSubtractionActivityServiceImpl {
// 提示语:满5元可获赠奶茶*2,炸鸡*1
// 提示语:满5元可获赠奶茶*2,炸鸡*1
//阶梯满赠
//阶梯满赠
notInShopping
.
setSatisfy
(
WebUtil
.
formatAmount
(
benefitBeanDto
.
getThresholdAmount
()
*
1.00
/
100
).
toString
());
notInShopping
.
setSatisfy
(
WebUtil
.
formatAmount
(
benefitBeanDto
.
getThresholdAmount
()
*
1.00
/
100
).
toString
());
if
(
GiftTypeEnum
.
TYPE_1
.
equals
(
activityResponseDto
.
getActivitySubType
()))
{
if
(
GiftTypeEnum
.
TYPE_1
.
getType
().
equals
(
activityResponseDto
.
getActivitySubType
()))
{
notInShopping
.
setTipType
(
6
);
notInShopping
.
setTipType
(
6
);
}
}
//每满赠
//每满赠
else
if
(
GiftTypeEnum
.
TYPE_2
.
equals
(
activityResponseDto
.
getActivitySubType
()))
{
else
if
(
GiftTypeEnum
.
TYPE_2
.
getType
().
equals
(
activityResponseDto
.
getActivitySubType
()))
{
notInShopping
.
setTipType
(
7
);
notInShopping
.
setTipType
(
7
);
}
}
for
(
BenefitBeanDto
beanDto
:
benefitBeanDtos
)
{
for
(
BenefitBeanDto
beanDto
:
benefitBeanDtos
)
{
...
...
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