Merge branch 'feature/20200324_套餐商品组校验' into qa

# Conflicts:
#	assortment-shoppingcart-sdk/pom.xml
#	shopping-cart-application-service/pom.xml

assortment-shoppingcart-sdk/pom.xml

@@ -42,7 +42,7 @@
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
             <artifactId>productcenter-sdk</artifactId>
-            <version>2.7.7-SNAPSHOT</version>
+            <version>2.8.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/adapter/ShoppingCartAdapter.java

@@ -59,7 +59,9 @@ public class ShoppingCartAdapter {
             ValidateShopProductType productType = new ValidateShopProductType();
             productType.setSpuId(cartGoods.getSpuId());
             productType.setSkuId(ObjectUtils.equals(GoodsTypeEnum.SKU_GOODS.getGoodsType(), cartGoods.getGoodsType()) ? cartGoods.getSkuId() : cartGoods.getSpuId());
-            productType.setPrice(cartGoods.getOriginalPrice() == null ? 0 : cartGoods.getOriginalPrice().intValue());
+            // 应产品要求
+            // 普通商品，取商品的finalePrice(普通商品售价);套餐商品，取originalPrice(套餐价格)
+            productType.setPrice(cartGoods.getFinalPrice() == null ? 0 : cartGoods.getFinalPrice().intValue());
             productType.setValidatePrice(productType.getPrice() == 0 ? 0 : 1);
             productType.setValidateAttribute(1);
             productType.setValidateStatuses(Arrays.asList(2));
@@ -97,6 +99,7 @@ public class ShoppingCartAdapter {
                 validateSkuProductType.setMarkUpPrice(comboxGoods.getFinalPrice() == null ? 0 : comboxGoods.getFinalPrice().intValue());
                 validateSkuProductType.setQty(comboxGoods.getQty());
                 validateSkuProductType.setAttributeList(getAttributes(comboxGoods.getExtra()));
+                validateSkuProductType.setProductGroupId(comboxGoods.getProductGroupId());
                 result.add(validateSkuProductType);
             }
         }

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/domain/CartGoods.java

@@ -234,6 +234,10 @@ public class CartGoods {
          */
         private String unit;
         /**
+         * 商品组Id
+         */
+        private Long productGroupId;
+        /**
          * 配料或属性
          */
         private List<CartGoodsExtra> extra;

shopping-cart-application-service/pom.xml

@@ -35,7 +35,7 @@
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
             <artifactId>productcenter-sdk</artifactId>
-            <version>2.7.7-SNAPSHOT</version>
+            <version>2.8.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

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

@@ -353,6 +353,7 @@ public class ShoppingCartConvertAdapter {
                 productCombox.setSkuId(vo.getSkuId());
                 productCombox.setQty(vo.getQty());
                 productCombox.setExtra(vo.getExtra());
+                productCombox.setProductGroupId(Long.parseLong(vo.getProductGroupId()));
                 productComboList.add(productCombox);
             }
         }
@@ -363,6 +364,7 @@ public class ShoppingCartConvertAdapter {
                 productCombox.setSkuId(vo.getSkuId());
                 productCombox.setQty(vo.getQty());
                 productCombox.setExtra(vo.getExtra());
+                productCombox.setProductGroupId(Long.parseLong(vo.getProductGroupId()));
                 productGroupList.add(productCombox);
             }
         }

shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/CartGoods.java

@@ -242,6 +242,10 @@ public class CartGoods {
          * 第三方商品编号
          */
         private String customerCode;
+        /**
+         * 商品组Id
+         */
+        private Long productGroupId;
 
         @Override
         public int hashCode() {

shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ComboxGoodsRequestVo.java

@@ -22,6 +22,10 @@ public class ComboxGoodsRequestVo {
     private String skuId;
     private Integer qty;
     /**
+     * 商品组Id
+     */
+    private String productGroupId;
+    /**
      * 商品额外的属性
      */
     List<CartGoods.CartGoodsExtra> extra;