退款
This commit is contained in:
@ -9,22 +9,33 @@ import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
|
||||
import cn.iocoder.yudao.module.system.controller.admin.dishes.vo.DishesPageReqVO;
|
||||
import cn.iocoder.yudao.module.system.controller.admin.dishes.vo.DishesRespVO;
|
||||
import cn.iocoder.yudao.module.system.controller.admin.dishes.vo.DishesSaveReqVO;
|
||||
import cn.iocoder.yudao.module.system.dal.dataobject.carteen.CarteenDO;
|
||||
import cn.iocoder.yudao.module.system.dal.dataobject.dishes.DishesDO;
|
||||
import cn.iocoder.yudao.module.system.dal.dataobject.dishestype.DishesTypeDO;
|
||||
import cn.iocoder.yudao.module.system.service.carteen.CarteenService;
|
||||
import cn.iocoder.yudao.module.system.service.dishes.DishesService;
|
||||
import cn.iocoder.yudao.module.system.service.dishesnutrition.DishesNutritionService;
|
||||
import cn.iocoder.yudao.module.system.service.dishesraw.DishesRawService;
|
||||
import cn.iocoder.yudao.module.system.service.dishestype.DishesTypeService;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.Parameter;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.bind.annotation.DeleteMapping;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.PutMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RequestParam;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import javax.validation.Valid;
|
||||
import java.io.IOException;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
|
||||
import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
|
||||
@ -39,9 +50,9 @@ public class DishesController {
|
||||
@Resource
|
||||
private DishesService dishesService;
|
||||
@Resource
|
||||
private DishesNutritionService dishesNutritionService;
|
||||
private DishesTypeService dishesTypeService;
|
||||
@Resource
|
||||
private DishesRawService dishesRawService;
|
||||
private CarteenService carteenService;
|
||||
|
||||
@PostMapping("/create")
|
||||
@Operation(summary = "创建菜品管理")
|
||||
@ -91,9 +102,18 @@ public class DishesController {
|
||||
HttpServletResponse response) throws IOException {
|
||||
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
|
||||
List<DishesDO> list = dishesService.getDishesPage(pageReqVO).getList();
|
||||
List<DishesRespVO> respVOList = BeanUtils.toBean(list, DishesRespVO.class);
|
||||
//转换类型,门店
|
||||
List<CarteenDO> carteenList = carteenService.getCarteenList();
|
||||
Map<Long, String> carteenMap = carteenList.stream().collect(Collectors.toMap(CarteenDO::getId, CarteenDO::getStoresName));
|
||||
List<DishesTypeDO> dishesTypeList = dishesTypeService.getList();
|
||||
Map<Long, String> dishesTypeMap = dishesTypeList.stream().collect(Collectors.toMap(DishesTypeDO::getId, DishesTypeDO::getDishesTypeName));
|
||||
for(DishesRespVO vo : respVOList){
|
||||
vo.setCarteenName(carteenMap.get(vo.getCarteenId()));
|
||||
vo.setDishecTypeName(dishesTypeMap.get(Long.valueOf(vo.getDishecType())));
|
||||
}
|
||||
// 导出 Excel
|
||||
ExcelUtils.write(response, "菜品管理.xls", "数据", DishesRespVO.class,
|
||||
BeanUtils.toBean(list, DishesRespVO.class));
|
||||
ExcelUtils.write(response, "菜品管理.xls", "数据", DishesRespVO.class,respVOList);
|
||||
}
|
||||
|
||||
}
|
@ -25,34 +25,27 @@ public class DishesRespVO {
|
||||
private String dishesName;
|
||||
|
||||
@Schema(description = "菜品图片", requiredMode = Schema.RequiredMode.REQUIRED, example = "https://www.iocoder.cn")
|
||||
@ExcelProperty("菜品图片")
|
||||
private String dishesImageUrl;
|
||||
|
||||
@Schema(description = "菜品属性", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
@ExcelProperty("菜品属性")
|
||||
private String dishesAttribute;
|
||||
|
||||
@Schema(description = "基本价格(标准)", requiredMode = Schema.RequiredMode.REQUIRED, example = "27937")
|
||||
@ExcelProperty("基本价格(标准)")
|
||||
private BigDecimal dishesBasePrice;
|
||||
|
||||
@Schema(description = "会员价格", requiredMode = Schema.RequiredMode.REQUIRED, example = "21531")
|
||||
@ExcelProperty("会员价格")
|
||||
private BigDecimal dishesVipBasePrice;
|
||||
|
||||
@Schema(description = "称重价格(标准)", requiredMode = Schema.RequiredMode.REQUIRED, example = "6375")
|
||||
|
||||
private BigDecimal dishesWeighPrice;
|
||||
|
||||
@Schema(description = "称重会员价格(标准)", requiredMode = Schema.RequiredMode.REQUIRED, example = "9200")
|
||||
|
||||
private BigDecimal dishesVipWeighPrice;
|
||||
|
||||
@Schema(description = "厨师")
|
||||
private String dishecCook;
|
||||
|
||||
@Schema(description = "菜品类型", example = "1")
|
||||
@ExcelProperty("菜品类型")
|
||||
private String dishecType;
|
||||
|
||||
@Schema(description = "创建时间")
|
||||
@ -63,9 +56,11 @@ public class DishesRespVO {
|
||||
private Long carteenId;
|
||||
|
||||
@Schema(description = "总价格")
|
||||
@ExcelProperty("价格")
|
||||
private BigDecimal dishesSumPrice;
|
||||
|
||||
@Schema(description = "菜品总重量")
|
||||
@ExcelProperty("单位重量")
|
||||
private BigDecimal dishesNumber;
|
||||
|
||||
@Schema(description = "菜品营养", example = "1")
|
||||
@ -75,4 +70,12 @@ public class DishesRespVO {
|
||||
|
||||
@Schema(description = "菜品kcal")
|
||||
private String kcal;
|
||||
|
||||
@Schema(description = "门店")
|
||||
@ExcelProperty("门店")
|
||||
private String carteenName;
|
||||
|
||||
@Schema(description = "菜品类型")
|
||||
@ExcelProperty("菜品类型")
|
||||
private String dishecTypeName;
|
||||
}
|
@ -61,4 +61,8 @@ public interface DishesTypeService {
|
||||
* @return
|
||||
*/
|
||||
List<DishesTypeListRespVO> getDishesTypeList(Long carteenId, LocalDateTime startTime,LocalDateTime endTime);
|
||||
|
||||
List<DishesTypeDO> getList();
|
||||
|
||||
|
||||
}
|
@ -14,13 +14,17 @@ import cn.iocoder.yudao.module.system.dal.mysql.dishes.DishesMapper;
|
||||
import cn.iocoder.yudao.module.system.dal.mysql.dishestype.DishesTypeMapper;
|
||||
import cn.iocoder.yudao.module.system.enums.ErrorCodeConstants;
|
||||
import cn.iocoder.yudao.module.system.enums.TimePeriodEnum;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.*;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.Comparator;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
|
||||
@ -128,4 +132,9 @@ public class DishesTypeServiceImpl implements DishesTypeService {
|
||||
}
|
||||
return list;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<DishesTypeDO> getList() {
|
||||
return dishesTypeMapper.selectList();
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user