diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/mapper/AppletRecipeH5Mapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/mapper/AppletRecipeH5Mapper.java index 510cda1..b6b40bf 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/mapper/AppletRecipeH5Mapper.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/mapper/AppletRecipeH5Mapper.java @@ -36,6 +36,8 @@ public interface AppletRecipeH5Mapper { List getMenuMaterialById(Long dishesId); + public int getCollectionCountByUserIdAndDishesId(@Param("userId") Long userId, @Param("dishesId") Long dishesId); + @Select({"select md.dishes_name from menu_package_dishes mpd left join menu_dishes md on mpd.dishes_id = md.dishes_id where mpd.del_flag = 2 and mpd.package_id = #{dishesId}"}) List selectDishesName(@Param("dishesId") Long dishesId); diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/AppletRecipeH5ServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/AppletRecipeH5ServiceImpl.java index ba543e4..d06c222 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/AppletRecipeH5ServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/AppletRecipeH5ServiceImpl.java @@ -23,10 +23,12 @@ import com.bonus.canteen.core.menu.service.AppletRecipeH5Service; import com.bonus.canteen.core.menu.service.IMenuRecipeDetailService; import com.bonus.canteen.core.menu.service.IMenuRecipeDishesService; import com.bonus.canteen.core.menu.vo.*; +import com.bonus.canteen.core.nutrition.common.enums.YesOrNoEnum; import com.bonus.common.core.exception.ServiceException; import com.bonus.common.houqin.constant.DelFlagEnum; import com.bonus.common.houqin.i18n.I18n; import com.bonus.common.houqin.utils.id.Id; +import com.bonus.common.security.utils.SecurityUtils; import com.google.common.collect.Lists; import com.google.common.collect.Sets; import org.springframework.beans.factory.annotation.Autowired; @@ -132,6 +134,14 @@ public class AppletRecipeH5ServiceImpl extends ServiceImpl 0) { + appletDishesDetailVO.setIsFavorites(YesOrNoEnum.YES.key()); + } else { + appletDishesDetailVO.setIsFavorites(YesOrNoEnum.NO.key()); + } + return appletDishesDetailVO; // } else { // throw new ServiceException(I18n.getMessage("menu_no_cust_info", new Object[0])); diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/AppletRecipeH5Mapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/AppletRecipeH5Mapper.xml index 72c55d8..51b0527 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/AppletRecipeH5Mapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/AppletRecipeH5Mapper.xml @@ -219,6 +219,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and mmd.del_flag = 2 + +