Merge remote-tracking branch 'origin/qa' into qa

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

@@ -128,7 +128,7 @@ public class ShoppingCartConvertAdapter {
                 ShoppingCartGoodsDto.CartGoodsDetailDto.MaterialGoods goods = new ShoppingCartGoodsDto.CartGoodsDetailDto.MaterialGoods();
                 goods.setSpuId(materialGoods.getSpuId());
                 goods.setSpuName(materialGoods.getSpuName());
-                goods.setOriginalPrice(materialGoods.getOriginalPrice());
+                goods.setOriginalPrice(null != materialGoods.getOriginalPrice() ? materialGoods.getOriginalPrice() : 0);
                 goods.setSalePrice(materialGoods.getFinalPrice());
                 goods.setCustomerCode(materialGoods.getCustomerCode());
                 goods.setProductCode(materialGoods.getCustomerCode());
@@ -933,6 +933,28 @@ public class ShoppingCartConvertAdapter {
                         }
                     }
                 }
+            }else {
+                if(CollectionUtils.isNotEmpty(comboxGoodsSkuProductBean.getAdditionalGroupList())){
+                    List<ProductTypeBeanDTO.ProductGroupType.GroupDetailType> groupDetail = new ArrayList<>();
+                    for (ProductTypeBeanDTO.ProductGroupType productGroupType : comboxGoodsSkuProductBean.getAdditionalGroupList()){
+                        groupDetail.addAll(productGroupType.getGroupDetail());
+                    }
+                    for (com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoods.MaterialGoods productMaterial :comboxGoods.getProductMaterialList()){
+                        for (ProductTypeBeanDTO.ProductGroupType.GroupDetailType groupDetailType : groupDetail){
+                            if(groupDetailType.getProductId().equals(productMaterial.getSpuId())){
+                                productMaterial.setSpuId(groupDetailType.getProductId());
+                                productMaterial.setAmount(groupDetailType.getProductFinalPrice().longValue());
+                                productMaterial.setFinalPrice(groupDetailType.getProductFinalPrice().longValue());
+                                productMaterial.setOriginalAmount(groupDetailType.getProductFinalPrice().longValue());
+                                productMaterial.setOriginalPrice(groupDetailType.getProductFinalPrice().longValue());
+                                productMaterial.setSpuName(groupDetailType.getProductName());
+                            }
+                        }
+                    }
+                }else {
+                    //都不存在移除商品
+                    comboxGoods.setProductMaterialList(new ArrayList<>());
+                }
             }
         }
     }