Commit 5843e8d3 by xiaoer.li@freemud.com

modify:空购物车

parent 015a53e8
...@@ -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) {
......
...@@ -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) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment