Merge remote-tracking branch 'remotes/origin/feature/1.9.10-购物车接口修改渠道字段-海波' into develop

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartInfoRequestVo.java

order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderVo.java

@@ -190,6 +190,8 @@ public class CreateOrderVo {
     @ApiModelProperty(hidden = true)
     private String sessionKey; // 存储sessionKey,异常补退使用
 
+    private String menuType;
+
     @Data
     public static class PremiumExchangeActivity {
         @NotNull(message = "activityCode 不能为空")

order-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartInfoRequestVo.java

@@ -92,6 +92,8 @@ public class ShoppingCartInfoRequestVo {
      */
     private String channelType;
 
+    private String menuType;
+
     @Data
     public final static class SendGoods {
         /**

order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java

@@ -311,6 +311,7 @@ public class CheckOrder {
                 .flag(CouponFlag.NO.getCode())
                 .useCustomerScore(createOrderVo.getUseCustomerScore())
                 .buyMemberCard(buyMemberCard)
+                .menuType(createOrderVo.getMenuType())
                 .build();
         // 如果使用优惠券或者商品券，校验 couponCode
         if (StringUtils.isNotBlank(createOrderVo.getCouponCode())) {