Merge branches 'feature-yu.sun-material-20201030' and 'qa' of…

Merge branches 'feature-yu.sun-material-20201030' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/domain/CartGoods.java

@@ -383,6 +383,6 @@ public class CartGoods {
         /**
          * 麦咖啡入机键位
          */
-        private String keyWord;
+        private String customerCode;
     }
 }

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

@@ -294,6 +294,8 @@ public class ShoppingCartConvertAdapter {
                     goods.setSalePrice(materialGoods.getFinalPrice());
                     goods.setQty(cartGoods.getQty());
                     goods.setTotalDiscountAmount(0);
+                    goods.setProductCode(materialGoods.getCustomerCode());
+                    goods.setCustomerCode(materialGoods.getCustomerCode());
                     materialList.add(goods);
                 }
                 cartGoodsDetailDto.setMaterialList(materialList);
@@ -762,7 +764,7 @@ public class ShoppingCartConvertAdapter {
             //原行单价*数量
             material.setOriginalAmount(detail.getProductFinalPrice().longValue() * cartGoods.getQty());
             material.setOriginalPrice(detail.getProductFinalPrice().longValue());
-            material.setKeyWord(materialGoods.getKeyWord());
+            material.setCustomerCode(materialGoods.getCustomerCode());
             materialGoodsList.add(material);
             materialAmount += detail.getProductFinalPrice().longValue() * cartGoods.getQty();
             originalMaterAmount += detail.getProductFinalPrice().longValue() * cartGoods.getQty();
@@ -929,7 +931,6 @@ public class ShoppingCartConvertAdapter {
                             productMaterial.setOriginalAmount(groupDetailType.getProductPrice().longValue());
                             productMaterial.setOriginalPrice(groupDetailType.getProductPrice().longValue());
                             productMaterial.setSpuName(groupDetailType.getProductName());
-                            productMaterial.setKeyWord(productMaterial.getKeyWord());
                         }
                     }
                 }

shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/shoppingCart/ShoppingCartGoodsDto.java

@@ -302,7 +302,9 @@ public class ShoppingCartGoodsDto {
              */
             private Integer totalDiscountAmount;
 
-            private String keyWord;
+            private String productCode;
+
+            private String customerCode;
             /**
              * 当前商品享受的促销活动
              */

shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/CartGoods.java

@@ -500,6 +500,6 @@ public class CartGoods {
         /**
          * 麦咖啡入机键位
          */
-        private String keyWord;
+        private String customerCode;
     }
 }

shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/MaterialRequestVo.java

@@ -24,4 +24,9 @@ public class MaterialRequestVo {
      * 加料商品组ID
      */
     private String groupId;
+
+    /**
+     * 麦咖啡入机键位
+     */
+    private String customerCode;
 }

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

@@ -1182,7 +1182,8 @@ public class ShoppingCartMCoffeeServiceImpl {
                     for (MaterialRequestVo materialRequestVo : vo.getProductMaterialList()) {
                         CartGoods.MaterialGoods materialGoods = new CartGoods.MaterialGoods();
                         materialGoods.setSpuId(materialRequestVo.getSpuId());
-                        materialGoods.setGroupId(materialRequestVo.getGroupId());
+                        materialGoods.setCustomerCode(materialRequestVo.getCustomerCode());
+//                        materialGoods.setGroupId(materialRequestVo.getGroupId());
                         comboxMaterialGoodsList.add(materialGoods);
                     }
                     productCombox.setProductMaterialList(comboxMaterialGoodsList);