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

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

@@ -2166,21 +2166,22 @@ public class OrderAdapter {
     }
 
     public CreateOrderProductRequest convent2MCCafeOrderProduct(ShoppingCartGoodsDto.CartGoodsDetailDto cartGoodsDetailDto) {
-        CreateOrderProductRequest createOrderProductDemoDto = convent2MCCafeOrderProductDemo(cartGoodsDetailDto, 0, cartGoodsDetailDto.getProductType());
+        CreateOrderProductRequest createOrderProductDemoDto = convent2MCCafeOrderProductDemo(cartGoodsDetailDto, cartGoodsDetailDto.getProductType());
         if(cartGoodsDetailDto.getProductType() != null) {
             if(cartGoodsDetailDto.getProductType() == ProductType.SETMEALPRODUCT.getCode()
                     || cartGoodsDetailDto.getProductType() == ProductType.SETMEALPRODUCT_UPPRICE.getCode()) {
+                createOrderProductDemoDto.setPrice(0l);
                 //套餐
                 List<CreateOrderProductRequest> comboProducts = new ArrayList<>();
                 cartGoodsDetailDto.getComboProducts().forEach(product -> {
-                    CreateOrderProductRequest createOrderComboProduct = convent2MCCafeOrderProductDemo(product, product.getOriginalPrice(), cartGoodsDetailDto.getProductType());
+                    CreateOrderProductRequest createOrderComboProduct = convent2MCCafeOrderProductDemo(product, product.getProductType());
                     comboProducts.add(createOrderComboProduct);
                     if(CollectionUtils.isNotEmpty(product.getMaterialList())) {
                         //加料商品
                         List<CreateOrderProductRequest> materialProducts = new ArrayList<>();
                         product.getMaterialList().forEach(cartMaterial -> {
                             product.setProductType(ProductType.MATERIALPRODUCT_UPPRICE.getCode());
-                            materialProducts.add(convent2MCCafeOrderProductDemo(cartMaterial, cartMaterial.getOriginalPrice(), ProductType.LITTLE_MATERIAL_PRODUCT.getCode()));
+                            materialProducts.add(convent2MCCafeOrderProductDemo(cartMaterial, ProductType.LITTLE_MATERIAL_PRODUCT.getCode()));
                         });
                         createOrderComboProduct.setMaterialProduct(materialProducts);
                     }
@@ -2191,7 +2192,7 @@ public class OrderAdapter {
                 List<CreateOrderProductRequest> materialProducts = new ArrayList<>();
                 cartGoodsDetailDto.getMaterialList().forEach(product -> {
                     product.setProductType(ProductType.MATERIALPRODUCT_UPPRICE.getCode());
-                    materialProducts.add(convent2MCCafeOrderProductDemo(product, product.getOriginalPrice(), ProductType.LITTLE_MATERIAL_PRODUCT.getCode()));
+                    materialProducts.add(convent2MCCafeOrderProductDemo(product, ProductType.LITTLE_MATERIAL_PRODUCT.getCode()));
                 });
                 createOrderProductDemoDto.setMaterialProduct(materialProducts);
             }
@@ -2259,13 +2260,13 @@ public class OrderAdapter {
         return createOrderProductDemoDto;
     }
 
-    public CreateOrderProductRequest convent2MCCafeOrderProductDemo(ShoppingCartGoodsDto.CartGoodsDetailDto cartGoodsDetailDto, long price, Integer productType) {
+    public CreateOrderProductRequest convent2MCCafeOrderProductDemo(ShoppingCartGoodsDto.CartGoodsDetailDto cartGoodsDetailDto, Integer productType) {
         CreateOrderProductRequest createOrderProductDemoDto = new CreateOrderProductRequest();
         createOrderProductDemoDto.setProductId(cartGoodsDetailDto.getSpuId());
         createOrderProductDemoDto.setProductName(cartGoodsDetailDto.getSpuName());
         createOrderProductDemoDto.setSpecification(cartGoodsDetailDto.getSkuId());
         createOrderProductDemoDto.setSpecificationName(cartGoodsDetailDto.getSkuName());
-        createOrderProductDemoDto.setPrice(price);
+        createOrderProductDemoDto.setPrice(cartGoodsDetailDto.getOriginalPrice());
         createOrderProductDemoDto.setSalePrice(cartGoodsDetailDto.getOriginalPrice());
         createOrderProductDemoDto.setTotalDiscountAmount(cartGoodsDetailDto.getTotalDiscountAmount() == null ? 0 : cartGoodsDetailDto.getTotalDiscountAmount().longValue());
         createOrderProductDemoDto.setNumber(cartGoodsDetailDto.getQty());
@@ -2286,7 +2287,7 @@ public class OrderAdapter {
         createOrderProductDemoDto.setTaxId(cartGoodsDetailDto.getTaxId());
         createOrderProductDemoDto.setClassificationId(cartGoodsDetailDto.getClassificationId());
         createOrderProductDemoDto.setClassificationName(cartGoodsDetailDto.getClassificationName());
-        if(CollectionUtils.isNotEmpty(cartGoodsDetailDto.getExtraList())) {
+        if(CollectionUtils.isNotEmpty(cartGoodsDetailDto.getSpecialExtra())) {
             createOrderProductDemoDto.setSpecialCodes(cartGoodsDetailDto.getExtraList().stream().map(ShoppingCartGoodsDto.CartGoodsDetailDto.CartGoodsExtra::getSpecialCode).collect(Collectors.toList()));
         }
         return createOrderProductDemoDto;

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

@@ -210,6 +210,11 @@ public class ShoppingCartGoodsDto {
          * 配料或属性
          */
         private List<CartGoodsDetailDto.CartGoodsExtra> extraList = new ArrayList<>(0);
+
+        /**
+         * 配料或属性
+         */
+        private List<CartGoodsDetailDto.CartGoodsExtra> specialExtra = new ArrayList<>(0);
         /**
          * 商品行享受的促销活动
          */