Skip to content

O
order-group
Commit 5f4a9d64 by yu.sun
Options

sunyu::update::remove redundance code block

parent e5b37925
Showing with 58 additions and 58 deletions
assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/service/ShoppingCartBaseService.java
...@@ -315,32 +315,32 @@ public interface ShoppingCartBaseService { ...@@ -315,32 +315,32 @@ public interface ShoppingCartBaseService {
* @param checkCartRequest * @param checkCartRequest
* @param cartGoodsStates * @param cartGoodsStates
*/ */
default void getProductInfoAndVerifyNew(CheckCartRequest checkCartRequest, CartGoodsStates cartGoodsStates) { // default void getProductInfoAndVerifyNew(CheckCartRequest checkCartRequest, CartGoodsStates cartGoodsStates) {
if (CollectionUtils.isEmpty(checkCartRequest.getCartGoodsList())) { // if (CollectionUtils.isEmpty(checkCartRequest.getCartGoodsList())) {
return; // return;
} // }
// 获取购物车中所有的商品详情 // // 获取购物车中所有的商品详情
// 包含：1、普通商品 2、套餐内的固定商品和可选商品 // // 包含：1、普通商品 2、套餐内的固定商品和可选商品
ShoppingCartAdapter shoppingCartAdapter = SDKCommonBaseContextWare.getBean(ShoppingCartAdapter.class); // ShoppingCartAdapter shoppingCartAdapter = SDKCommonBaseContextWare.getBean(ShoppingCartAdapter.class);
GetProductInfoRequest getSpuProductInfoRequest = shoppingCartAdapter.convertGetProductInfoRequest(checkCartRequest); // GetProductInfoRequest getSpuProductInfoRequest = shoppingCartAdapter.convertGetProductInfoRequest(checkCartRequest);
getSpuProductInfoRequest.setMenuType(checkCartRequest.getMenuType()); // getSpuProductInfoRequest.setMenuType(checkCartRequest.getMenuType());
BaseResponse<List<ProductBeanDTO>> productInfo = getProductsInfo(getSpuProductInfoRequest); // BaseResponse<List<ProductBeanDTO>> productInfo = getProductsInfo(getSpuProductInfoRequest);
if ((productInfo == null) || (!CartResponseConstant.SUCCESS.getCode().equals(productInfo.getCode()))) { // if ((productInfo == null) || (!CartResponseConstant.SUCCESS.getCode().equals(productInfo.getCode()))) {
return; // return;
} // }
//更新购物车详细信息 // //更新购物车详细信息
updateCartGoodsListInfoNew(checkCartRequest.getCartGoodsList(), productInfo.getResult(), cartGoodsStates, checkCartRequest.getPartnerId(), checkCartRequest.getStoreId(), checkCartRequest.getTableNumber()); // updateCartGoodsListInfoNew(checkCartRequest.getCartGoodsList(), productInfo.getResult(), cartGoodsStates, checkCartRequest.getPartnerId(), checkCartRequest.getStoreId(), checkCartRequest.getTableNumber());
ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo = checkCartRequest.getShoppingCartGoodsResponseVo(); // ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo = checkCartRequest.getShoppingCartGoodsResponseVo();
// 有非法商品 // // 有非法商品
if (cartGoodsStates.isHasInvalidGoods()) { // if (cartGoodsStates.isHasInvalidGoods()) {
setToastMsgIfNotExist(shoppingCartGoodsResponseVo, ShoppingCartConstant.SHOPPING_CART_INVALID_GOODS_EXIST); // setToastMsgIfNotExist(shoppingCartGoodsResponseVo, ShoppingCartConstant.SHOPPING_CART_INVALID_GOODS_EXIST);
} // }
// 价格发生变化时返回 // // 价格发生变化时返回
if (cartGoodsStates.isPriceChanged()) { // if (cartGoodsStates.isPriceChanged()) {
setToastMsgIfNotExist(shoppingCartGoodsResponseVo, ShoppingCartConstant.SHOPPING_CART_ACTIVITY_CHANGE); // setToastMsgIfNotExist(shoppingCartGoodsResponseVo, ShoppingCartConstant.SHOPPING_CART_ACTIVITY_CHANGE);
} // }
checkCartRequest.setShoppingCartGoodsResponseVo(shoppingCartGoodsResponseVo); // checkCartRequest.setShoppingCartGoodsResponseVo(shoppingCartGoodsResponseVo);
} // }
/** /**
* 根据点餐方式、校验商品券是否满足 * 根据点餐方式、校验商品券是否满足
...@@ -446,38 +446,38 @@ public interface ShoppingCartBaseService { ...@@ -446,38 +446,38 @@ public interface ShoppingCartBaseService {
cartGoodsList.removeIf(k -> invalidGoodsIdList.contains(k.getCartGoodsUid()) || StringUtils.isEmpty(k.getCartGoodsUid())); cartGoodsList.removeIf(k -> invalidGoodsIdList.contains(k.getCartGoodsUid()) || StringUtils.isEmpty(k.getCartGoodsUid()));
} }
default Map<String, GetMenuByIdsResponseDto.DataBean.MenuDetailDto> checkMenuProducts(String partnerId, // default Map<String, GetMenuByIdsResponseDto.DataBean.MenuDetailDto> checkMenuProducts(String partnerId,
String shopId, // String shopId,
List<String> productIds, String trackingNo,String menuType) { // List<String> productIds, String trackingNo,String menuType) {
//
Map<String, GetMenuByIdsResponseDto.DataBean.MenuDetailDto> menuDetailDtosMap = new HashMap<>(); // Map<String, GetMenuByIdsResponseDto.DataBean.MenuDetailDto> menuDetailDtosMap = new HashMap<>();
//
//查询spu商品是否在菜单 // //查询spu商品是否在菜单
GetMenuCategoryByIdsRequest getMenuCategoryByIdsDto = GetMenuCategoryByIdsRequest.builder() // GetMenuCategoryByIdsRequest getMenuCategoryByIdsDto = GetMenuCategoryByIdsRequest.builder()
.businessDate(DateTimeUtils.getCurrentDateTimeStr()) // .businessDate(DateTimeUtils.getCurrentDateTimeStr())
.channelType(menuType) // .channelType(menuType)
.partnerId(partnerId) // .partnerId(partnerId)
.shopId(shopId) // .shopId(shopId)
.productIds(productIds).build(); // .productIds(productIds).build();
MenuService menuService = SDKCommonBaseContextWare.getBean(MenuService.class); // MenuService menuService = SDKCommonBaseContextWare.getBean(MenuService.class);
com.freemud.application.sdk.api.base.BaseResponse<GetMenuCategoryByIdsResponse> getMenuCategoryByIdsResponse = menuService.getMenuCategoryByIds(getMenuCategoryByIdsDto, trackingNo); // com.freemud.application.sdk.api.base.BaseResponse<GetMenuCategoryByIdsResponse> getMenuCategoryByIdsResponse = menuService.getMenuCategoryByIds(getMenuCategoryByIdsDto, trackingNo);
//
if (getMenuCategoryByIdsResponse == null || !CartResponseConstant.SUCCESS.getCode().equals(getMenuCategoryByIdsResponse.getCode()) // if (getMenuCategoryByIdsResponse == null || !CartResponseConstant.SUCCESS.getCode().equals(getMenuCategoryByIdsResponse.getCode())
|| getMenuCategoryByIdsResponse.getData() == null || CollectionUtils.isEmpty(getMenuCategoryByIdsResponse.getData().getMenuDetailDtos())) { // || getMenuCategoryByIdsResponse.getData() == null || CollectionUtils.isEmpty(getMenuCategoryByIdsResponse.getData().getMenuDetailDtos())) {
return null; // return null;
} // }
//
Map<String, GetMenuCategoryByIdsResponse.MenuDetailDto> menuDetailDtosMapTemp = getMenuCategoryByIdsResponse.getData().getMenuDetailDtos().parallelStream() // Map<String, GetMenuCategoryByIdsResponse.MenuDetailDto> menuDetailDtosMapTemp = getMenuCategoryByIdsResponse.getData().getMenuDetailDtos().parallelStream()
.collect(Collectors.toMap(GetMenuCategoryByIdsResponse.MenuDetailDto::getProductId, Function.identity(), (k1, k2) -> k1)); // .collect(Collectors.toMap(GetMenuCategoryByIdsResponse.MenuDetailDto::getProductId, Function.identity(), (k1, k2) -> k1));
//
for (Map.Entry<String, GetMenuCategoryByIdsResponse.MenuDetailDto> entry : menuDetailDtosMapTemp.entrySet()) { // for (Map.Entry<String, GetMenuCategoryByIdsResponse.MenuDetailDto> entry : menuDetailDtosMapTemp.entrySet()) {
GetMenuByIdsResponseDto.DataBean.MenuDetailDto menuDetailDto = new GetMenuByIdsResponseDto.DataBean.MenuDetailDto(); // GetMenuByIdsResponseDto.DataBean.MenuDetailDto menuDetailDto = new GetMenuByIdsResponseDto.DataBean.MenuDetailDto();
BeanUtils.copyProperties(entry.getValue(), menuDetailDto); // BeanUtils.copyProperties(entry.getValue(), menuDetailDto);
menuDetailDtosMap.put(entry.getKey(), menuDetailDto); // menuDetailDtosMap.put(entry.getKey(), menuDetailDto);
} // }
//
return menuDetailDtosMap; // return menuDetailDtosMap;
} // }
/** /**
* 当ToastMsg为空时才赋值 * 当ToastMsg为空时才赋值
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment