sunyu::fixbug::fix bug about MCoffeeCheckCartGoods

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

@@ -151,6 +151,35 @@ public class AssortmentSdkService {
         checkCartRequest.setTrackingNo(LogThreadLocal.getTrackingNo());
         checkCartRequest.setMenuType(BusinessTypeEnum.getByType(menuType).getCode());
         BaseResponse<CheckCartRequest> baseResponse ;
+        baseResponse= shoppingCartService.checkAllCartGoodsNew(checkCartRequest);
+        if (baseResponse == null) {
+            return null;
+        }
+        return baseResponse.getResult();
+    }
+
+
+    /**
+     * 【麦咖啡】调用SDK校验购物车
+     *
+     * @param oldAllCartGoodsList
+     * @param partnerId
+     * @param storeId
+     * @param shoppingCartGoodsResponseVo
+     * @param orderType
+     */
+    public CheckCartRequest checkShoppingCartSdkForMCoffee(List<CartGoods> oldAllCartGoodsList, String partnerId, String storeId, ShoppingCartGoodsBaseResponseVo shoppingCartGoodsResponseVo
+            , Integer orderType, String tableNumber, String 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);
+        checkCartRequest.setPartnerId(partnerId);
+        checkCartRequest.setShoppingCartGoodsResponseVo(JSONObject.parseObject(JSONObject.toJSONString(shoppingCartGoodsResponseVo), com.freemud.sdk.api.assortment.shoppingcart.domain.ShoppingCartGoodsResponseVo.class));
+        checkCartRequest.setStoreId(storeId);
+        checkCartRequest.setTableNumber(tableNumber);
+        checkCartRequest.setTrackingNo(LogThreadLocal.getTrackingNo());
+        checkCartRequest.setMenuType(BusinessTypeEnum.getByType(menuType).getCode());
+        BaseResponse<CheckCartRequest> baseResponse ;
         baseResponse= shoppingCartService.checkAllCartGoodsForMCoffee(checkCartRequest);
         if (baseResponse == null) {
             return null;

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

@@ -1016,7 +1016,7 @@ public class ShoppingCartMCoffeeServiceImpl {
         List<CartGoods> allCartGoodsList = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(checkGoods)) {
             //当商品全部添加完毕,校验购物车商品(是否合法,上下架,点餐方式,是否在当前菜单中...),并移除非法商品
-            CheckCartRequest checkCartRequest = assortmentSdkService.checkShoppingCartSdk(checkGoods, partnerId,
+            CheckCartRequest checkCartRequest = assortmentSdkService.checkShoppingCartSdkForMCoffee(checkGoods, partnerId,
                     storeId, shoppingCartGoodsResponseVo, orderType, "", menuType, shoppingCartBaseService);
             if (checkCartRequest.getShoppingCartGoodsResponseVo() != null) {
                 shoppingCartGoodsResponseVo.setToastMsg(checkCartRequest.getShoppingCartGoodsResponseVo().getToastMsg());
@@ -1052,7 +1052,7 @@ public class ShoppingCartMCoffeeServiceImpl {
         CheckCartRequest checkCartRequest = null;
         if (CollectionUtils.isNotEmpty(checkGoods)) {
             //当商品全部添加完毕,校验购物车商品(是否合法,上下架,点餐方式,是否在当前菜单中...),并移除非法商品
-            checkCartRequest = assortmentSdkService.checkShoppingCartSdk(checkGoods, partnerId,
+            checkCartRequest = assortmentSdkService.checkShoppingCartSdkForMCoffee(checkGoods, partnerId,
                     storeId, shoppingCartGoodsResponseVo, orderType, "", menuType, shoppingCartBaseService);
         }
         return checkCartRequest;