买3赠1券

shopping-cart-application-service/src/main/java/cn/freemud/adapter/ShoppingCartMccafeAdapter.java

@@ -176,8 +176,6 @@ public class ShoppingCartMccafeAdapter {
             cartGoodsDetailDto.setProductType(ProductType.SETMEAL.getCode());
         } else if(GoodsTypeEnum.VIRTUAL_GOODS.getGoodsType().equals(cartGoods.getGoodsType())){
             cartGoodsDetailDto.setProductType(ProductType.VIRTUAL_PRODUCT.getCode());
-        }else if (cartGoods.isWeightType()) {
-            cartGoodsDetailDto.setProductType(ProductType.WEIGHT_PRODUCT.getCode());
         }
 
         //小料

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

@@ -4,6 +4,7 @@ import cn.freemud.entities.dto.ActivityCalculationDiscountResponseDto;
 import cn.freemud.entities.dto.OrderProductAddInfo;
 import cn.freemud.entities.dto.activity.ActivityDiscountsDto;
 import cn.freemud.entities.dto.activity.ShareDiscountActivityDto;
+import cn.freemud.entities.vo.B3S1CouponGoodsInfoVo;
 import cn.freemud.entities.vo.CartGoods;
 import cn.freemud.entities.vo.MonthCardVo;
 import cn.freemud.entities.vo.SubtractStockVO;
@@ -273,6 +274,10 @@ public class ShoppingCartGoodsDto {
          */
         private int isMonthCard;
         /**
+         * 是否是买3赠1券商品
+         */
+        private int isB3S1Coupon = 0;
+        /**
          * 是否为种子券商品 1:是；0:否
          */
         private int isSeedCouponGoods;
@@ -281,6 +286,10 @@ public class ShoppingCartGoodsDto {
          */
         private MonthCardVo monthCardInfo;
         /**
+         * 买3赠1券信息
+         */
+        private B3S1CouponGoodsInfoVo b3S1CouponGoodsInfo;
+        /**
          * 商品货号
          */
         private String productCode;

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

@@ -237,10 +237,10 @@ public class ShoppingCartMCoffeeServiceImpl {
                     cartGoods.get().getB3S1CouponGoodsInfo().getCardCodeSet().add(addCartGoods.getCouponCode());
                 } else {
                     B3S1CouponGoodsInfoVo b3S1CouponGoodsInfoVo = new B3S1CouponGoodsInfoVo();
+                    addCartGoods.setB3S1CouponGoodsInfo(b3S1CouponGoodsInfoVo);
                     Set<String> set = new HashSet<>();
                     b3S1CouponGoodsInfoVo.setCardCodeSet(set);
-                    addCartGoods.setB3S1CouponGoodsInfo(b3S1CouponGoodsInfoVo);
-                    set.add(addCartGoods.getCouponCode());
+                    set.add(addShoppingCartGoodsRequestVo.getCouponCode());
                     oldCartGoodsList.add(addCartGoods);
                 }
                 // 促销活动的优惠金额计算

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

@@ -224,19 +224,6 @@ public class CalculationServiceImpl {
             }
         }
 
-        //订单级别券优惠
-//        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.getActivityName());
-//                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());