修改购物车数量为0修改

shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/ActivityCalculationDiscountResponseDto.java

@@ -290,6 +290,8 @@ public class ActivityCalculationDiscountResponseDto {
              * 优惠金额（单位分）
              */
             private Integer discountAmount;
+
+            private Integer activityType;
         }
 
         @Data

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

@@ -229,6 +229,7 @@ public class ShoppingCartMCoffeeServiceImpl {
 
         // check购物车中所有商品
         cartGoodsList = checkCartGoods(partnerId, storeId, orderType, menuType, shoppingCartGoodsResponseVo, cartGoodsList);
+
         // 重新存储最新购物车
         assortmentSdkService.setShoppingCart(partnerId, storeId, userId, cartGoodsList, sessionId, "", shoppingCartBaseService);
 
@@ -899,6 +900,9 @@ public class ShoppingCartMCoffeeServiceImpl {
     private List<CartGoods> checkCartGoods(String partnerId, String storeId, Integer orderType, String menuType,
                                            ShoppingCartGoodsBaseResponseVo shoppingCartGoodsResponseVo, List<CartGoods> cartGoodsList) {
 
+        //筛选数量不为0商品
+        cartGoodsList = cartGoodsList.stream().filter(cartGoods -> cartGoods.getQty() != 0).collect(Collectors.toList());
+
         //筛选非加购商品--加价购商品不校验是否在菜单，不调用validateShopProduct
         List<CartGoods> checkGoods = cartGoodsList.stream().filter(cartGoods -> cartGoods.getGoodsType() != GoodsTypeEnum.REDUCE_PRICE_GOODS.getGoodsType()).collect(Collectors.toList());
         //加价购商品

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CalculationServiceImpl.java

@@ -195,6 +195,19 @@ public class CalculationServiceImpl {
                 activityDiscountsDtos.add(activityDiscountsDto);
             }
         }
+
+        for (ActivityCalculationDiscountResponseDto.CalculationDiscountResult.CouponResults discount : calculationDiscountResult.getCouponDiscounts()) {
+            int discountAmount = (discount.getDiscountAmount() == null) ? 0 : discount.getDiscountAmount();
+            Integer discountType = discount.getActivityType();
+            if (discountType != null && discountAmount > 0) {
+                ActivityDiscountsDto activityDiscountsDto = new ActivityDiscountsDto();
+                activityDiscountsDto.setActivityCode(discount.getCouponCode());
+                activityDiscountsDto.setActivityName(discount.getCouponCode());
+                activityDiscountsDto.setActivityType(discountType);
+                activityDiscountsDto.setDiscountAmount(0 - discountAmount);
+                activityDiscountsDtos.add(activityDiscountsDto);
+            }
+        }
         //过滤出加价购
         List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Discount> addMoneyDiscounts = discounts.stream().filter(discount -> ActivityTypeEnum.TYPE_81.getCode().equals(discount.getType())).collect(Collectors.toList());
 
@@ -303,7 +316,7 @@ public class CalculationServiceImpl {
         if (storeInfo.getBizVO().getDeliveryPrice() == 0) {
             throw new ServiceException(ResponseResult.STORE_DELIVERY_AMOUNT_ERROR);
         }
-        Double deliveryPrice = storeInfo.getBizVO().getDeliveryPrice();
+        Double deliveryPrice = storeInfo.getBizVO().getDeliveryPrice()*100;
         deliveryAmount = deliveryPrice.longValue();
         return deliveryAmount;
     }