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

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

@@ -742,10 +742,6 @@ public class OrderSdkAdapter {
         List<OrderItemResp> parentOrderItemList = orderItemList == null ? new ArrayList<>() : orderItemList.stream()
                 .filter(item -> StringUtils.isEmpty(item.getParentProductId()) || ObjectUtils.equals("0", item.getParentProductId()))
                 .collect(Collectors.toList());
-        List<OrderItemResp> materailProductItemList = orderItemList == null ? new ArrayList<>() : orderItemList.stream()
-                .filter(item -> StringUtils.isNotBlank(item.getParentProductId()) && ObjectUtils.equals(ProductTypeEnum.MATERAIL_PRODUCT.getCode(), item.getProductType()))
-                .collect(Collectors.toList());
-
         for (OrderItemResp orderItem : parentOrderItemList) {
             QueryOrdersResponse.DataBean.OrderBean.ProductBean productBean = getOldOrderProduct(orderSettlementResps, orderItem);
             if (ObjectUtils.equals(ProductTypeEnum.SETMEAL_PRODUCT.getCode(), orderItem.getProductType()) || ObjectUtils.equals(ProductTypeEnum.SETMEAL_UPPRICE_PRODUCT.getCode(), orderItem.getProductType())) {
@@ -755,16 +751,14 @@ 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)));
             }
-            productList.add(productBean);
-        }
-        for (OrderItemResp metarail : materailProductItemList){
-            // 获取加料商品列表
-            QueryOrdersResponse.DataBean.OrderBean.ProductBean productBean = productList.stream().filter(item -> item.getProductId().equals(metarail.getParentProductId())).findFirst().get();
-            List<QueryOrdersResponse.DataBean.OrderBean.ProductBean> meterailProduct = productBean.getMeterailProduct();
-            if (CollectionUtils.isEmpty(meterailProduct)){
+            if (ObjectUtils.equals(ProductTypeEnum.MATERAIL_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)));
             }
-            productBean.getMeterailProduct().add(getOldOrderProduct(orderSettlementResps, metarail));
+            productList.add(productBean);
         }
         return productList;
     }

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

@@ -264,12 +264,9 @@ public class OrderAdapter {
         createOrderProductRequest.setProductId(materail.getMaterailId());
         createOrderProductRequest.setProductName(materail.getMaterailName());
         createOrderProductRequest.setPrice(materail.getOriginalPrice());
-        createOrderProductRequest.setSalePrice(materail.getOriginalPrice());
-        // TODO 优惠数量问题
-        createOrderProductRequest.setTotalDiscountAmount(materail.getDiscountAmount());
-        createOrderProductRequest.setNumber(materail.getQty());
-        // TODO 加料商品类型问题， 默认为2
-        createOrderProductRequest.setProductType(materail.getType());
+        createOrderProductRequest.setSalePrice(materail.getSalePrice());
+        createOrderProductRequest.setTotalDiscountAmount(materail.getTotalDiscountAmount());
+        createOrderProductRequest.setNumber(goodsDetail.getQty());
         return createOrderProductRequest;
     }
 

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

@@ -248,17 +248,22 @@ public class ShoppingCartGoodsDto {
             /**
              * 加料优惠价格
              */
-            private Long discountAmount;
+            private Long totalDiscountAmount;
             /**
-             * 加料实际价格
+             * 销售价格
              */
-            private Long actualPrice;
+            private Long salePrice;
 
             /**
              * 商品类型
              */
             private Integer type;
 
+            /**
+             * 商品优惠信息
+             */
+            List<ActivityDiscountsDto> activityDiscountsDtos;
+
         }
 
         /**

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

@@ -15,14 +15,15 @@ public enum  ProductTypeEnum {
 
 
     GENERAL_PRODUCT(1,"普通商品"),
-    MATERAIL_PRODUCT(2,"加料商品"),
+
     GROUP_PRODUCT(3,"组合商品"),
     SETMEAL_PRODUCT(6,"套餐商品"),
     SETMEAL_UPPRICE_PRODUCT(7,"加价套餐商品"),
     VIRTUAL_PRODUCT(9,"虚拟商品"),
     MORD_SPECIFICATION_PRODUCT(10,"多规格商品"),
     WEIGHT_PRODUCT(11,"称重商品"),
-    TABLEWARE_PRODUCT(12,"餐具商品");
+    TABLEWARE_PRODUCT(12,"餐具商品"),
+    MATERAIL_PRODUCT(88,"加料商品");