bonus
/
Bonus-Cloud-Smart-Canteen
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

菜谱详情

This commit is contained in:
sxu 2025-02-11 16:47:55 +08:00
parent 22ab137bc6
commit ac6ca0ea87
3 changed files with 65 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/controller/AppletDishesController.java
View File

@ -10,9 +10,7 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import static com.bonus.common.core.web.domain.AjaxResult.success;
@RestController
@ -33,21 +31,4 @@ public class AppletDishesController {
AppletDishesDetailVO dishesDetailVO = this.menuDishesService.getDishesDetailByDishesId(content, custId);
return success(dishesDetailVO);
}
// @PostMapping({"/like/survey/list"})
// @RequiresGuest
// @ApiOperation("小程序获取点赞调查菜品列表")
// public LeResponse<List<MenuDishesLikeVO>> getMenuDishesLikeList(@RequestHeader("custId") Long custId) {
// List<MenuDishesLikeVO> resultList = this.menuDishesService.getMenuDishesLikeList(custId);
// return LeResponse.succ(resultList);
// }
//
// @PostMapping({"/save/like/survey"})
// @RequiresGuest
// @ApiOperation("小程序点赞调查问卷提交")
// public LeResponse<Void> saveMenuDishesLikeSurvey(@RequestBody LeRequest<List<MenuDishesLikeSaveDTO>> leRequest, @RequestHeader("custId") Long custId) {
// List<MenuDishesLikeSaveDTO> content = (List)leRequest.getContent();
// this.menuDishesService.saveMenuDishesLikeSurvey(custId, content);
// return LeResponse.succ();
// }
}

8
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/service/impl/MenuDishesServiceImpl.java
View File

@ -1,19 +1,13 @@
package com.bonus.core.menu.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.ListUtil;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.bonus.common.core.exception.ServiceException;
import com.bonus.constant.DelFlagEnum;
import com.bonus.constant.LeConstants;
import com.bonus.core.common.utils.LogUtil;
import com.bonus.core.menu.dto.AppletDishesDetailDTO;
import com.bonus.core.menu.entity.MenuCollectionDishes;
import com.bonus.core.menu.entity.MenuDishes;
@ -22,8 +16,6 @@ import com.bonus.core.menu.mapper.MenuDishesMapper;
import com.bonus.core.menu.mapper.MenuMaterialDishesMapper;
import com.bonus.core.menu.mapper.MenuPackageDishesMapper;
import com.bonus.core.menu.service.MenuDishesService;
import com.bonus.core.menu.utils.NutritionEntity;
import com.bonus.core.menu.utils.NutritionEntityUtil;
import com.bonus.core.menu.vo.AppletDishesDetailVO;
import com.bonus.core.menu.vo.AppletDishesSizeV2VO;
import com.bonus.i18n.I18n;

130
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuDishesMapper.xml
View File

@ -293,72 +293,72 @@
<!-- and mpd.package_id = #{packageId}-->
<!-- </select>-->
<!-- <resultMap id="appletDishesDetailVO" type="net.xnzn.core.menu.vo.AppletDishesDetailVO">-->
<!-- <result property="baseDishesId" column="base_dishes_id"/>-->
<!-- <result property="mealType" column="meal_type"/>-->
<!-- <result property="customId" column="custom_d"/>-->
<!-- <result property="dishesName" column="dishes_name"/>-->
<!-- <result property="aliasName" column="alias_name"/>-->
<!-- <result property="imageUrl" column="image_url"/>-->
<!-- <result property="intro" column="intro"/>-->
<!-- <result property="particulars" column="particulars"/>-->
<!-- <collection property="dishesDetailList" ofType="net.xnzn.core.menu.vo.AppletDishesSizeV2VO">-->
<!-- <result property="dishesId" column="dishes_id"/>-->
<!-- <result property="dishesName" column="real_dishes_name"/>-->
<!-- <result property="surplusNum" column="surplus_num"/>-->
<!-- <result property="restrictNum" column="restrict_num"/>-->
<!-- <result property="dishesPrice" column="dishes_price"/>-->
<!-- <result property="prefPrice" column="pref_price"/>-->
<!-- <result property="sizeType" column="size_type"/>-->
<!-- <result property="sizeJson" column="size_json"/>-->
<!-- <result property="calories" column="calories"/>-->
<!-- <result property="protein" column="protein"/>-->
<!-- <result property="fat" column="fat"/>-->
<!-- <result property="carbohydrate" column="carbohydrate"/>-->
<!-- <result property="dietaryFiber" column="dietary_fiber"/>-->
<!-- <result property="cholesterol" column="cholesterol"/>-->
<!-- <result property="calcium" column="calcium"/>-->
<!-- <result property="sodium" column="sodium"/>-->
<!-- </collection>-->
<!-- </resultMap>-->
<resultMap id="appletDishesDetailVO" type="com.bonus.core.menu.vo.AppletDishesDetailVO">
<result property="baseDishesId" column="base_dishes_id"/>
<result property="mealType" column="meal_type"/>
<result property="customId" column="custom_d"/>
<result property="dishesName" column="dishes_name"/>
<result property="aliasName" column="alias_name"/>
<result property="imageUrl" column="image_url"/>
<result property="intro" column="intro"/>
<result property="particulars" column="particulars"/>
<collection property="dishesDetailList" ofType="com.bonus.core.menu.vo.AppletDishesSizeV2VO">
<result property="dishesId" column="dishes_id"/>
<result property="dishesName" column="real_dishes_name"/>
<result property="surplusNum" column="surplus_num"/>
<result property="restrictNum" column="restrict_num"/>
<result property="dishesPrice" column="dishes_price"/>
<result property="prefPrice" column="pref_price"/>
<result property="sizeType" column="size_type"/>
<result property="sizeJson" column="size_json"/>
<result property="calories" column="calories"/>
<result property="protein" column="protein"/>
<result property="fat" column="fat"/>
<result property="carbohydrate" column="carbohydrate"/>
<result property="dietaryFiber" column="dietary_fiber"/>
<result property="cholesterol" column="cholesterol"/>
<result property="calcium" column="calcium"/>
<result property="sodium" column="sodium"/>
</collection>
</resultMap>
<!-- &lt;!&ndash; 根据菜品id获取菜品详情 &ndash;&gt;-->
<!-- <select id="selectDishesDetailByDishesId" resultMap="appletDishesDetailVO">-->
<!-- select-->
<!-- mdb.base_dishes_id,-->
<!-- md.dishes_id,-->
<!-- md.meal_type,-->
<!-- md.custom_id,-->
<!-- mdb.dishes_name,-->
<!-- md.dishes_name as real_dishes_name,-->
<!-- md.alias_name,-->
<!-- md.image_url,-->
<!-- md.intro,-->
<!-- md.particulars,-->
<!-- mrd.size_type,-->
<!-- md.size_json,-->
<!-- mrd.price as dishes_price,-->
<!-- mrd.sale_price as pref_price,-->
<!-- mrd.supply_num - mrd.surplus_num as sales_num,-->
<!-- mrd.surplus_num,-->
<!-- mrd.restrict_num,-->
<!-- md.calories,-->
<!-- md.protein,-->
<!-- md.fat,-->
<!-- md.carbohydrate,-->
<!-- md.dietary_fiber,-->
<!-- md.cholesterol,-->
<!-- md.calcium,-->
<!-- md.sodium-->
<!-- from-->
<!-- menu_dishes_base mdb-->
<!-- left join menu_dishes md on mdb.base_dishes_id = md.base_dishes_id-->
<!-- left join menu_recipe_dishes mrd on md.dishes_id = mrd.dishes_id-->
<!-- where-->
<!-- mdb.base_dishes_id = #{baseDishesId}-->
<!-- and mrd.detail_id = #{detailId}-->
<!-- and md.del_flag = #{delFlag}-->
<!-- </select>-->
<!-- 根据菜品id获取菜品详情 -->
<select id="selectDishesDetailByDishesId" resultMap="appletDishesDetailVO">
select
mdb.base_dishes_id,
md.dishes_id,
md.meal_type,
md.custom_id,
mdb.dishes_name,
md.dishes_name as real_dishes_name,
md.alias_name,
md.image_url,
md.intro,
md.particulars,
mrd.size_type,
md.size_json,
mrd.price as dishes_price,
mrd.sale_price as pref_price,
mrd.supply_num - mrd.surplus_num as sales_num,
mrd.surplus_num,
mrd.restrict_num,
md.calories,
md.protein,
md.fat,
md.carbohydrate,
md.dietary_fiber,
md.cholesterol,
md.calcium,
md.sodium
from
menu_dishes_base mdb
left join menu_dishes md on mdb.base_dishes_id = md.base_dishes_id
left join menu_recipe_dishes mrd on md.dishes_id = mrd.dishes_id
where
mdb.base_dishes_id = #{baseDishesId}
and mrd.detail_id = #{detailId}
and md.del_flag = #{delFlag}
</select>
<!-- &lt;!&ndash; 获取指定食堂首页推荐菜品列表 &ndash;&gt;-->
<!-- <select id="selectIndexRecommendDishesList"-->