修改菜品逻辑

This commit is contained in:
seesaw
2024-08-19 14:54:34 +08:00
parent a12212c689
commit 6b0d087135

View File

@ -1,6 +1,7 @@
package cn.iocoder.yudao.module.system.service.devuce;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
@ -21,11 +22,13 @@ import cn.iocoder.yudao.module.system.dal.mysql.dishesnutrition.DishesNutritionM
import cn.iocoder.yudao.module.system.dal.mysql.dishestype.DishesTypeMapper;
import cn.iocoder.yudao.module.system.enums.ErrorCodeConstants;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@ -245,8 +248,28 @@ public class DevuceServiceImpl implements DevuceService {
@Override
public List<DevuceListVO> getList(Long storeId) {
List<DevuceListVO> list = devuceMapper.getList(storeId);
return list;
ArrayList<DevuceListVO> devuceListVOS = new ArrayList<>();
List<DeviceInfoDO> deviceInfoDOS = deviceInfoMapper.selectList(Wrappers.<DeviceInfoDO>lambdaQuery()
.eq(DeviceInfoDO::getCarteenId, storeId));
if(CollectionUtil.isEmpty(deviceInfoDOS)){
return devuceListVOS;
}
List<String> collect = deviceInfoDOS.stream().map(DeviceInfoDO::getDeviceIp).collect(Collectors.toList());
List<DevuceDO> devuceDOS = devuceMapper.selectList(Wrappers.<DevuceDO>lambdaQuery()
.in(DevuceDO::getDeviceSn, collect)
.eq(DevuceDO::getBind, true));
if(CollectionUtil.isEmpty(devuceDOS)){
return devuceListVOS;
}
for (DevuceDO devuceDO:devuceDOS){
DevuceListVO devuceListVO = new DevuceListVO();
BeanUtil.copyProperties(devuceDO,devuceListVO);
String dishesName = dishesMapper.selectById(devuceDO.getDishesId()).getDishesName();
devuceListVO.setDishesName(dishesName);
devuceListVOS.add(devuceListVO);
}
return devuceListVOS;
}
}