Merge branch 'bugfix/20200918_麦咖啡修复订单信息展示问题' into qa

# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/SetMealCalculation.java

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

@@ -46,6 +46,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 import static cn.freemud.constant.ShoppingCartConstant.SHOPPING_CART_EMPTY_GOODS_LIST;
@@ -1037,6 +1038,15 @@ public class ShoppingCartMCoffeeServiceImpl {
             allCartGoodsList = JSONArray.parseArray(JSONObject.toJSONString(checkCartRequest.getCartGoodsList()), CartGoods.class);
         }
 
+        Map<String, CartGoods> cartGoodsMap = checkGoods.stream().collect(Collectors.toMap(CartGoods::getSpuId, Function.identity(), (e, r) -> e));
+        allCartGoodsList.forEach(o -> {
+            if(cartGoodsMap.get(o.getSpuId()) != null) {
+                o.setName(cartGoodsMap.get(o.getSpuId()).getName());
+                o.setSkuName(cartGoodsMap.get(o.getSpuId()).getSkuName());
+                o.setSpuName(cartGoodsMap.get(o.getSpuId()).getSpuName());
+            }
+        });
+
         //添加商品为加价购商品
         if (CollectionUtils.isNotEmpty(reduceGoods)) {
             allCartGoodsList.addAll(reduceGoods);

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

@@ -61,7 +61,7 @@ public class SetMealCalculation {
 //            cartGoods.setOriginalAmount(cartGoods.getOriginalPrice() * cartGoods.getQty());
             cartGoods.setPackPrice(cartGoods.getPackPrice() * cartGoods.getQty());
             // 可选商品现总价
-            productGroupTotalAmount = 0L;
+            productGroupTotalAmount = 0l;
             long productGroupAmount = cartGoods.getProductGroupList().stream().mapToLong(t -> t.getFinalPrice() * t.getQty()).sum();
             productGroupTotalAmount += productGroupAmount * cartGoods.getQty();