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:
gaowdong 2025-06-23 17:54:45 +08:00
parent 6dc82e7a89 cc18c9f36e
commit 965c082f59
8 changed files with 60 additions and 32 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/mapper/CookRecipeDishesMapper.java
View File

@ -37,6 +37,8 @@ public interface CookRecipeDishesMapper {
*/ */
public int insertCookRecipeDishes(CookRecipeDishes cookRecipeDishes); public int insertCookRecipeDishes(CookRecipeDishes cookRecipeDishes);
public int batchInsertCookRecipeDishes(@Param("list") List<CookRecipeDishes> dishesList);
/** /**
* 修改菜品计划菜品关联 * 修改菜品计划菜品关联
* *

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());

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

@ -342,6 +342,7 @@ public class CookRecipeServiceImpl implements ICookRecipeService {
} }
cookRecipeDetailMapper.insertCookRecipeDetail(cookRecipeDetail); //插入菜谱之执行计划 cookRecipeDetailMapper.insertCookRecipeDetail(cookRecipeDetail); //插入菜谱之执行计划
List<CookRecipeDishesDTO> dishesList = detailDTO.getDishesList(); List<CookRecipeDishesDTO> dishesList = detailDTO.getDishesList();
List<CookRecipeDishes> newDishesList = new ArrayList<>();
for (CookRecipeDishesDTO dishesDTO : dishesList) { for (CookRecipeDishesDTO dishesDTO : dishesList) {
CookRecipeDishes cookRecipeDishes = new CookRecipeDishes(); CookRecipeDishes cookRecipeDishes = new CookRecipeDishes();
BeanUtils.copyProperties(dishesDTO, cookRecipeDishes); BeanUtils.copyProperties(dishesDTO, cookRecipeDishes);
@ -354,8 +355,9 @@ public class CookRecipeServiceImpl implements ICookRecipeService {
cookRecipeDishes.setSaleNum(saleNum); cookRecipeDishes.setSaleNum(saleNum);
cookRecipeDishes.setRemanentNum((int) (supplyNum - saleNum)); cookRecipeDishes.setRemanentNum((int) (supplyNum - saleNum));
cookRecipeDishes.setRecipeDetailId(cookRecipeDetail.getRecipeDetailId()); cookRecipeDishes.setRecipeDetailId(cookRecipeDetail.getRecipeDetailId());
cookRecipeDishesMapper.insertCookRecipeDishes(cookRecipeDishes); //插入菜谱之菜品详情 newDishesList.add(cookRecipeDishes);
} }
cookRecipeDishesMapper.batchInsertCookRecipeDishes(newDishesList); //插入菜谱之菜品详情
} }
private void deleteOldCookRecipeDetailsAndDishes(CookRecipeDTO cookRecipeDTO) { private void deleteOldCookRecipeDetailsAndDishes(CookRecipeDTO cookRecipeDTO) {
@ -553,33 +555,35 @@ public class CookRecipeServiceImpl implements ICookRecipeService {
//List<CookRecipeDishes> recipeDishesV2List = Lists.newArrayList(); //List<CookRecipeDishes> recipeDishesV2List = Lists.newArrayList();
for (Long recipeId : recipeMap.keySet()) { for (Long recipeId : recipeMap.keySet()) {
List<CookRecipeDetail> cookRecipeDetailList = detailMap.get(recipeId); List<CookRecipeDetail> cookRecipeDetailList = detailMap.get(recipeId);
for (CookRecipeDetail oldDetail : cookRecipeDetailList) { if (!CollectionUtils.isEmpty(cookRecipeDetailList)) {
Long oldDetailId = oldDetail.getRecipeDetailId(); for (CookRecipeDetail oldDetail : cookRecipeDetailList) {
CookRecipeDetail newRecipeDetail = new CookRecipeDetail(); Long oldDetailId = oldDetail.getRecipeDetailId();
newRecipeDetail.setCreateBy("JOB"); CookRecipeDetail newRecipeDetail = new CookRecipeDetail();
newRecipeDetail.setCreateTime(DateUtils.getNowDate()); newRecipeDetail.setCreateBy("JOB");
newRecipeDetail.setRecipeId(recipeId); newRecipeDetail.setCreateTime(DateUtils.getNowDate());
Long recipeType = recipeTypeMap.get(recipeId); newRecipeDetail.setRecipeId(recipeId);
if (ObjectUtil.equal(recipeType, RecipeTypeEnum.WEEKLY.key())) { Long recipeType = recipeTypeMap.get(recipeId);
newRecipeDetail.setApplyWeek((long)applyDate.getDayOfWeek().getValue()); if (ObjectUtil.equal(recipeType, RecipeTypeEnum.WEEKLY.key())) {
} newRecipeDetail.setApplyWeek((long) applyDate.getDayOfWeek().getValue());
newRecipeDetail.setApplyDate(applyDate); }
newRecipeDetail.setDetailType(RecipeDetailTypeEnum.DETAIL_DATA.key()); newRecipeDetail.setApplyDate(applyDate);
newRecipeDetail.setMealtimeType(oldDetail.getMealtimeType()); newRecipeDetail.setDetailType(RecipeDetailTypeEnum.DETAIL_DATA.key());
newRecipeDetail.setSaleTypeId(oldDetail.getSaleTypeId()); newRecipeDetail.setMealtimeType(oldDetail.getMealtimeType());
cookRecipeDetailMapper.insertCookRecipeDetail(newRecipeDetail); //插入菜谱之执行计划 newRecipeDetail.setSaleTypeId(oldDetail.getSaleTypeId());
Long newDetailId = newRecipeDetail.getRecipeDetailId(); cookRecipeDetailMapper.insertCookRecipeDetail(newRecipeDetail); //插入菜谱之执行计划
List<CookRecipeDishes> dishes = recipeDishes.get(oldDetailId); Long newDetailId = newRecipeDetail.getRecipeDetailId();
for (CookRecipeDishes dishesDTO : dishes) { List<CookRecipeDishes> dishes = recipeDishes.get(oldDetailId);
CookRecipeDishes newRecipeDishes = new CookRecipeDishes(); for (CookRecipeDishes dishesDTO : dishes) {
BeanUtils.copyProperties(dishesDTO, newRecipeDishes); CookRecipeDishes newRecipeDishes = new CookRecipeDishes();
newRecipeDishes.setCreateBy("JOB"); BeanUtils.copyProperties(dishesDTO, newRecipeDishes);
newRecipeDishes.setCreateTime(DateUtils.getNowDate()); newRecipeDishes.setCreateBy("JOB");
long supplyNum = Objects.isNull(newRecipeDishes.getSupplyNum()) ? 0 : newRecipeDishes.getSupplyNum(); newRecipeDishes.setCreateTime(DateUtils.getNowDate());
long saleNum = Objects.isNull(newRecipeDishes.getSaleNum()) ? 0 : newRecipeDishes.getSaleNum(); long supplyNum = Objects.isNull(newRecipeDishes.getSupplyNum()) ? 0 : newRecipeDishes.getSupplyNum();
newRecipeDishes.setRemanentNum((int) (supplyNum - saleNum)); long saleNum = Objects.isNull(newRecipeDishes.getSaleNum()) ? 0 : newRecipeDishes.getSaleNum();
newRecipeDishes.setRecipeDetailId(newDetailId); newRecipeDishes.setRemanentNum((int) (supplyNum - saleNum));
cookRecipeDishesMapper.insertCookRecipeDishes(newRecipeDishes); //插入菜谱之菜品详情 newRecipeDishes.setRecipeDetailId(newDetailId);
cookRecipeDishesMapper.insertCookRecipeDishes(newRecipeDishes); //插入菜谱之菜品详情
}
} }
} }
} }

8
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/controller/KitchenSubPlaceController.java
View File

@ -49,6 +49,14 @@ public class KitchenSubPlaceController extends BaseController {
return getDataTable(list); return getDataTable(list);
} }
@ApiOperation(value = "查询厨房位置信息列表(不分页)")
//@RequiresPermissions("kitchen:place:list")
@GetMapping("/listAll")
public TableDataInfo listAll(KitchenSubPlace kitchenSubPlace) {
List<KitchenSubPlace> list = kitchenSubPlaceService.selectKitchenSubPlaceList(kitchenSubPlace);
return getDataTable(list);
}
/** /**
* 导出厨房位置信息列表 * 导出厨房位置信息列表
*/ */

2
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/KitchenSubPlace.java
View File

@ -40,6 +40,8 @@ public class KitchenSubPlace extends BaseEntity {
private String canteenName; private String canteenName;
private Long areaId;
private String areaName; private String areaName;
/** 仓库id */ /** 仓库id */

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">

11
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookRecipeDishesMapper.xml
View File

@ -96,6 +96,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</trim> </trim>
</insert> </insert>
<insert id="batchInsertCookRecipeDishes" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id">
insert into cook_recipe_dishes (recipe_detail_id, dishes_id, price, sale_price, size_type, supply_num, sale_num,
remanent_num, limit_num, chef_id, recommend_flag, create_by, create_time)
VALUES
<foreach collection="list" item="item" separator=",">
(#{item.recipeDetailId}, #{item.dishesId}, #{item.price}, #{item.salePrice}, #{item.sizeType},
#{item.supplyNum}, #{item.saleNum}, #{item.remanentNum}, #{item.limitNum}, #{item.chefId}, #{item.recommendFlag},
#{item.createBy}, #{item.createTime})
</foreach>
</insert>
<update id="updateCookRecipeDishes" parameterType="com.bonus.canteen.core.cook.domain.CookRecipeDishes"> <update id="updateCookRecipeDishes" parameterType="com.bonus.canteen.core.cook.domain.CookRecipeDishes">
update cook_recipe_dishes update cook_recipe_dishes
<trim prefix="SET" suffixOverrides=","> <trim prefix="SET" suffixOverrides=",">

5
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenSubPlaceMapper.xml
View File

@ -9,6 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="imgUrl" column="img_url" /> <result property="imgUrl" column="img_url" />
<result property="canteenId" column="canteen_id" /> <result property="canteenId" column="canteen_id" />
<result property="canteenName" column="canteen_name" /> <result property="canteenName" column="canteen_name" />
<result property="areaId" column="area_id" />
<result property="areaName" column="area_name" /> <result property="areaName" column="area_name" />
<result property="warehouseId" column="warehouse_id" /> <result property="warehouseId" column="warehouse_id" />
<result property="createBy" column="create_by" /> <result property="createBy" column="create_by" />
@ -18,8 +19,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap> </resultMap>
<sql id="selectKitchenSubPlaceVo"> <sql id="selectKitchenSubPlaceVo">
select ksp.sub_place_id, ksp.sub_place_name, ksp.img_url, ksp.canteen_id, ksp.warehouse_id, select ksp.sub_place_id, ksp.sub_place_name, ksp.img_url, ksp.canteen_id, ksp.warehouse_id, ksp.create_by,
ksp.create_by, ksp.create_time, ksp.update_by, ksp.update_time, bc.canteen_name, ba.area_name ksp.create_time, ksp.update_by, ksp.update_time, bc.canteen_name, ba.area_name, ba.area_id
from kitchen_sub_place ksp from kitchen_sub_place ksp
left join basic_canteen bc on bc.canteen_id = ksp.canteen_id left join basic_canteen bc on bc.canteen_id = ksp.canteen_id
left join basic_area ba on ba.area_id = bc.area_id left join basic_area ba on ba.area_id = bc.area_id