Merge branch 'feature/20201022_入机键位修改_xukang' into qa

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

order-management/pom.xml

@@ -65,7 +65,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-ordercenter-sdk</artifactId>
-            <version>2.0.17-SNAPSHOT</version>
+            <version>2.0.13-RELEASE</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

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

@@ -823,6 +823,7 @@ public class ShoppingCartMCoffeeServiceImpl {
             cartGoods.setSpuId(orderItem.getProductId());
             cartGoods.setSkuId(orderItem.getProductSpec());
             cartGoods.setFinalPrice(orderItem.getProductPrice().longValue());
+            cartGoods.setPic(orderItem.getProductPicUrl());
             if(6 == orderItem.getProductType()) {
                 cartGoods.setGoodsType(com.freemud.sdk.api.assortment.shoppingcart.constant.GoodsTypeEnum.SET_MEAL_GOODS.getGoodsType());
             } else if(10 ==orderItem.getProductType()) {
@@ -832,8 +833,16 @@ public class ShoppingCartMCoffeeServiceImpl {
             }else {
                 cartGoods.setGoodsType(com.freemud.sdk.api.assortment.shoppingcart.constant.GoodsTypeEnum.COMMON_GOODS.getGoodsType());
             }
+            if (ObjectUtils.equals(ProductTypeEnum.SETMEAL_PRODUCT.getCode(), orderItem.getProductType()) || ObjectUtils.equals(ProductTypeEnum.SETMEAL_UPPRICE_PRODUCT.getCode(), orderItem.getProductType())) {
+                // 获取套餐子商品列表
+                cartGoods.setProductComboList(new ArrayList<>());
+                cartGoods.setProductGroupList(new ArrayList<>());
+                String partnerProductId = orderItem.getProductId() + "_" + orderItem.getProductSeq();
+                List<OrderItemResp> comboProducts = orderItemList.stream().filter(item -> ObjectUtils.equals(partnerProductId, item.getParentProductId())).collect(Collectors.toList());
+                comboProducts.forEach(combo -> getComboxGoods(cartGoods, combo));
+            }
             if(("早餐啡常搭".equals(orderItem.getProductName()) && "早餐啡常搭".equals(orderItem.getProductSpecName()))
-                || ("啡常搭".equals(orderItem.getProductName()) && "啡常搭".equals(orderItem.getProductSpecName()))) {
+                    || ("啡常搭".equals(orderItem.getProductName()) && "啡常搭".equals(orderItem.getProductSpecName()))) {
                 cartGoods.setName(orderItem.getProductName());
                 cartGoods.setSpuName(orderItem.getProductName());
                 cartGoods.setSkuName(orderItem.getProductName());
@@ -842,14 +851,6 @@ public class ShoppingCartMCoffeeServiceImpl {
                 cartGoods.setSkuName(orderItem.getProductSpecName());
                 cartGoods.setSpuName(orderItem.getProductName());
             }
-            if (ObjectUtils.equals(ProductTypeEnum.SETMEAL_PRODUCT.getCode(), orderItem.getProductType()) || ObjectUtils.equals(ProductTypeEnum.SETMEAL_UPPRICE_PRODUCT.getCode(), orderItem.getProductType())) {
-                // 获取套餐子商品列表
-                cartGoods.setProductComboList(new ArrayList<>());
-                cartGoods.setProductGroupList(new ArrayList<>());
-                String partnerProductId = orderItem.getProductId() + "_" + orderItem.getProductSeq();
-                List<OrderItemResp> comboProducts = orderItemList.stream().filter(item -> ObjectUtils.equals(partnerProductId, item.getParentProductId())).collect(Collectors.toList());
-                comboProducts.forEach(combo -> getComboxGoods(cartGoods, combo));
-            }
             cartGoodsList.add(cartGoods);
         }
 
@@ -869,8 +870,7 @@ public class ShoppingCartMCoffeeServiceImpl {
         comboxGoods.setSpuName(StringUtils.isNotEmpty(orderItemResp.getProductName()) ? orderItemResp.getProductName() :"");
         comboxGoods.setSkuName(StringUtils.isNotEmpty(orderItemResp.getProductSpecName()) ? orderItemResp.getProductSpecName() :"");
         comboxGoods.setSubName(StringUtils.isNotEmpty(orderItemResp.getProductSpecName()) ? orderItemResp.getProductSpecName() : "");
-        comboxGoods.setPic(StringUtils.isNotEmpty(orderItemResp.getProductPicUrl()) ? orderItemResp.getProductPicUrl() :
-                "");
+        comboxGoods.setPic(StringUtils.isNotEmpty(orderItemResp.getProductPicUrl()) ? orderItemResp.getProductPicUrl() : "");
         if (!"".equals(orderItemResp.getProductProperty())) {
             List<CartGoods.CartGoodsExtra> extra = new ArrayList<>();
             String[] split = orderItemResp.getProductProperty().split("/");
@@ -884,6 +884,8 @@ public class ShoppingCartMCoffeeServiceImpl {
         Map<String, Object> map = JSONObject.parseObject(orderItemResp.getExtInfo(), Map.class);
         if (map.containsKey("isFixedProduct") && (boolean) map.get("isFixedProduct")) {
             cartGoods.getProductComboList().add(comboxGoods);
+            cartGoods.setFinalPrice(comboxGoods.getFinalPrice());
+            cartGoods.setOriginalPrice(comboxGoods.getOriginalPrice());
         }
         if (map.containsKey("isFixedProduct") && !(boolean) map.get("isFixedProduct")) {
             cartGoods.getProductGroupList().add(comboxGoods);