Merge branches 'develop' and 'feature/20200929_麦咖啡再来一单' of…

Merge branches 'develop' and 'feature/20200929_麦咖啡再来一单' of http://gitlab.freemud.com/order-group-application/order-group into develop

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

shopping-cart-application-service/src/main/java/cn/freemud/enums/ShoppingCartOperationType.java

@@ -17,8 +17,8 @@ public enum  ShoppingCartOperationType {
 
     ADD_PRODUCT_COUPON(1,"增加商品券"),
     ADD_SUPER_PRICE_GOODS(2,"增加超值加购商品"),
-    UPDATE3(3,"切换门店校验"),
-    UPDATE4(4,"确认切换门店")
+    CHECK(3,"切换门店校验"),
+    CONFIRM(4,"确认切换门店")
             ;
 
 

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

@@ -44,4 +44,10 @@ public class CopyShoppingCartRequestVo {
     @NotEmpty(message = "orderId不能为空")
     private String orderId;
 
+    /**
+     * 操作类型 ShoppingCartOperationType　枚举
+     * 校验通过直接返回购物车商品数据
+     */
+    private Integer operationType;
+
 }