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

营养信息添加字段

This commit is contained in:
jjLv 2025-06-12 14:45:27 +08:00
parent 4317612f86
commit e6c6757693
3 changed files with 114 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/domain/CookDishes.java
View File

@ -367,6 +367,23 @@ public class CookDishes extends BaseEntity {
@ApiModelProperty(value = "菜品类型id集合")
private List<Long> typeIds;
private String processingMethod;
private BigDecimal processingTime;
private BigDecimal edible;
private BigDecimal water;
private BigDecimal ash;
private BigDecimal retinol;
private BigDecimal thiamine;
private BigDecimal riboflavin;
private BigDecimal niacin;
private BigDecimal vitaminD;
private BigDecimal phosphorus;
private BigDecimal selenium;
private String salesNum;
private Set<String> dishesNames = new HashSet();
public String getImageUrl() {

29
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/utils/NutritionEntity.java
View File

@ -2,6 +2,8 @@ package com.bonus.canteen.core.utils;
import lombok.Data;
import java.math.BigDecimal;
@Data
public class NutritionEntity {
private Double edible;
@ -62,6 +64,33 @@ public class NutritionEntity {
private Double weight;
private Double totalWeight;
private Double baseWeight;
private Double vitaminD;
private String processingMethod;
private BigDecimal processingTime;
public Double getVitaminD() {
return vitaminD;
}
public void setVitaminD(Double vitaminD) {
this.vitaminD = vitaminD;
}
public String getProcessingMethod() {
return processingMethod;
}
public void setProcessingMethod(String processingMethod) {
this.processingMethod = processingMethod;
}
public BigDecimal getProcessingTime() {
return processingTime;
}
public void setProcessingTime(BigDecimal processingTime) {
this.processingTime = processingTime;
}
public Double getEdible() {
return this.edible;

88
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookDishesMapper.xml
View File

@ -77,6 +77,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="stallName" column="stall_name" />
<result property="areaName" column="area_name" />
<result property="dishesTypeName" column="dishes_type_name" />
<result property="processingMethod" column="processing_method"/>
<result property="processingTime" column="processing_time"/>
<result property="edible" column="edible"/>
<result property="water" column="water"/>
<result property="ash" column="ash"/>
<result property="retinol" column="retinol"/>
<result property="thiamine" column="thiamine"/>
<result property="riboflavin" column="riboflavin"/>
<result property="niacin" column="niacin"/>
<result property="vitaminD" column="vitamin_d"/>
<result property="phosphorus" column="phosphorus"/>
<result property="selenium" column="selenium"/>
<result property="salesNum" column="sales_num"/>
</resultMap>
<resultMap id="appletDishesDetailVO" type="com.bonus.canteen.core.cook.vo.AppletDishesDetailVO">
@ -115,7 +129,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
particulars, recommend, index_recommend, like_survey, like_batch, like_num, initial_score, calories, protein, fat,
carbohydrate, dietary_fiber, cholesterol, calcium, sodium, purine, iron, iodine, kalium, vitamin_a, vitamin_c,
vitamin_e, magnesium, zinc, glycemic_index, sort, cd.canteen_id,bc.canteen_name,cd.shopstall_id,bs.stall_name, hide_flag, convert_flag, material_cost,
gross_profit, gross_profit_rate, public_dishes, cd.area_id,ba.area_name, meal_id, cd.create_by, cd.create_time, cd.update_by, cd.update_time
gross_profit, gross_profit_rate, public_dishes, cd.area_id,ba.area_name, meal_id, cd.create_by, cd.create_time, cd.update_by, cd.update_time,
cd.processing_method, cd.processing_time, cd.edible, cd.water, cd.ash, cd.retinol, cd.thiamine, cd.riboflavin, cd.niacin, vitamin_d,
cd.phosphorus, cd.selenium
from cook_dishes cd
left join basic_area ba on cd.area_id = ba.area_id
left join basic_canteen bc on cd.canteen_id = bc.canteen_id
@ -347,6 +363,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
<if test="processingMethod != null">processing_method,</if>
<if test="processingTime != null">processing_time,</if>
<if test="edible != null">edible,</if>
<if test="water != null">water,</if>
<if test="ash != null">ash,</if>
<if test="retinol != null">retinol,</if>
<if test="thiamine != null">thiamine,</if>
<if test="riboflavin != null">riboflavin,</if>
<if test="niacin != null">niacin,</if>
<if test="vitaminD != null">vitamin_d,</if>
<if test="phosphorus != null">phosphorus,</if>
<if test="selenium != null">selenium,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="mealType != null">#{mealType},</if>
@ -417,6 +445,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="processingMethod != null">#{processingMethod},</if>
<if test="processingTime != null">#{processingTime},</if>
<if test="edible != null">#{edible},</if>
<if test="water != null">#{water},</if>
<if test="ash != null">#{ash},</if>
<if test="retinol != null">#{retinol},</if>
<if test="thiamine != null">#{thiamine},</if>
<if test="riboflavin != null">#{riboflavin},</if>
<if test="niacin != null">#{niacin},</if>
<if test="vitaminD != null">#{vitaminD},</if>
<if test="phosphorus != null">#{phosphorus},</if>
<if test="selenium != null">#{selenium},</if>
</trim>
</insert>
@ -499,6 +539,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="processingMethod != null">processing_method = #{processingMethod},</if>
<if test="processingTime != null">processing_time = #{processingTime},</if>
<if test="edible != null">edible = #{edible},</if>
<if test="water != null">water = #{water},</if>
<if test="ash != null">ash = #{ash},</if>
<if test="retinol != null">retinol = #{retinol},</if>
<if test="thiamine != null">thiamine = #{thiamine},</if>
<if test="riboflavin != null">riboflavin = #{riboflavin},</if>
<if test="niacin != null">niacin = #{niacin},</if>
<if test="vitaminD != null">vitamin_d = #{vitaminD},</if>
<if test="phosphorus != null">phosphorus = #{phosphorus},</if>
<if test="selenium != null">selenium = #{selenium},</if>
</trim>
where dishes_id = #{dishesId}
</update>
@ -523,6 +575,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="bean.vitaminE != null">vitamin_e = #{bean.vitaminE},</if>
<if test="bean.magnesium != null">magnesium = #{bean.magnesium},</if>
<if test="bean.glycemicIndex != null">glycemic_index = #{bean.glycemicIndex},</if>
<if test="bean.zinc != null">zinc = #{bean.zinc},</if>
<if test="bean.phosphorus != null">phosphorus = #{bean.phosphorus},</if>
<if test="bean.selenium != null">selenium = #{bean.selenium},</if>
<if test="bean.water != null">water = #{bean.water},</if>
<if test="bean.ash != null">ash = #{bean.ash},</if>
<if test="bean.retinol != null">retinol = #{bean.retinol},</if>
<if test="bean.thiamine != null">thiamine = #{bean.thiamine},</if>
<if test="bean.riboflavin != null">riboflavin = #{bean.riboflavin},</if>
<if test="bean.niacin != null">niacin = #{bean.niacin},</if>
<if test="bean.edible != null">edible = #{bean.edible},</if>
<if test="bean.vitaminD != null">vitamin_d = #{bean.vitaminD},</if>
<if test="bean.processingMethod != null">processing_method = #{bean.processingMethod},</if>
<if test="bean.processingTime != null">processing_time = #{bean.processingTime},</if>
</trim>
where dishes_id = #{dishesId}
</update>
@ -554,30 +619,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<!-- 根据菜品id获取菜品详情 -->
<select id="selectDishesDetailByDishesId" resultMap="appletDishesDetailVO">
select
md.dishes_id,
md.meal_type,
md.custom_id,
md.dishes_name,
md.dishes_name as real_dishes_name,
md.alias_name,
md.image_url,
md.intro,
md.particulars,
md.*,
mrd.size_type,
md.size_json,
mrd.price as dishes_price,
mrd.sale_price as pref_price,
mrd.supply_num - mrd.remanent_num as sales_num,
mrd.remanent_num,
mrd.limit_num,
md.calories,
md.protein,
md.fat,
md.carbohydrate,
md.dietary_fiber,
md.cholesterol,
md.calcium,
md.sodium
mrd.limit_num
from
cook_dishes md
left join cook_recipe_dishes mrd on md.dishes_id = mrd.dishes_id