清空购物车

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/FullSubtractionActivityServiceImpl.java

@@ -216,6 +216,7 @@ public class FullSubtractionActivityServiceImpl {
             // 没有加入购物车
             if (calculationDiscountResult == null) {
                 List<BenefitBeanDto> benefitBeanDtos = activityResponseDto.getBenefits();
+                ArrayList<ActivityList> arrayList = new ArrayList();
                 //BenefitBeanDto benefitBeanDto = benefitBeanDtos.get(0);
                 BenefitBeanDto benefitBeanDto = null;
                 // 每满减
@@ -236,6 +237,7 @@ public class FullSubtractionActivityServiceImpl {
                     notInShopping.setDeduct(WebUtil.formatAmount(benefitBeanDto.getDiscountAmount() * 1.00 / 100).toString());
                     notInShopping.setMaxDeduct(WebUtil.formatAmount(activityResponseDto.getMaxMoney() * 1.00 / 100).toString());
                     activityList.add(notInShopping);
+                    arrayList.add(notInShopping);
                 }
                 if (Objects.equals(ActivityTypeEnum.TYPE_12.getCode(), activityResponseDto.getActivityType())) {
                     benefitBeanDto = benefitBeanDtos.get(0);
@@ -258,6 +260,7 @@ public class FullSubtractionActivityServiceImpl {
                         notInShopping.setSatisfy(WebUtil.formatAmount(benefitBeanDto.getThresholdAmount() * 1.00 / 100).toString());
                         notInShopping.setDeduct(WebUtil.formatAmount(benefitBeanDto.getDiscountAmount() * 1.00 / 100).toString());
                         activityList.add(notInShopping);
+                        arrayList.add(notInShopping);
                     }
                 }
                 if (Objects.equals(ActivityTypeEnum.TYPE_230.getCode(), activityResponseDto.getActivityType())) {
@@ -288,10 +291,9 @@ public class FullSubtractionActivityServiceImpl {
                         notInShopping.setSends(sends);
                         break;
                     }
-                    ArrayList<ActivityList> arrayList = new ArrayList();
                     arrayList.add(notInShopping);
-                    promotionMessageDto.setActivityList(arrayList);
                 }
+                promotionMessageDto.setActivityList(arrayList);
             }
             // 有商品在购物车
             else {