套餐可选商品空键位

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

@@ -533,6 +533,9 @@ public class ShoppingCartConvertAdapter {
         List<ValidateSkuProductType> result = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(productComboList)) {
             for (com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoods.ComboxGoods comboxGoods : productComboList) {
+                if("0".equals(comboxGoods.getGoodsId())){
+                    continue;
+                }
                 ValidateSkuProductType validateSkuProductType = new ValidateSkuProductType();
                 validateSkuProductType.setProductId(StringUtils.isNotEmpty(comboxGoods.getSpuId()) ? comboxGoods.getSpuId() : comboxGoods.getSkuId());
                 validateSkuProductType.setSkuId(comboxGoods.getSkuId());
@@ -659,7 +662,9 @@ public class ShoppingCartConvertAdapter {
      * @return
      */
     private void updateComboxGoodsInfoForMCoffee(com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoods.ComboxGoods comboxGoods, ProductBeanDTO parentProductBean, boolean isComboxGoods) {
-
+        if("0".equals(comboxGoods.getGoodsId())){
+            return;
+        }
         ProductBeanDTO.ProductComboType productComboType = new ProductBeanDTO.ProductComboType();
         ProductBeanDTO.ProductGroupType.GroupDetailType groupDetailType = new ProductBeanDTO.ProductGroupType.GroupDetailType();
         if (isComboxGoods) {

shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ComboxGoodsRequestVo.java

@@ -30,6 +30,11 @@ public class ComboxGoodsRequestVo {
      * 商品组Id
      */
     private String productGroupId;
+
+    /**
+     * 麦咖啡空键位
+     */
+    private String emptyKey;
     /**
      * 商品额外的属性
      */

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

@@ -1037,6 +1037,20 @@ public class ShoppingCartMCoffeeServiceImpl {
                 productCombox.setExtra(vo.getExtra());
                 productCombox.setSpecialExtra(vo.getSpecialExtra());
                 productCombox.setProductGroupId(StringUtils.isEmpty(vo.getProductGroupId()) ? null : Long.parseLong(vo.getProductGroupId()));
+                if(StringUtils.isNotEmpty(vo.getEmptyKey())){
+                    productCombox.setGoodsId("0");
+                    productCombox.setSkuId("0");
+                    productCombox.setSpuId("0");
+                    productCombox.setCustomerCode(vo.getEmptyKey());
+                    productCombox.setName("无");
+                    productCombox.setSpuName("无");
+                    productCombox.setSkuName("无");
+                    productCombox.setFinalPrice(0L);
+                    productCombox.setOriginalPrice(0L);
+                    productCombox.setOriginalAmount(0L);
+                    productCombox.setAmount(0L);
+                    productCombox.setQty(1);
+                }
                 //加料商品集
                 if (CollectionUtils.isNotEmpty(vo.getProductMaterialList())) {
                     List<CartGoods.MaterialGoods> comboxMaterialGoodsList = new ArrayList<>();

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

@@ -376,6 +376,9 @@ public class CalculationServiceImpl {
         //可选搭配
         if (cartGoods != null && CollectionUtils.isNotEmpty(cartGoods.getProductGroupList())) {
             for (CartGoods.ComboxGoods materialGoods : cartGoods.getProductGroupList()) {
+                if("0".equals(materialGoods.getGoodsId())){
+                    continue;
+                }
                 ActivityCalculationDiscountRequestDto.CalculationDiscountGoods.Material material = new ActivityCalculationDiscountRequestDto.CalculationDiscountGoods.Material();
                 material.setType(2);
                 material.setGoodsId(materialGoods.getGoodsId());