买m赠n券

shopping-cart-application-service/src/main/java/cn/freemud/enums/CouponTypeEnum.java

@@ -6,7 +6,8 @@ public enum CouponTypeEnum {
     TYPE_1(1, "代金券"),
     TYPE_3(3, "折扣券"),
     TYPE_4(4, "换购券"),
-    TYPE_5(5, "配送券");
+    TYPE_5(5, "配送券"),
+    TYPE_7(7, "买M赠N券");
 
     private Integer code;
 

shopping-cart-application-service/src/main/java/cn/freemud/enums/GoodsTypeEnum.java

@@ -24,6 +24,7 @@ public enum GoodsTypeEnum {
     REDUCE_PRICE_GOODS(6,"超值加购商品"),
     ALL_COUPON_GOODS(8, "万能券商品"),
     VIRTUAL_GOODS(9,"虚拟商品"),
+    BUY_M_SEND_N_COUPON(10, "买M送N券"),
     MATERIAL(88, "有加料的商品"),
     EXCEPTION_GOODS(99, "异常商品:商品菜单变化导致和购物车不商品匹配");
     private Integer goodsType;

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

@@ -924,6 +924,16 @@ public class CouponServiceImpl implements CouponService {
                     break;
                 }
             }
+            if(CouponTypeEnum.TYPE_7.getCode().equals(detail.getType())){
+                for (GetCouponDetailResponseDto.ActiveProduct activeProduct : detail.getActiveProduct()) {
+                    if (goodsId.equals(activeProduct.getProductIdPartner())) {
+                        productValid = true;
+                        couponActivityDetail = detail;
+                        couponType = CouponTypeEnum.TYPE_7.getCode();
+                        break;
+                    }
+                }
+            }
         }
         //检查商品是否有效
         if (!productValid) {

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

@@ -2024,7 +2024,9 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         // 设置商品类型为商品券
         if (CouponTypeEnum.TYPE_4.getCode().equals(couponProductDto.getType())) {
             cartGoods.setGoodsType(GoodsTypeEnum.HG_COUPON_GOODS.getGoodsType());
-        } else {
+        }else if (CouponTypeEnum.TYPE_7.getCode().equals(couponProductDto.getType())) {
+            cartGoods.setGoodsType(GoodsTypeEnum.BUY_M_SEND_N_COUPON.getGoodsType());
+        }else {
             cartGoods.setGoodsType(GoodsTypeEnum.COUPON_GOODS.getGoodsType());
         }
         if (StringUtils.isBlank(addShoppingCartGoodsRequestVo.getCouponCode())) { //老商品券