增加BusinessType

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/request/CheckCartRequest.java

@@ -27,4 +27,5 @@ public class CheckCartRequest {
     private Integer orderWay;
     private String trackingNo;
     private String tableNumber;
+    private String MenuType;
 }

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

@@ -137,7 +137,7 @@ public class AssortmentSdkService {
      * @param orderType
      */
     public CheckCartRequest checkShoppingCartSdk(List<CartGoods> oldAllCartGoodsList, String partnerId, String storeId, ShoppingCartGoodsBaseResponseVo shoppingCartGoodsResponseVo
-            , Integer orderType, String tableNumber, ShoppingCartBaseService shoppingCartService) {
+            , Integer orderType, String tableNumber, Integer menuType ,ShoppingCartBaseService shoppingCartService) {
         CheckCartRequest checkCartRequest = new CheckCartRequest();
         checkCartRequest.setCartGoodsList(JSONArray.parseArray(JSONObject.toJSONString(oldAllCartGoodsList), com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoods.class));
         checkCartRequest.setOrderWay(orderType);
@@ -146,6 +146,7 @@ public class AssortmentSdkService {
         checkCartRequest.setStoreId(storeId);
         checkCartRequest.setTableNumber(tableNumber);
         checkCartRequest.setTrackingNo(LogThreadLocal.getTrackingNo());
+        checkCartRequest.setMenuType(BusinessTypeEnum.getByType(menuType).getCode());
         long checkStartTime = System.currentTimeMillis();
         BaseResponse<CheckCartRequest> baseResponse = shoppingCartService.checkAllCartGoods(checkCartRequest);
         //LogUtil.info("shoppingCartBaseService checkAllCartGoods ", checkStartTime, JSON.toJSONString(checkCartRequest), JSON.toJSONString(baseResponse));

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

@@ -327,7 +327,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         List<CartGoods> cartGoodsList = assortmentSdkService.updateGoodsQtyBySdk(partnerId, userId, storeId, cartGoodsUid, qty, "", shoppingCartBaseService);
 
         // check购物车中所有商品
-        CheckCartRequest checkCartRequest = assortmentSdkService.checkShoppingCartSdk(cartGoodsList, partnerId, storeId, shoppingCartGoodsResponseVo, updateShoppingCartGoodsQtyRequestVo.getOrderType(), "", shoppingCartBaseService);
+        CheckCartRequest checkCartRequest = assortmentSdkService.checkShoppingCartSdk(cartGoodsList, partnerId, storeId, shoppingCartGoodsResponseVo, updateShoppingCartGoodsQtyRequestVo.getOrderType(), "", updateShoppingCartGoodsQtyRequestVo.getMenuType(), shoppingCartBaseService);
         if (checkCartRequest.getShoppingCartGoodsResponseVo() != null) {
             shoppingCartGoodsResponseVo.setToastMsg(checkCartRequest.getShoppingCartGoodsResponseVo().getToastMsg());
         }
@@ -419,7 +419,8 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             cartGoodsList = new ArrayList<>();
         }
         // check购物车中所有商品
-        CheckCartRequest checkCartRequest = assortmentSdkService.checkShoppingCartSdk(cartGoodsList, partnerId, storeId, shoppingCartGoodsResponseVo, shoppingCartInfoRequestVo.getOrderType(), "", shoppingCartBaseService);
+        CheckCartRequest checkCartRequest = assortmentSdkService.checkShoppingCartSdk(cartGoodsList, partnerId, storeId,
+                shoppingCartGoodsResponseVo, shoppingCartInfoRequestVo.getOrderType(), "", shoppingCartInfoRequestVo.getMenuType() ,shoppingCartBaseService);
         if (checkCartRequest.getShoppingCartGoodsResponseVo() != null) {
             shoppingCartGoodsResponseVo.setToastMsg(checkCartRequest.getShoppingCartGoodsResponseVo().getToastMsg());
         }
@@ -558,7 +559,8 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         }
 
         // check购物车中所有商品(商品是否存在，价格变动，券是否支持当前点餐方式)
-        CheckCartRequest checkCartRequest = assortmentSdkService.checkShoppingCartSdk(cartGoodsList, partnerId, storeId, shoppingCartGoodsResponseVo, shoppingCartInfoRequestVo.getOrderType(), tableNumber, shoppingCartBaseService);
+        CheckCartRequest checkCartRequest = assortmentSdkService.checkShoppingCartSdk(cartGoodsList, partnerId, storeId, shoppingCartGoodsResponseVo,
+                shoppingCartInfoRequestVo.getOrderType(), tableNumber, shoppingCartInfoRequestVo.getMenuType() ,shoppingCartBaseService);
         com.freemud.sdk.api.assortment.shoppingcart.domain.ShoppingCartGoodsResponseVo cartGoodsResponseVo = checkCartRequest.getShoppingCartGoodsResponseVo();
         //商品不再售卖状态或价格变动，直接返回报错
         if (cartGoodsResponseVo != null) {
@@ -1017,7 +1019,8 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
 
         //当商品全部添加完毕,校验购物车商品(是否合法,上下架,点餐方式,是否在当前菜单中...),并移除非法商品
         CheckCartRequest checkCartRequest = assortmentSdkService.checkShoppingCartSdk(oldAllCartGoodsList, addShoppingCartGoodsRequestVo.getPartnerId(),
-                addShoppingCartGoodsRequestVo.getShopId(), shoppingCartGoodsResponseVo, addShoppingCartGoodsRequestVo.getOrderType(), "", shoppingCartBaseService);
+                addShoppingCartGoodsRequestVo.getShopId(), shoppingCartGoodsResponseVo, addShoppingCartGoodsRequestVo.getOrderType(),
+                "", addShoppingCartGoodsRequestVo.getMenuType(),shoppingCartBaseService);
         if (checkCartRequest.getShoppingCartGoodsResponseVo() != null) {
             shoppingCartGoodsResponseVo.setToastMsg(checkCartRequest.getShoppingCartGoodsResponseVo().getToastMsg());
         }