Merge branch 'feature/20200915_麦咖啡p2v3活动入机增加TENDERID字段' into develop

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -1840,7 +1840,11 @@ public class OrderAdapter {
                 // 套餐商品设置子商品节点
                 if (ObjectUtils.equals(ProductTypeEnum.SETMEAL_PRODUCT.getCode(), productBean.getProductType()) || ObjectUtils.equals(ProductTypeEnum.SETMEAL_UPPRICE_PRODUCT.getCode(), productBean.getProductType())) {
                     List<ProductVo> setMealProducts = new ArrayList<>();
-                    productBean.getComboProduct().forEach(product -> setMealProducts.add(convent2ProductVo(product)));
+                    productBean.getComboProduct().forEach(product -> {
+                        if(!"无".equals(product.getSpecificationName())) {
+                            setMealProducts.add(convent2ProductVo(product));
+                        }
+                    });
                     productVo.setSetMealProducts(setMealProducts);
                 }
                 if (ObjectUtils.equals(ProductTypeEnum.MATERIAL_PRODUCT.getCode(), productBean.getProductType())) {