再来一单早餐啡常搭

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

@@ -271,7 +271,8 @@ public class ShoppingCartAdapter {
             ProductBeanDTO.SkuProductBean skuProduct = isSkuProduct ? spuProduct.getSkuList().stream().filter(p -> ObjectUtils.equals(cartGoods.getSkuId(), p.getSkuId())).findFirst().get() : null;
 
             Map<String, String> attributes = getAttributesNew(cartGoods.getExtra());
-            if(!"早餐啡常搭".equals(cartGoods.getName()) && !"早餐啡常搭".equals(cartGoods.getSkuName()) && !"早餐啡常搭".equals(cartGoods.getSpuName())) {
+            if(!"早餐啡常搭".equals(cartGoods.getName()) && !"早餐啡常搭".equals(cartGoods.getSkuName()) && !"早餐啡常搭".equals(cartGoods.getSpuName())
+                && !"啡常搭".equals(cartGoods.getName()) && !"啡常搭".equals(cartGoods.getSkuName()) && !"啡常搭".equals(cartGoods.getSpuName())) {
                 cartGoods.setName(spuProduct.getName());
                 cartGoods.setSpuName(spuProduct.getName());
                 cartGoods.setSkuName(isSkuProduct ? skuProduct.getProductName() : spuProduct.getName());

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java

@@ -579,6 +579,13 @@ public class ShoppingCartMCoffeeServiceImpl {
             cartGoods.setQty(orderItem.getProductQuantity());
             cartGoods.setSpuId(orderItem.getProductId());
             cartGoods.setSkuId(orderItem.getProductSpec());
+            cartGoods.setGoodsType(orderItem.getProductType());
+            if(("早餐啡常搭".equals(orderItem.getProductName()) && "早餐啡常搭".equals(orderItem.getProductSpecName()))
+                || ("啡常搭".equals(orderItem.getProductName()) && "啡常搭".equals(orderItem.getProductSpecName()))) {
+                cartGoods.setName(orderItem.getProductName());
+                cartGoods.setSpuName(orderItem.getProductName());
+                cartGoods.setSkuName(orderItem.getProductName());
+            }
             if (ObjectUtils.equals(ProductTypeEnum.SETMEAL_PRODUCT.getCode(), orderItem.getProductType()) || ObjectUtils.equals(ProductTypeEnum.SETMEAL_UPPRICE_PRODUCT.getCode(), orderItem.getProductType())) {
                 // 获取套餐子商品列表
                 cartGoods.setProductComboList(new ArrayList<>());