Merge branch 'bugfix/20200918_麦咖啡修复订单信息展示问题' into bugfix/20200924_修复问题临时分支

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

@@ -579,7 +579,9 @@ public class ShoppingCartMCoffeeServiceImpl {
             cartGoods.setQty(orderItem.getProductQuantity());
             cartGoods.setSpuId(orderItem.getProductId());
             cartGoods.setSkuId(orderItem.getProductSpec());
-            cartGoods.setGoodsType(orderItem.getProductType());
+            if(6 == orderItem.getProductType()) {
+                cartGoods.setGoodsType(3);
+            }
             if(("早餐啡常搭".equals(orderItem.getProductName()) && "早餐啡常搭".equals(orderItem.getProductSpecName()))
                 || ("啡常搭".equals(orderItem.getProductName()) && "啡常搭".equals(orderItem.getProductSpecName()))) {
                 cartGoods.setName(orderItem.getProductName());