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

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

@@ -2240,7 +2240,9 @@ public class OrderAdapter {
                     }
                 });
                 createOrderProductDemoDto.setComboProduct(comboProducts);
-            } else if(CollectionUtils.isNotEmpty(cartGoodsDetailDto.getMaterialList())) {
+            }
+        }
+        if(CollectionUtils.isNotEmpty(cartGoodsDetailDto.getMaterialList())) {
             //加料商品
             createOrderProductDemoDto.setProductType(ProductType.MATERIALPRODUCT_UPPRICE.getCode());
             List<CreateOrderProductRequest> materialProducts = new ArrayList<>();
@@ -2249,7 +2251,6 @@ public class OrderAdapter {
             });
             createOrderProductDemoDto.setMaterialProduct(materialProducts);
         }
-        }
         return createOrderProductDemoDto;
     }