Merge branches 'develop' and 'feature-yu.sun-material-20201030' of…

Merge branches 'develop' and 'feature-yu.sun-material-20201030' of http://gitlab.freemud.com/order-group-application/order-group into develop

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

@@ -918,10 +918,9 @@ public class ShoppingCartConvertAdapter {
                 for (ProductBeanDTO.ProductGroupType productGroupType : productBeanDTO.getAdditionalGroupList()){
                     groupDetail.addAll(productGroupType.getGroupDetail());
                 }
-                List<com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoods.MaterialGoods> productMaterialList = new ArrayList<>();
                 for (com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoods.MaterialGoods productMaterial :comboxGoods.getProductMaterialList()){
                     for (ProductBeanDTO.ProductGroupType.GroupDetailType groupDetailType : groupDetail){
-                        if(groupDetailType.getProductId().equals(productMaterial.getSpuId()) && productMaterial.getAmount() == null){
+                        if(groupDetailType.getProductId().equals(productMaterial.getSpuId())){
                             productMaterial.setSpuId(groupDetailType.getProductId());
                             productMaterial.setAmount(groupDetailType.getProductPrice().longValue());
                             productMaterial.setFinalPrice(groupDetailType.getProductFinalPrice().longValue());
@@ -929,11 +928,9 @@ public class ShoppingCartConvertAdapter {
                             productMaterial.setOriginalPrice(groupDetailType.getProductPrice().longValue());
                             productMaterial.setSpuName(groupDetailType.getProductName());
                             productMaterial.setKeyWord(productMaterial.getKeyWord());
-                            productMaterialList.add(productMaterial);
                         }
                     }
                 }
-                comboxGoods.setProductMaterialList(productMaterialList);
             }
         }
     }