From 05d652a3c6c30ade05d0c4a78ab6fa90ebe85880 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Fri, 18 Apr 2025 11:11:26 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E9=A2=84=E8=AE=A2=E9=A4=90=E6=97=B6?= =?UTF-8?q?=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/AllocMobileCanteenQueryDTO.java | 32 +++++++++++++++++++ .../controller/MenuAppRecipeController.java | 12 ++++--- .../menu/service/IMenuAppRecipeService.java | 5 +++ .../impl/MenuAppRecipeServiceImpl.java | 26 +++++++++++++++ 4 files changed, 70 insertions(+), 5 deletions(-) create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/alloc/domain/AllocMobileCanteenQueryDTO.java diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/alloc/domain/AllocMobileCanteenQueryDTO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/alloc/domain/AllocMobileCanteenQueryDTO.java new file mode 100644 index 0000000..3090e90 --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/alloc/domain/AllocMobileCanteenQueryDTO.java @@ -0,0 +1,32 @@ +package com.bonus.canteen.core.alloc.domain; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.time.LocalDate; + +@Data +@ApiModel("移动端查询食堂相关信息 DTO") +public class AllocMobileCanteenQueryDTO { + @ApiModelProperty("食堂id") + private Long canteenId; + @ApiModelProperty("档口id") + private Long stallId; + @ApiModelProperty("报餐天数") + private Integer reportMealDays; + @ApiModelProperty("开始日期") + private LocalDate startDate; + @ApiModelProperty("报餐是否跳过节假日 默认:是") + private String ifBookSkipHoliday; + @ApiModelProperty("订餐限制天数") + private Integer reserveLimitDayNum; + @ApiModelProperty("是否允许预定当天") + private String ifAllowReserveToday; + + @Override + public String toString() { + Long var10000 = this.getCanteenId(); + return "AllocMobileCanteenQueryDTO(canteenId=" + var10000 + ", stallId=" + this.getStallId() + ", reportMealDays=" + this.getReportMealDays() + ", startDate=" + String.valueOf(this.getStartDate()) + ", ifBookSkipHoliday=" + this.getIfBookSkipHoliday() + ")"; + } +} diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/controller/MenuAppRecipeController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/controller/MenuAppRecipeController.java index d0d8e44..77b7b1e 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/controller/MenuAppRecipeController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/controller/MenuAppRecipeController.java @@ -3,6 +3,7 @@ package com.bonus.canteen.core.menu.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; +import com.bonus.canteen.core.alloc.domain.AllocMobileCanteenQueryDTO; import com.bonus.canteen.core.menu.domain.MenuAppRecipe; import com.bonus.canteen.core.menu.dto.AppletReserveRecipeDTO; import com.bonus.canteen.core.menu.service.IMenuAppRecipeService; @@ -117,11 +118,12 @@ public class MenuAppRecipeController extends BaseController { return toAjax(menuAppRecipeService.deleteMenuAppRecipeByIds(ids)); } - /** - * @author jsk - * @param content - * @return - */ + @ApiOperation("移动端-查询预订日期列表") + @PostMapping({"/reserve-date/list"}) + public AjaxResult listReserveDate(@RequestBody AllocMobileCanteenQueryDTO bean) { + return AjaxResult.success(this.menuAppRecipeService.listReserveDate(bean)); + } + @ApiOperation("获取预定餐菜谱详情") @PostMapping({"/reserve/recipe/detail"}) public TableDataInfo getReserveRecipeDetailList(@RequestBody AppletReserveRecipeDTO content) { diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/IMenuAppRecipeService.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/IMenuAppRecipeService.java index 095ff94..7a0c122 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/IMenuAppRecipeService.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/IMenuAppRecipeService.java @@ -1,6 +1,9 @@ package com.bonus.canteen.core.menu.service; +import java.time.LocalDate; import java.util.List; + +import com.bonus.canteen.core.alloc.domain.AllocMobileCanteenQueryDTO; import com.bonus.canteen.core.menu.domain.MenuAppRecipe; import com.bonus.canteen.core.menu.dto.AppletReserveRecipeDTO; import com.bonus.canteen.core.menu.vo.AppletReserveRecipeVO; @@ -60,5 +63,7 @@ public interface IMenuAppRecipeService { */ public int deleteMenuAppRecipeById(Long id); + public List listReserveDate(AllocMobileCanteenQueryDTO queryDTO); + public List getReserveRecipeDetailList(AppletReserveRecipeDTO content); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuAppRecipeServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuAppRecipeServiceImpl.java index cebbf40..5fe3451 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuAppRecipeServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuAppRecipeServiceImpl.java @@ -9,6 +9,7 @@ import java.util.stream.Collectors; import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.bonus.canteen.core.alloc.domain.AllocMobileCanteenQueryDTO; import com.bonus.canteen.core.alloc.domain.AllocStall; import com.bonus.canteen.core.alloc.domain.AllocStallMealtime; import com.bonus.canteen.core.alloc.mapper.AllocStallMapper; @@ -18,6 +19,7 @@ import com.bonus.canteen.core.menu.service.IMenuAppRecipeService; import com.bonus.canteen.core.menu.vo.AppletReserveRecipeDishesVO; import com.bonus.canteen.core.menu.vo.AppletReserveRecipeTypeVO; import com.bonus.canteen.core.menu.vo.AppletReserveRecipeVO; +import com.bonus.canteen.core.utils.BnsConstants; import com.bonus.common.core.exception.ServiceException; import com.bonus.common.core.utils.DateUtils; import com.bonus.common.houqin.constant.DelFlagEnum; @@ -118,6 +120,30 @@ public class MenuAppRecipeServiceImpl implements IMenuAppRecipeService { return menuAppRecipeMapper.deleteMenuAppRecipeById(id); } + @Override + public List listReserveDate(AllocMobileCanteenQueryDTO queryDTO) { + return this.listMatchData(queryDTO.getReserveLimitDayNum(), queryDTO.getIfAllowReserveToday()); + } + + private List listMatchData(Integer reserveLimitDayNum, String ifAllowReserveToday) { + log.info(String.format("查询日期,天数:%d", reserveLimitDayNum)); + List reserveDateList = new ArrayList(); + LocalDate startDate; + if (BnsConstants.COMMON_YES.equals(ifAllowReserveToday)) { + log.info("允许预定当天"); + startDate = LocalDate.now(); + } else { + log.info("不允许预定当天"); + startDate = LocalDate.now().plusDays(1L); + } + + for(int i = 0; i < reserveLimitDayNum; ++i) { + reserveDateList.add(startDate.plusDays((long)i)); + } + + return reserveDateList; + } + @Override public List getReserveRecipeDetailList(AppletReserveRecipeDTO content) { List resultList = menuAppRecipeMapper.selectReserveRecipe(content.getApplyDate(), content.getRecipeId()); From 2ea049b31e6991616dab386eb63993ce4d58cc7b Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Fri, 18 Apr 2025 13:14:23 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=8F=9C=E5=93=81relatio?= =?UTF-8?q?n=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/menu/mapper/MenuDishesMapper.java | 6 -- .../service/impl/MenuDishesServiceImpl.java | 47 ------------ .../mapper/menu/MenuDishesMapper.xml | 72 ------------------- 3 files changed, 125 deletions(-) diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/mapper/MenuDishesMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/mapper/MenuDishesMapper.java index 366562d..4269f69 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/mapper/MenuDishesMapper.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/mapper/MenuDishesMapper.java @@ -72,12 +72,6 @@ public interface MenuDishesMapper { int addMenuDishes(MenuDishesDTO menuDishesDTO); - int adddishesLabel(MenuDishesRelation menuDishesRelation); - int adddishesTaste(MenuDishesRelation menuDishesRelation); - int adddishesSeason(MenuDishesRelation menuDishesRelation); - int adddishesSuit(MenuDishesRelation menuDishesRelation); - int adddishesMeal(MenuDishesRelation menuDishesRelation); - NutritionEntity getNutritionEntity(MenuDishesAddMaterialDTO dto); int addFinalNutrition(NutritionEntity nutritionEntity); diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuDishesServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuDishesServiceImpl.java index a994837..d45322a 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuDishesServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuDishesServiceImpl.java @@ -144,53 +144,6 @@ public class MenuDishesServiceImpl implements IMenuDishesService { //添加主要信息 int dishesNum = menuDishesMapper.addMenuDishes(menuDishesDTO); - //添加菜品关联信息 - //标签 - List labelIdList = menuDishesDTO.getLabelIdList(); - for (Integer i: labelIdList) { - MenuDishesRelation menuDishesRelation = new MenuDishesRelation(); - menuDishesRelation.setKeyWordId(i); - menuDishesRelation.setCrby(SecurityUtils.getUserId()); - menuDishesRelation.setDishesId(dishesId); - menuDishesMapper.adddishesLabel(menuDishesRelation); - } - //口味 - List tasteIdList = menuDishesDTO.getTasteIdList(); - for (Integer i: tasteIdList) { - MenuDishesRelation menuDishesRelation = new MenuDishesRelation(); - menuDishesRelation.setKeyWordId(i); - menuDishesRelation.setCrby(SecurityUtils.getUserId()); - menuDishesRelation.setDishesId(dishesId); - menuDishesMapper.adddishesTaste(menuDishesRelation); - } - //季节分类 - List seasonList = menuDishesDTO.getSeason(); - for (Integer i: tasteIdList) { - MenuDishesRelation menuDishesRelation = new MenuDishesRelation(); - menuDishesRelation.setKeyWordId(i); - menuDishesRelation.setCrby(SecurityUtils.getUserId()); - menuDishesRelation.setDishesId(dishesId); - menuDishesMapper.adddishesSeason(menuDishesRelation); - } - //适宜人群 - List suitIdList = menuDishesDTO.getSuitIdList(); - for (Integer i: suitIdList) { - MenuDishesRelation menuDishesRelation = new MenuDishesRelation(); - menuDishesRelation.setKeyWordId(i); - menuDishesRelation.setCrby(SecurityUtils.getUserId()); - menuDishesRelation.setDishesId(dishesId); - menuDishesMapper.adddishesSuit(menuDishesRelation); - } - //餐次 - List mealList= menuDishesDTO.getMealList(); - for (Integer i: mealList) { - MenuDishesRelation menuDishesRelation = new MenuDishesRelation(); - menuDishesRelation.setKeyWordId(i); - menuDishesRelation.setCrby(SecurityUtils.getUserId()); - menuDishesRelation.setDishesId(dishesId); - menuDishesMapper.adddishesMeal(menuDishesRelation); - } - List materialList= menuDishesDTO.getMaterialList(); List nutritionEntityList = new ArrayList<>(); System.err.println("长度："+materialList.size()); diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuDishesMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuDishesMapper.xml index 3fb78fc..7cc7794 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuDishesMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuDishesMapper.xml @@ -429,78 +429,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - - insert into menu_dishes_label_relation - - label_id, - dishes_id, - crby, - - - #{keyWordId}, - #{dishesId}, - #{crby}, - - - - - - insert into menu_dishes_taste_relation - - taste_id, - dishes_id, - crby, - - - #{keyWordId}, - #{dishesId}, - #{crby}, - - - - - insert into menu_dishes_season_relation - - season_id, - dishes_id, - crby, - - - #{keyWordId}, - #{dishesId}, - #{crby}, - - - - - insert into menu_dishes_suit_relation - - suit_id, - dishes_id, - crby, - - - #{keyWordId}, - #{dishesId}, - #{crby}, - - - - - insert into menu_dishes_meal_relation - - meal_id, - dishes_id, - crby, - - - #{keyWordId}, - #{dishesId}, - #{crby}, - - - + select + ac.canteen_id, + ac.canteen_name, + ac.img_url as canteen_img_url, + ass.stall_id, + ass.stall_name, + ass.img_url as stall_img_url, + mr.recipe_id, + ac.start_business_time as start_business_time_ac, + ac.end_business_time as end_business_time_ac, + ac.business_state as business_state_ac, + ass.start_business_time, + ass.end_business_time, + ass.business_state + from + menu_app_recipe mar + left join menu_recipe mr on mar.recipe_id = mr.recipe_id + left join alloc_canteen ac on mr.canteen_id = ac.canteen_id + left join alloc_stall ass on mr.stall_id = ass.stall_id + where + bind_type = 2 + + + +