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

Merge remote-tracking branch 'origin/master'

This commit is contained in:
sxu 2025-06-23 17:28:32 +08:00
parent fa6332822c cf0d0035c9
commit 4f7503ffec
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/service/impl/CookDishesServiceImpl.java
View File

@ -220,7 +220,7 @@ public class CookDishesServiceImpl implements ICookDishesService {
log.debug("总和: {}", nutritionEntity.getCalcium()); log.debug("总和: {}", nutritionEntity.getCalcium());
System.err.println("总和：" + nutritionEntity.getCalcium()); System.err.println("总和：" + nutritionEntity.getCalcium());
//计算营养成分 //计算营养成分
countNum(nutritionEntity, Double.valueOf(cookDishes.getWeight() + "")); // countNum(nutritionEntity, Double.valueOf(cookDishes.getWeight() + ""));
System.err.println("计算后：" + nutritionEntity.getCalcium()); System.err.println("计算后：" + nutritionEntity.getCalcium());
log.debug("计算后: {}", nutritionEntity.getCalcium()); log.debug("计算后: {}", nutritionEntity.getCalcium());
cookDishesMapper.updateFinalNutrition(nutritionEntity, cookDishes.getDishesId()); cookDishesMapper.updateFinalNutrition(nutritionEntity, cookDishes.getDishesId());

2
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookNutritionTypeMapper.xml
View File

@ -36,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
resultType="com.bonus.canteen.core.cook.domain.CookNutritionType"> resultType="com.bonus.canteen.core.cook.domain.CookNutritionType">
<include refid="selectCookNutritionTypeVo"/> <include refid="selectCookNutritionTypeVo"/>
where nutrition_type_name = #{nutritionTypeName} where nutrition_type_name = #{nutritionTypeName}
<if test="nutritionTypeId != null and nutritionTypeId != '' "> and parent_id = #{nutritionTypeId}</if> <if test="nutritionTypeId != null and nutritionTypeId != '' "> and nutrition_type_id != #{nutritionTypeId}</if>
limit 1 limit 1
</select> </select>
<select id="checkIsExistChildren" resultType="java.lang.Integer"> <select id="checkIsExistChildren" resultType="java.lang.Integer">