sunyu::reset commit

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/service/ShoppingCartBaseService.java

@@ -25,6 +25,7 @@ import com.freemud.application.sdk.api.productcenter.request.product.valid.Valid
 import com.freemud.application.sdk.api.productcenter.response.menu.GetMenuCategoryByIdsResponse;
 import com.freemud.application.sdk.api.productcenter.response.valid.ValiadShopProductResponse;
 import com.freemud.application.sdk.api.productcenter.response.valid.ValiadShopProductResult;
+import com.freemud.application.sdk.api.productcenter.service.MenuService;
 import com.freemud.application.sdk.api.productcenter.service.ProductService;
 import com.freemud.application.sdk.api.storecenter.request.vo.GetOrgTreeListRequest;
 import com.freemud.application.sdk.api.storecenter.response.vo.GetOrgTreeListResponse;
@@ -343,32 +344,32 @@ public interface ShoppingCartBaseService {
      * @param checkCartRequest
      * @param cartGoodsStates
      */
-//    default void getProductInfoAndVerifyNew(CheckCartRequest checkCartRequest, CartGoodsStates cartGoodsStates) {
-//        if (CollectionUtils.isEmpty(checkCartRequest.getCartGoodsList())) {
-//            return;
-//        }
-//        // 获取购物车中所有的商品详情
-//        // 包含：1、普通商品 2、套餐内的固定商品和可选商品
-//        ShoppingCartAdapter shoppingCartAdapter = SDKCommonBaseContextWare.getBean(ShoppingCartAdapter.class);
-//        GetProductInfoRequest getSpuProductInfoRequest = shoppingCartAdapter.convertGetProductInfoRequest(checkCartRequest);
-//        getSpuProductInfoRequest.setMenuType(checkCartRequest.getMenuType());
-//        BaseResponse<List<ProductBeanDTO>> productInfo = getProductsInfo(getSpuProductInfoRequest);
-//        if ((productInfo == null) || (!CartResponseConstant.SUCCESS.getCode().equals(productInfo.getCode()))) {
-//            return;
-//        }
-//        //更新购物车详细信息
-//        updateCartGoodsListInfoNew(checkCartRequest.getCartGoodsList(), productInfo.getResult(), cartGoodsStates, checkCartRequest.getPartnerId(), checkCartRequest.getStoreId(), checkCartRequest.getTableNumber());
-//        ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo = checkCartRequest.getShoppingCartGoodsResponseVo();
-//        // 有非法商品
-//        if (cartGoodsStates.isHasInvalidGoods()) {
-//            setToastMsgIfNotExist(shoppingCartGoodsResponseVo, ShoppingCartConstant.SHOPPING_CART_INVALID_GOODS_EXIST);
-//        }
-//        // 价格发生变化时返回
-//        if (cartGoodsStates.isPriceChanged()) {
-//            setToastMsgIfNotExist(shoppingCartGoodsResponseVo, ShoppingCartConstant.SHOPPING_CART_ACTIVITY_CHANGE);
-//        }
-//        checkCartRequest.setShoppingCartGoodsResponseVo(shoppingCartGoodsResponseVo);
-//    }
+    default void getProductInfoAndVerifyNew(CheckCartRequest checkCartRequest, CartGoodsStates cartGoodsStates) {
+        if (CollectionUtils.isEmpty(checkCartRequest.getCartGoodsList())) {
+            return;
+        }
+        // 获取购物车中所有的商品详情
+        // 包含：1、普通商品 2、套餐内的固定商品和可选商品
+        ShoppingCartAdapter shoppingCartAdapter = SDKCommonBaseContextWare.getBean(ShoppingCartAdapter.class);
+        GetProductInfoRequest getSpuProductInfoRequest = shoppingCartAdapter.convertGetProductInfoRequest(checkCartRequest);
+        getSpuProductInfoRequest.setMenuType(checkCartRequest.getMenuType());
+        BaseResponse<List<ProductBeanDTO>> productInfo = getProductsInfo(getSpuProductInfoRequest);
+        if ((productInfo == null) || (!CartResponseConstant.SUCCESS.getCode().equals(productInfo.getCode()))) {
+            return;
+        }
+        //更新购物车详细信息
+        updateCartGoodsListInfoNew(checkCartRequest.getCartGoodsList(), productInfo.getResult(), cartGoodsStates, checkCartRequest.getPartnerId(), checkCartRequest.getStoreId(), checkCartRequest.getTableNumber());
+        ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo = checkCartRequest.getShoppingCartGoodsResponseVo();
+        // 有非法商品
+        if (cartGoodsStates.isHasInvalidGoods()) {
+            setToastMsgIfNotExist(shoppingCartGoodsResponseVo, ShoppingCartConstant.SHOPPING_CART_INVALID_GOODS_EXIST);
+        }
+        // 价格发生变化时返回
+        if (cartGoodsStates.isPriceChanged()) {
+            setToastMsgIfNotExist(shoppingCartGoodsResponseVo, ShoppingCartConstant.SHOPPING_CART_ACTIVITY_CHANGE);
+        }
+        checkCartRequest.setShoppingCartGoodsResponseVo(shoppingCartGoodsResponseVo);
+    }
 
     /**
      * 根据点餐方式、校验商品券是否满足
@@ -474,38 +475,38 @@ public interface ShoppingCartBaseService {
         cartGoodsList.removeIf(k -> invalidGoodsIdList.contains(k.getCartGoodsUid()) || StringUtils.isEmpty(k.getCartGoodsUid()));
     }
 
-//    default Map<String, GetMenuByIdsResponseDto.DataBean.MenuDetailDto> checkMenuProducts(String partnerId,
-//                                                                                          String shopId,
-//                                                                                          List<String> productIds, String trackingNo,String menuType) {
-//
-//        Map<String, GetMenuByIdsResponseDto.DataBean.MenuDetailDto> menuDetailDtosMap = new HashMap<>();
-//
-//        //查询spu商品是否在菜单
-//        GetMenuCategoryByIdsRequest getMenuCategoryByIdsDto = GetMenuCategoryByIdsRequest.builder()
-//                .businessDate(DateTimeUtils.getCurrentDateTimeStr())
-//                .channelType(menuType)
-//                .partnerId(partnerId)
-//                .shopId(shopId)
-//                .productIds(productIds).build();
-//        MenuService menuService = SDKCommonBaseContextWare.getBean(MenuService.class);
-//        com.freemud.application.sdk.api.base.BaseResponse<GetMenuCategoryByIdsResponse> getMenuCategoryByIdsResponse = menuService.getMenuCategoryByIds(getMenuCategoryByIdsDto, trackingNo);
-//
-//        if (getMenuCategoryByIdsResponse == null || !CartResponseConstant.SUCCESS.getCode().equals(getMenuCategoryByIdsResponse.getCode())
-//                || getMenuCategoryByIdsResponse.getData() == null || CollectionUtils.isEmpty(getMenuCategoryByIdsResponse.getData().getMenuDetailDtos())) {
-//            return null;
-//        }
-//
-//        Map<String, GetMenuCategoryByIdsResponse.MenuDetailDto> menuDetailDtosMapTemp = getMenuCategoryByIdsResponse.getData().getMenuDetailDtos().parallelStream()
-//                .collect(Collectors.toMap(GetMenuCategoryByIdsResponse.MenuDetailDto::getProductId, Function.identity(), (k1, k2) -> k1));
-//
-//        for (Map.Entry<String, GetMenuCategoryByIdsResponse.MenuDetailDto> entry : menuDetailDtosMapTemp.entrySet()) {
-//            GetMenuByIdsResponseDto.DataBean.MenuDetailDto menuDetailDto = new GetMenuByIdsResponseDto.DataBean.MenuDetailDto();
-//            BeanUtils.copyProperties(entry.getValue(), menuDetailDto);
-//            menuDetailDtosMap.put(entry.getKey(), menuDetailDto);
-//        }
-//
-//        return menuDetailDtosMap;
-//    }
+    default Map<String, GetMenuByIdsResponseDto.DataBean.MenuDetailDto> checkMenuProducts(String partnerId,
+                                                                                          String shopId,
+                                                                                          List<String> productIds, String trackingNo,String menuType) {
+
+        Map<String, GetMenuByIdsResponseDto.DataBean.MenuDetailDto> menuDetailDtosMap = new HashMap<>();
+
+        //查询spu商品是否在菜单
+        GetMenuCategoryByIdsRequest getMenuCategoryByIdsDto = GetMenuCategoryByIdsRequest.builder()
+                .businessDate(DateTimeUtils.getCurrentDateTimeStr())
+                .channelType(menuType)
+                .partnerId(partnerId)
+                .shopId(shopId)
+                .productIds(productIds).build();
+        MenuService menuService = SDKCommonBaseContextWare.getBean(MenuService.class);
+        com.freemud.application.sdk.api.base.BaseResponse<GetMenuCategoryByIdsResponse> getMenuCategoryByIdsResponse = menuService.getMenuCategoryByIds(getMenuCategoryByIdsDto, trackingNo);
+
+        if (getMenuCategoryByIdsResponse == null || !CartResponseConstant.SUCCESS.getCode().equals(getMenuCategoryByIdsResponse.getCode())
+                || getMenuCategoryByIdsResponse.getData() == null || CollectionUtils.isEmpty(getMenuCategoryByIdsResponse.getData().getMenuDetailDtos())) {
+            return null;
+        }
+
+        Map<String, GetMenuCategoryByIdsResponse.MenuDetailDto> menuDetailDtosMapTemp = getMenuCategoryByIdsResponse.getData().getMenuDetailDtos().parallelStream()
+                .collect(Collectors.toMap(GetMenuCategoryByIdsResponse.MenuDetailDto::getProductId, Function.identity(), (k1, k2) -> k1));
+
+        for (Map.Entry<String, GetMenuCategoryByIdsResponse.MenuDetailDto> entry : menuDetailDtosMapTemp.entrySet()) {
+            GetMenuByIdsResponseDto.DataBean.MenuDetailDto menuDetailDto = new GetMenuByIdsResponseDto.DataBean.MenuDetailDto();
+            BeanUtils.copyProperties(entry.getValue(), menuDetailDto);
+            menuDetailDtosMap.put(entry.getKey(), menuDetailDto);
+        }
+
+        return menuDetailDtosMap;
+    }
 
     /**
      * 当ToastMsg为空时才赋值

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/service/impl/ShoppingCartBaseServiceImpl.java

@@ -22,6 +22,7 @@ import com.freemud.application.sdk.api.productcenter.request.product.GetProductR
 import com.freemud.application.sdk.api.productcenter.response.menu.GetMenuCategoryByIdsResponse;
 import com.freemud.application.sdk.api.productcenter.response.menu.GetMenuCategoryInfoResponse;
 import com.freemud.application.sdk.api.productcenter.response.product.GetProductInfosResponse;
+import com.freemud.application.sdk.api.productcenter.service.MenuService;
 import com.freemud.application.sdk.api.productcenter.service.ProductService;
 import com.freemud.sdk.api.assortment.shoppingcart.adapter.ShoppingCartAdapter;
 import com.freemud.sdk.api.assortment.shoppingcart.constant.*;
@@ -69,8 +70,8 @@ public class ShoppingCartBaseServiceImpl implements ShoppingCartBaseService {
     private RedisCache redisCache;
     @Autowired
     private RedisTemplate redisTemplate;
-//    @Autowired
-//    private MenuService menuService;
+    @Autowired
+    private MenuService menuService;
     @Autowired
     private ShoppingCartAdapter shoppingCartAdapter;
     @Autowired