Merge remote-tracking branch 'remotes/origin/feature/1.9.32_商品加料' into develop

shopping-cart-application-service/src/main/java/cn/freemud/adapter/ShoppingCartConvertAdapter.java

@@ -111,6 +111,7 @@ public class ShoppingCartConvertAdapter {
         } else if (cartGoods.isWeightType()) {
             cartGoodsDetailDto.setProductType(ProductType.WEIGHT_PRODUCT.getCode());
         }
+        //小料
         if (CollectionUtils.isNotEmpty(cartGoods.getProductMaterialList())) {
             List<ShoppingCartGoodsDto.CartGoodsDetailDto.MaterialGoods> materialList = new ArrayList<>(0);
             for (CartGoods.MaterialGoods materialGoods : cartGoods.getProductMaterialList()) {
@@ -119,6 +120,7 @@ public class ShoppingCartConvertAdapter {
                 goods.setSpuName(materialGoods.getSpuName());
                 goods.setOriginalPrice(materialGoods.getOriginalPrice());
                 goods.setSalePrice(materialGoods.getFinalPrice());
+                goods.setQty(cartGoods.getQty());
                 materialList.add(goods);
             }
             cartGoodsDetailDto.setMaterialList(materialList);

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

@@ -273,6 +273,10 @@ public class ShoppingCartGoodsDto {
              */
             private Long salePrice;
             /**
+             * 小料商品的数量
+             */
+            private Integer qty;
+            /**
              * 商品行优惠总金额=数量*单个商品优惠金额
              */
             private Integer totalDiscountAmount;