p6v3

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

@@ -563,6 +563,7 @@ public class ShoppingCartConvertAdapter {
     public List<ValidateSkuProductType> getValidateSkuProductType(List<com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoods.ComboxGoods> productComboList) {
         List<ValidateSkuProductType> result = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(productComboList)) {
+            Map<String, ValidateSkuProductType> map = new HashMap<>();
             for (com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoods.ComboxGoods comboxGoods : productComboList) {
                 if("0".equals(comboxGoods.getGoodsId())){
                     continue;
@@ -575,7 +576,13 @@ public class ShoppingCartConvertAdapter {
                 validateSkuProductType.setQty(comboxGoods.getQty());
                 validateSkuProductType.setAttributeList(getAttributes(comboxGoods.getExtra()));
                 validateSkuProductType.setProductGroupId(comboxGoods.getProductGroupId());
-                result.add(validateSkuProductType);
+                ValidateSkuProductType validateSkuProductTypeExists = map.get(validateSkuProductType.toString());
+                if(validateSkuProductTypeExists == null) {
+                    result.add(validateSkuProductType);
+                    map.put(validateSkuProductType.toString(), validateSkuProductType);
+                } else {
+                    validateSkuProductTypeExists.setQty(validateSkuProductTypeExists.getQty()+validateSkuProductType.getQty());
+                }
             }
         }
         return result;

shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/product/ProductAttributeValueType.java

@@ -20,4 +20,8 @@ public class ProductAttributeValueType {
     private String attributeId;
     private String attributeValue;
 
+    public String toString() {
+        return "attributeId:"+attributeId+" attributeValue:"+attributeValue;
+    }
+
 }

shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/product/ValidateSkuProductType.java

@@ -29,4 +29,10 @@ public class ValidateSkuProductType {
 
     private ProductSpecAttrValueGroupType productSpecAttrValueGroupType;
 
+
+    public String toString() {
+        return "skuId:"+skuId+" productId:"+productId+" price:"+price+" markUpPrice:"+markUpPrice+" qty:"+qty+" productGroupId:"+productGroupId
+                +" attributeList:"+attributeList.toString();
+    }
+
 }