麦咖啡套餐多规格合代码

assortment-ordercenter-sdk/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>assortment-ordercenter-sdk</artifactId>
-    <version>2.10.0-RELEASE</version>
+    <version>2.0.11-RELEASE</version>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>ordercenter-sdk</artifactId>
-            <version>1.3.15.RELEASE</version>
+            <version>1.3.16.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

assortment-ordercenter-sdk/readme.md

@@ -73,4 +73,5 @@
         | 2.0.7-RELEASE | 加料商品开发 | 梁崇福 | 2020-08-24 |
         | 2.0.8-RELEASE | 订单渠道映射调整 | 李小二 | 2020-08-24 |
         | 2.0.9-RELEASE | 麦咖啡 | 徐康 | 2020-09-07 |
-        | 2.10.0-RELEASE | 停车场订单 | 张志恒 | 2020-09-28 |
+        | 2.10.0-RELEASE | 停车场订单 | 张志恒 | 2020-09-28 |
\ No newline at end of file
+        | 2.0.11-RELEASE | 麦咖啡多规格 | 徐康 | 2020-10-09 |
\ No newline at end of file

order-application-service/pom.xml

@@ -40,7 +40,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-ordercenter-sdk</artifactId>
-            <version>2.10.0-RELEASE</version>
+            <version>2.0.11-RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

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

@@ -2198,30 +2198,6 @@ public class OrderAdapter {
         return createOrderProductDemoDto;
     }
 
-    public CreateOrderProductRequest convent2MCCafeOrderProduct(ShoppingCartGoodsDto.CartGoodsDetailDto cartGoodsDetailDto) {
-        CreateOrderProductRequest createOrderProductDemoDto = convent2MCCafeOrderProductDemo(cartGoodsDetailDto);
-        //套餐
-        if (cartGoodsDetailDto.getProductType() != null && (cartGoodsDetailDto.getProductType() == ProductType.SETMEALPRODUCT.getCode() || cartGoodsDetailDto.getProductType() == ProductType.SETMEALPRODUCT_UPPRICE.getCode())) {
-            List<CreateOrderProductRequest> comboProducts = new ArrayList<>();
-            cartGoodsDetailDto.getComboProducts().forEach(product -> {
-                comboProducts.add(convent2OrderProductDemo(product));
-            });
-            createOrderProductDemoDto.setComboProduct(comboProducts);
-        }
-        //加料商品
-        if (cartGoodsDetailDto.getProductType() != null && (cartGoodsDetailDto.getProductType() == ProductType.MATERIALPRODUCT_UPPRICE.getCode())) {
-            List<CreateOrderProductRequest> materialProducts = new ArrayList<>();
-            cartGoodsDetailDto.getMaterialList().forEach(product -> {
-                materialProducts.add(convent2OrderProductMaterial(product));
-            });
-            createOrderProductDemoDto.setMaterialProduct(materialProducts);
-        }
-
-
-        createOrderProductDemoDto.setProductType(cartGoodsDetailDto.getProductType());
-        return createOrderProductDemoDto;
-    }
-
     private CreateOrderProductRequest convent2OrderProductMaterial(ShoppingCartGoodsDto.CartGoodsDetailDto cartGoodsDetailDto) {
         CreateOrderProductRequest createOrderProductDemoDto = new CreateOrderProductRequest();
         createOrderProductDemoDto.setProductId(cartGoodsDetailDto.getSpuId());

ordercenter-sdk/pom.xml

@@ -8,7 +8,7 @@
         <version>1.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <version>1.3.15.RELEASE</version>
+    <version>1.3.16.RELEASE</version>
     <artifactId>ordercenter-sdk</artifactId>
 
     <dependencies>

ordercenter-sdk/readme.md

@@ -49,3 +49,4 @@
 | 1.3.13.RELEASE | 麦咖啡 | 徐康 | 2020-09-07 |
 | 1.3.14.RELEASE | 修复查询订单时transId为null的问题 | 肖家炜 | 2020-09-08 |
 | 1.3.15.RELEASE | 停车场订单撤单 | 张志恒 | 2020-09-28 |
+| 1.3.16.RELEASE | 麦咖啡多规格 | 徐康 | 2020-10-09 |