From ad61fc01dc9f9ac81538dff1e2ad0169f90411ee Mon Sep 17 00:00:00 2001 From: skjia <106962133@qq.com> Date: Tue, 11 Feb 2025 17:14:54 +0800 Subject: [PATCH] =?UTF-8?q?jsk=20=E9=83=A8=E5=88=86=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/MktHolidayServiceImpl.java | 2 +- .../service/impl/MenuRecipeServiceImpl.java | 5 ++- .../impl/OrderShoppingCartServiceImpl.java | 2 +- .../impl/ShoppingCartBusinessImpl.java | 1 - bonus.iml | 37 +++++++++++++++++-- 5 files changed, 39 insertions(+), 8 deletions(-) diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/allocation/holiday/service/impl/MktHolidayServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/allocation/holiday/service/impl/MktHolidayServiceImpl.java index 1e6477bf..5426054e 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/allocation/holiday/service/impl/MktHolidayServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/allocation/holiday/service/impl/MktHolidayServiceImpl.java @@ -37,7 +37,7 @@ public class MktHolidayServiceImpl extends ServiceImpl recipeDetailContMap = (Map)this.menuRecipeDetailService.list((Wrapper)((LambdaQueryWrapper)Wrappers.lambdaQuery(MenuRecipeDetail.class).select(MenuRecipeDetail::getRecipeId).eq(MenuRecipeDetail::getApplyDate, applyDate)).in(MenuRecipeDetail::getRecipeId, recipeIdList)).stream().collect(Collectors.groupingBy(MenuRecipeDetail::getRecipeId, Collectors.counting())); recipeIdList.removeAll(recipeDetailContMap.keySet()); if (!ObjectUtil.isEmpty(recipeIdList)) { - List menuRecipes = this.list((Wrapper)((LambdaQueryWrapper)Wrappers.lambdaQuery(MenuRecipe.class).in(MenuRecipe::getRecipeType, new Object[]{2, 3})).apply("recipe_id IN (" + recipeIdList.stream().map(String::valueOf).collect(Collectors.joining(", ")) + ")")); + List menuRecipes = this.list((Wrapper)((LambdaQueryWrapper)Wrappers.lambdaQuery(MenuRecipe.class).in(MenuRecipe::getRecipeType, new Object[]{2, 3})).apply(CollUtil.isNotEmpty(recipeIdList),"recipe_id IN (" + recipeIdList.stream().map(String::valueOf).collect(Collectors.joining(", ")) + ")")); if (!ObjectUtil.isEmpty(menuRecipes)) { Map recipeMap = (Map)menuRecipes.stream().collect(Collectors.toMap(MenuRecipe::getRecipeId, Function.identity())); - List menuRecipeDetails = this.menuRecipeDetailService.list((Wrapper)((LambdaQueryWrapper)Wrappers.lambdaQuery(MenuRecipeDetail.class).eq(MenuRecipeDetail::getDetailType, 1)).apply("recipe_id IN (" + recipeIdList.stream().map(String::valueOf).collect(Collectors.joining(", ")) + ")")); + List menuRecipeDetails = this.menuRecipeDetailService.list((Wrapper)((LambdaQueryWrapper)Wrappers.lambdaQuery(MenuRecipeDetail.class).eq(MenuRecipeDetail::getDetailType, 1)).apply(CollUtil.isNotEmpty(recipeIdList),"recipe_id IN (" + recipeIdList.stream().map(String::valueOf).collect(Collectors.joining(", ")) + ")")); Map recipeTypeMap = (Map)menuRecipes.stream().collect(Collectors.toMap(MenuRecipe::getRecipeId, MenuRecipe::getRecipeType)); menuRecipeDetails = this.filterMenuRecipeDetails(recipeTypeMap, menuRecipeDetails, applyDate); if (!ObjectUtil.isEmpty(menuRecipeDetails)) { diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/common/service/impl/OrderShoppingCartServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/common/service/impl/OrderShoppingCartServiceImpl.java index 33bec460..2a4d141b 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/common/service/impl/OrderShoppingCartServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/common/service/impl/OrderShoppingCartServiceImpl.java @@ -31,7 +31,7 @@ public class OrderShoppingCartServiceImpl implements OrderShoppingCartService { return this.baseMapper.selectList(((LambdaQueryWrapper)((LambdaQueryWrapper) Wrappers .lambdaQuery(OrderShoppingCart.class).eq(OrderShoppingCart::getCustId, param.getCustId()) .eq(LeNumUtil.isValidId(param.getOrderType()), OrderShoppingCart::getOrderType, param.getOrderType())) - .apply("canteen_id IN (" + param.getCanteenIdList().stream().map(String::valueOf).collect(Collectors.joining(", ")) + ")")) + .apply(CollUtil.isNotEmpty(param.getCanteenIdList()),"canteen_id IN (" + param.getCanteenIdList().stream().map(String::valueOf).collect(Collectors.joining(", ")) + ")")) .eq(LeNumUtil.isValidId(param.getStallId()), OrderShoppingCart::getStallId, param.getStallId()).orderByAsc(OrderShoppingCart::getShoppingCartId)); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/mobile/service/impl/ShoppingCartBusinessImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/mobile/service/impl/ShoppingCartBusinessImpl.java index a6504e52..463461fd 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/mobile/service/impl/ShoppingCartBusinessImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/order/mobile/service/impl/ShoppingCartBusinessImpl.java @@ -110,7 +110,6 @@ public class ShoppingCartBusinessImpl implements ShoppingCartBusiness { } else { this.orderShoppingCartService.removeByIds(CollUtil.newArrayList(new Long[]{updateDTO.getShoppingCartId()})); } - this.orderCustomBusiness.mobile().didUpdateShoppingCart(updateDTO); } } diff --git a/bonus.iml b/bonus.iml index 30466db0..84c5f111 100644 --- a/bonus.iml +++ b/bonus.iml @@ -1,8 +1,39 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file