Merge branch 'feature/1.9.32-加料商品开发' into develop

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -751,12 +751,12 @@ public class OrderSdkAdapter {
                 List<OrderItemResp> comboProducts = orderItemList.stream().filter(item -> ObjectUtils.equals(partnerProductId, item.getParentProductId())).collect(Collectors.toList());
                 comboProducts.forEach(combo -> productBean.getComboProduct().add(getOldOrderProduct(orderSettlementResps, combo)));
             }
-            if (ObjectUtils.equals(ProductTypeEnum.MATERAIL_PRODUCT.getCode(), orderItem.getProductType())) {
+            if (ObjectUtils.equals(ProductTypeEnum.MATERIAL_PRODUCT.getCode(), orderItem.getProductType())) {
                 // 获取加料子商品列表
                 productBean.setMeterailProduct(new ArrayList<>());
                 String partnerProductId = orderItem.getProductId();
-                List<OrderItemResp> materailProducts = orderItemList.stream().filter(item -> ObjectUtils.equals(partnerProductId, item.getParentProductId())).collect(Collectors.toList());
-                materailProducts.forEach(materail -> productBean.getMeterailProduct().add(getOldOrderProduct(orderSettlementResps, materail)));
+                List<OrderItemResp> materialProducts = orderItemList.stream().filter(item -> ObjectUtils.equals(partnerProductId, item.getParentProductId())).collect(Collectors.toList());
+                materialProducts.forEach(material -> productBean.getMeterailProduct().add(getOldOrderProduct(orderSettlementResps, material)));
             }
             productList.add(productBean);
         }

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

@@ -150,9 +150,9 @@ public class OrderAdapter {
                 CreateOrderProductRequest createOrderProductDto = convent2OrderProduct(cartGoodsDetailDto);
                 createOrderProductDto.setIgnoreProductPrice(1);
                 products.add(createOrderProductDto);
-                if (CollectionUtils.isNotEmpty(cartGoodsDetailDto.getMaterailList())) {
-                    cartGoodsDetailDto.getMaterailList().stream().forEach(p -> {
-                        CreateOrderProductRequest orderProductDto = convent2OrderProductByMaterail(cartGoodsDetailDto, p);
+                if (CollectionUtils.isNotEmpty(cartGoodsDetailDto.getMaterialList())) {
+                    cartGoodsDetailDto.getMaterialList().stream().forEach(p -> {
+                        CreateOrderProductRequest orderProductDto = convent2OrderProductByMaterial(cartGoodsDetailDto, p);
                         products.add(orderProductDto);
                     });
                 }
@@ -258,14 +258,14 @@ public class OrderAdapter {
         return createOrderDto;
     }
 
-    private CreateOrderProductRequest convent2OrderProductByMaterail(ShoppingCartGoodsDto.CartGoodsDetailDto goodsDetail, ShoppingCartGoodsDto.CartGoodsDetailDto.CartGoodsMaterail materail) {
+    private CreateOrderProductRequest convent2OrderProductByMaterial(ShoppingCartGoodsDto.CartGoodsDetailDto goodsDetail, ShoppingCartGoodsDto.CartGoodsDetailDto.CartGoodsMaterial material) {
         CreateOrderProductRequest createOrderProductRequest = new CreateOrderProductRequest();
         createOrderProductRequest.setParentProductId(goodsDetail.getSpuId());
-        createOrderProductRequest.setProductId(materail.getMaterailId());
-        createOrderProductRequest.setProductName(materail.getMaterailName());
-        createOrderProductRequest.setPrice(materail.getOriginalPrice());
-        createOrderProductRequest.setSalePrice(materail.getSalePrice());
-        createOrderProductRequest.setTotalDiscountAmount(materail.getTotalDiscountAmount());
+        createOrderProductRequest.setProductId(material.getMaterialId());
+        createOrderProductRequest.setProductName(material.getMaterialName());
+        createOrderProductRequest.setPrice(material.getOriginalPrice());
+        createOrderProductRequest.setSalePrice(material.getSalePrice());
+        createOrderProductRequest.setTotalDiscountAmount(material.getTotalDiscountAmount());
         createOrderProductRequest.setNumber(goodsDetail.getQty());
         return createOrderProductRequest;
     }

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

@@ -212,7 +212,7 @@ public class ShoppingCartGoodsDto {
          */
         private List<CartGoodsDetailDto> comboProducts;
 
-        private List<CartGoodsMaterail> materailList;
+        private List<CartGoodsMaterial> materialList;
 
         @Data
         public final static class CartGoodsExtra {
@@ -228,15 +228,15 @@ public class ShoppingCartGoodsDto {
 
 
         @Data
-        public final static class CartGoodsMaterail {
+        public final static class CartGoodsMaterial {
             /**
              * 加料Id
              */
-            private String materailId;
+            private String materialId;
             /**
              * 加料名称
              */
-            private String materailName;
+            private String materialName;
             /**
              * 加料数量
              */

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/enums/ProductTypeEnum.java

@@ -23,7 +23,7 @@ public enum  ProductTypeEnum {
     MORD_SPECIFICATION_PRODUCT(10,"多规格商品"),
     WEIGHT_PRODUCT(11,"称重商品"),
     TABLEWARE_PRODUCT(12,"餐具商品"),
-    MATERAIL_PRODUCT(88,"加料商品");
+    MATERIAL_PRODUCT(88,"加料商品");