Commit 06f64d32 by chongfu.liang

没有满减时

parent 1ffdd90e
...@@ -386,11 +386,12 @@ public abstract class AbstractAddGoodsService implements AddGoodsService { ...@@ -386,11 +386,12 @@ public abstract class AbstractAddGoodsService implements AddGoodsService {
ActivityBO activityBO = setMessageBO.getActivityBO(); ActivityBO activityBO = setMessageBO.getActivityBO();
List<ActivityList> activityList = null; List<ActivityList> activityList = null;
if (discountResult == null || CollectionUtils.isEmpty(discountResult.getGoods())) { if (discountResult == null || CollectionUtils.isEmpty(discountResult.getGoods())) {
if (activityBO != null && CollectionUtils.isNotEmpty(activityBO.getBenefits())) {
List<BenefitBeanBO> benefitBeanBOList = activityBO.getBenefits(); List<BenefitBeanBO> benefitBeanBOList = activityBO.getBenefits();
BenefitBeanBO benefitBeanBO = benefitBeanBOList.get(0); BenefitBeanBO benefitBeanBO = benefitBeanBOList.get(0);
//调用没有加入购物车的提示语的方法 //调用没有加入购物车的提示语的方法
activityList = setMessageNotInShoppingCart(messageBuilder, activityBO, benefitBeanBOList, benefitBeanBO); activityList = setMessageNotInShoppingCart(messageBuilder, activityBO, benefitBeanBOList, benefitBeanBO);
}
} else { } else {
//促销返回满减提示语 //促销返回满减提示语
List<CalculationDiscountBO.CalculationDiscountResult.ActivityPrompt> activityPrompts = discountResult.getActivityPrompts(); List<CalculationDiscountBO.CalculationDiscountResult.ActivityPrompt> activityPrompts = discountResult.getActivityPrompts();
......
...@@ -315,12 +315,12 @@ public class AbstractListCartGoodsService implements ListCartGoodsService { ...@@ -315,12 +315,12 @@ public class AbstractListCartGoodsService implements ListCartGoodsService {
ActivityBO activityBO = setMessageBO.getActivityBO(); ActivityBO activityBO = setMessageBO.getActivityBO();
List<ActivityList> activityList = null; List<ActivityList> activityList = null;
if (activityBO != null && (discountResult == null || CollectionUtils.isEmpty(discountResult.getGoods()))) { if (activityBO != null && (discountResult == null || CollectionUtils.isEmpty(discountResult.getGoods()))) {
if (activityBO != null && CollectionUtils.isNotEmpty(activityBO.getBenefits())) {
List<BenefitBeanBO> benefitBeanBOList = activityBO.getBenefits(); List<BenefitBeanBO> benefitBeanBOList = activityBO.getBenefits();
BenefitBeanBO benefitBeanBO = benefitBeanBOList.get(0); BenefitBeanBO benefitBeanBO = benefitBeanBOList.get(0);
//调用没有加入购物车的提示语的方法 //调用没有加入购物车的提示语的方法
activityList = setMessageNotInShoppingCart(messageBuilder, activityBO, benefitBeanBOList, benefitBeanBO); activityList = setMessageNotInShoppingCart(messageBuilder, activityBO, benefitBeanBOList, benefitBeanBO);
}
} }
//促销返回满减提示语 //促销返回满减提示语
List<CalculationDiscountBO.CalculationDiscountResult.ActivityPrompt> activityPrompts = null; List<CalculationDiscountBO.CalculationDiscountResult.ActivityPrompt> activityPrompts = null;
......
...@@ -350,12 +350,12 @@ public abstract class AbstractUpdateGoodsQtyService implements UpdateGoodsQtySer ...@@ -350,12 +350,12 @@ public abstract class AbstractUpdateGoodsQtyService implements UpdateGoodsQtySer
ActivityBO activityBO = setMessageBO.getActivityBO(); ActivityBO activityBO = setMessageBO.getActivityBO();
List<ActivityList> activityList = null; List<ActivityList> activityList = null;
if (discountResult == null || CollectionUtils.isEmpty(discountResult.getGoods())) { if (discountResult == null || CollectionUtils.isEmpty(discountResult.getGoods())) {
if (activityBO != null && CollectionUtils.isNotEmpty(activityBO.getBenefits())) {
List<BenefitBeanBO> benefitBeanBOList = activityBO.getBenefits(); List<BenefitBeanBO> benefitBeanBOList = activityBO.getBenefits();
BenefitBeanBO benefitBeanBO = benefitBeanBOList.get(0); BenefitBeanBO benefitBeanBO = benefitBeanBOList.get(0);
//调用没有加入购物车的提示语的方法 //调用没有加入购物车的提示语的方法
activityList = setMessageNotInShoppingCart(messageBuilder, activityBO, benefitBeanBOList, benefitBeanBO); activityList = setMessageNotInShoppingCart(messageBuilder, activityBO, benefitBeanBOList, benefitBeanBO);
}
} else { } else {
//促销返回满减提示语 //促销返回满减提示语
......
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