productgroupId问题

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

@@ -3162,6 +3162,9 @@ public class OrderSdkAdapter {
         if (StringUtils.isNotBlank(product.getSplitIndex())){
             extInfo.setSplitIndex(product.getSplitIndex());
         }
+        if (null != product.getProductGroupId()) {
+            extInfo.setProductGroupId(product.getProductGroupId());
+        }
         extInfo.setStapleFood(product.getStapleFood());
 
         extInfo.setOriginalGoodsUid(product.getOriginalGoodsUid());

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/CreateOrderProductRequest.java

@@ -133,6 +133,8 @@ public class CreateOrderProductRequest extends BaseConfig {
      */
     private Boolean isFixedProduct;
 
+    private Long productGroupId;
+
     /**
      * 套餐--6
      */

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/OrderProductAddInfoDto.java

@@ -97,6 +97,8 @@ public class OrderProductAddInfoDto extends BaseConfig {
      */
     private String splitIndex;
 
+    private Long productGroupId;
+
     /**
      * 虚拟商品发券id
      */

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

@@ -2768,6 +2768,7 @@ public class OrderAdapter {
         createOrderProductDemoDto.setClassificationId(cartGoodsDetailDto.getClassificationId());
         createOrderProductDemoDto.setClassificationName(cartGoodsDetailDto.getClassificationName());
         createOrderProductDemoDto.setSplitIndex(cartGoodsDetailDto.getSplitIndex());
+        createOrderProductDemoDto.setProductGroupId(cartGoodsDetailDto.getProductGroupId());
         if(CollectionUtils.isNotEmpty(cartGoodsDetailDto.getSpecialExtra())) {
             createOrderProductDemoDto.setSpecialAttrs(new ArrayList<>());
             cartGoodsDetailDto.getSpecialExtra().stream().forEach(o -> {

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

@@ -186,6 +186,7 @@ public class ShoppingCartGoodsDto {
          * 是否是套餐内固定商品
          */
         private Boolean isFixedProduct;
+        private Long productGroupId;
 
         /**
          * 三方商品编号

order-application-service/src/main/java/cn/freemud/entities/vo/mccafe/RecentGoodsInfoVo.java

@@ -68,6 +68,7 @@ public class RecentGoodsInfoVo {
         private String spuId;
 
         private String skuId;
+        private Long productGroupId;
 
         /**
          * 商品的spuName

order-application-service/src/main/java/cn/freemud/service/impl/MCCafeOrderServiceImpl.java

@@ -2429,6 +2429,10 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
                     comboGoodsVo.setSpuName(p.getProductName());
                     comboGoodsVo.setSkuId(p.getSpecification());
                     comboGoodsVo.setSkuName(p.getSpecificationName());
+                    if(StringUtils.isNotBlank(p.getExtInfo())) {
+                        OrderProductAddInfoDto extInfo = JSON.parseObject(p.getExtInfo(), OrderProductAddInfoDto.class);
+                        comboGoodsVo.setProductGroupId(extInfo.getProductGroupId());
+                    }
                     comboGoodsVo.setQty(p.getNumber());
                     OrderProductAddInfoDto orderProductAddInfoDto = JSON.parseObject(p.getExtInfo(), OrderProductAddInfoDto.class);
                     if(null != orderProductAddInfoDto) {

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

@@ -84,6 +84,7 @@ public class ShoppingCartMccafeAdapter {
             List<ShoppingCartGoodsDto.CartGoodsDetailDto.CartGoodsExtra> cartGoodsExtras = BeanUtil.convertBeans(comboxGoods.getExtra(), ShoppingCartGoodsDto.CartGoodsDetailDto.CartGoodsExtra::new);
             cartGoodsDetailDto.setExtraList(cartGoodsExtras);
             cartGoodsDetailDto.setSpecialExtra(comboxGoods.getSpecialExtra());
+            cartGoodsDetailDto.setProductGroupId(comboxGoods.getProductGroupId());
             //小料
             if (CollectionUtils.isNotEmpty(comboxGoods.getProductMaterialList())) {
                 List<ShoppingCartGoodsDto.CartGoodsDetailDto.MaterialGoods> materialList = new ArrayList<>(0);

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

@@ -259,6 +259,7 @@ public class ShoppingCartGoodsDto {
          * 是否是套餐内固定商品
          */
         private Boolean isFixedProduct;
+        private Long productGroupId;
         /**
          * 是否限制库存
          * 用于创建订单时，是否扣减库存