From 0739786e72493145eb300b7885b3223238dc725a Mon Sep 17 00:00:00 2001 From: seesaw Date: Mon, 21 Oct 2024 15:29:40 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=8F=9C=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/service/dishes/DishesServiceImpl.java | 14 +++++++------- .../service/dishestype/DishesTypeServiceImpl.java | 10 +++++----- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dishes/DishesServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dishes/DishesServiceImpl.java index 75b3c41c..555a0f95 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dishes/DishesServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dishes/DishesServiceImpl.java @@ -252,13 +252,13 @@ public class DishesServiceImpl implements DishesService { @Override public PageResult getDishesPageApp(DishesPageReqVO pageReqVO) { - LocalDateTime today = LocalDateTime.now(); - String dayOfWeekInChinese = today.getDayOfWeek().getDisplayName(TextStyle.FULL, Locale.CHINESE); - - ArrayList week = new ArrayList<>(); - week.add(dayOfWeekInChinese); - week.add("整周"); - pageReqVO.setWeekTimes(week); +// LocalDateTime today = LocalDateTime.now(); +// String dayOfWeekInChinese = today.getDayOfWeek().getDisplayName(TextStyle.FULL, Locale.CHINESE); +// +// ArrayList week = new ArrayList<>(); +// week.add(dayOfWeekInChinese); +// week.add("整周"); +// pageReqVO.setWeekTimes(week); return dishesMapper.selectPage(pageReqVO); } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dishestype/DishesTypeServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dishestype/DishesTypeServiceImpl.java index b06e43fb..86d4d402 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dishestype/DishesTypeServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dishestype/DishesTypeServiceImpl.java @@ -106,11 +106,11 @@ public class DishesTypeServiceImpl implements DishesTypeService { @Override public PageResult getDishesTypePageApp(DishesTypePageReqVO pageReqVO) { - List todayDishes = dishesService.getTodayDishesNew(); - if(CollectionUtil.isNotEmpty(todayDishes)){ - List ids = todayDishes.stream().map(vo -> Long.valueOf(vo.getDishecType())).collect(Collectors.toList()); - pageReqVO.setIds(ids); - } +// List todayDishes = dishesService.getTodayDishesNew(); +// if(CollectionUtil.isNotEmpty(todayDishes)){ +// List ids = todayDishes.stream().map(vo -> Long.valueOf(vo.getDishecType())).collect(Collectors.toList()); +// pageReqVO.setIds(ids); +// } return dishesTypeMapper.selectPage(pageReqVO); } From c10371842d23f5c6ac7196e82eb244a25e1ad69e Mon Sep 17 00:00:00 2001 From: seesaw Date: Mon, 21 Oct 2024 16:12:47 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=80=80=E6=AC=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pay/dal/mysql/wxprofitsharing/WxProfitsharingMapper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/dal/mysql/wxprofitsharing/WxProfitsharingMapper.java b/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/dal/mysql/wxprofitsharing/WxProfitsharingMapper.java index 6a647988..81fae60e 100644 --- a/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/dal/mysql/wxprofitsharing/WxProfitsharingMapper.java +++ b/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/dal/mysql/wxprofitsharing/WxProfitsharingMapper.java @@ -44,7 +44,7 @@ public interface WxProfitsharingMapper extends BaseMapperX { @Select("select wx_amount from member_card where user_id = #{userId} order by create_time desc limit 1") BigDecimal getWxAmount(Long userId); - @Select("select count(1) from member_dish_order where user_id = #{userId} and order_status = '0'") + @Select("select count(1) from member_dish_order where user_id = #{userId} and order_status = '0' and deleted = false") int orderCount(Long userId); } \ No newline at end of file