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

删除无用vo

This commit is contained in:
sxu 2025-06-08 12:56:11 +08:00
parent 2f8f7f9e9a
commit 85ddb86e6a
21 changed files with 531 additions and 532 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/dto/CookH5ReserveRecipeDTO.java
View File

@ -1,21 +1,21 @@
package com.bonus.canteen.core.cook.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotNull;
import java.time.LocalDate;
/**
* @author xliu
* @date 2025/5/28 14:01
*/
@Data
public class CookH5ReserveRecipeDTO {
@ApiModelProperty("菜谱日期")
private @NotNull LocalDate applyDate;
@ApiModelProperty("菜谱id")
private @NotNull Long recipeId;
@ApiModelProperty("人员id")
private Long userId;
}
//package com.bonus.canteen.core.cook.dto;
//
//import io.swagger.annotations.ApiModelProperty;
//import lombok.Data;
//
//import javax.validation.constraints.NotNull;
//import java.time.LocalDate;
//
///**
// * @author xliu
// * @date 2025/5/28 14:01
// */
//@Data
//public class CookH5ReserveRecipeDTO {
// @ApiModelProperty("菜谱日期")
// private @NotNull LocalDate applyDate;
// @ApiModelProperty("菜谱id")
// private @NotNull Long recipeId;
// @ApiModelProperty("人员id")
// private Long userId;
//}

42
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/dto/CookH5WeekDetailsDTO.java
View File

@ -1,21 +1,21 @@
package com.bonus.canteen.core.cook.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalDate;
/**
* @author xliu
* @date 2025/5/28 9:57
*/
@Data
public class CookH5WeekDetailsDTO {
@ApiModelProperty("菜谱日期")
private LocalDate applyDate;
@ApiModelProperty("人员id")
private Long UserId;
@ApiModelProperty("菜谱id")
private Long recipeId;
private String date;
}
//package com.bonus.canteen.core.cook.dto;
//
//import io.swagger.annotations.ApiModelProperty;
//import lombok.Data;
//
//import java.time.LocalDate;
//
///**
// * @author xliu
// * @date 2025/5/28 9:57
// */
//@Data
//public class CookH5WeekDetailsDTO {
// @ApiModelProperty("菜谱日期")
// private LocalDate applyDate;
// @ApiModelProperty("人员id")
// private Long UserId;
// @ApiModelProperty("菜谱id")
// private Long recipeId;
// private String date;
//}

26
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/dto/UserInfoDTO.java
View File

@ -1,13 +1,13 @@
package com.bonus.canteen.core.cook.dto;
import lombok.Data;
/**
* @author xliu
* @date 2025/5/28 9:38
*/
@Data
public class UserInfoDTO {
private Integer userId;
private Integer[] deptIds;
}
//package com.bonus.canteen.core.cook.dto;
//
//import lombok.Data;
//
///**
// * @author xliu
// * @date 2025/5/28 9:38
// */
//@Data
//public class UserInfoDTO {
// private Integer userId;
// private Integer[] deptIds;
//}

46
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/vo/CookH5AllocDeliveryCostVO.java
View File

@ -1,23 +1,23 @@
package com.bonus.canteen.core.cook.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
/**
* @author xliu
* @date 2025/5/28 14:10
*/
@Data
public class CookH5AllocDeliveryCostVO {
@ApiModelProperty("配送方式")
private Integer deliveryType;
@ApiModelProperty("配送名称")
private String deliveryName;
@ApiModelProperty("配送费")
private BigDecimal deliveryAmount;
@ApiModelProperty("包装费")
private BigDecimal packingFee;
}
//package com.bonus.canteen.core.cook.vo;
//
//import io.swagger.annotations.ApiModelProperty;
//import lombok.Data;
//
//import java.math.BigDecimal;
//
///**
// * @author xliu
// * @date 2025/5/28 14:10
// */
//@Data
//public class CookH5AllocDeliveryCostVO {
//
// @ApiModelProperty("配送方式")
// private Integer deliveryType;
// @ApiModelProperty("配送名称")
// private String deliveryName;
// @ApiModelProperty("配送费")
// private BigDecimal deliveryAmount;
// @ApiModelProperty("包装费")
// private BigDecimal packingFee;
//}

70
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/vo/CookH5CurrentDishesDetailVO.java
View File

@ -1,35 +1,35 @@
package com.bonus.canteen.core.cook.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
/**
* @author xliu
* @date 2025/5/28 14:09
*/
@Data
public class CookH5CurrentDishesDetailVO {
@ApiModelProperty("菜品id")
private Long dishesId;
@ApiModelProperty("菜品名称")
private String dishesName;
@ApiModelProperty("库存数量")
private Integer remanentNum;
@ApiModelProperty("限购数量")
private Integer limitNum;
@ApiModelProperty("菜品价格")
private Integer dishesPrice;
@ApiModelProperty("优惠价")
private Integer prefPrice;
@ApiModelProperty("规格类型(1-标准,2-大份,3-小份,4-50g,5-100g)")
private Long sizeType;
@ApiModelProperty("菜品规格")
private String sizeJson;
@ApiModelProperty("月销量")
private Integer monthlySales;
@ApiModelProperty("好评率")
private BigDecimal goodProbability;
private CookH5ReserveDishesNutritionVO nutritionInfo;
}
//package com.bonus.canteen.core.cook.vo;
//
//import io.swagger.annotations.ApiModelProperty;
//import lombok.Data;
//
//import java.math.BigDecimal;
//
///**
// * @author xliu
// * @date 2025/5/28 14:09
// */
//@Data
//public class CookH5CurrentDishesDetailVO {
// @ApiModelProperty("菜品id")
// private Long dishesId;
// @ApiModelProperty("菜品名称")
// private String dishesName;
// @ApiModelProperty("库存数量")
// private Integer remanentNum;
// @ApiModelProperty("限购数量")
// private Integer limitNum;
// @ApiModelProperty("菜品价格")
// private Integer dishesPrice;
// @ApiModelProperty("优惠价")
// private Integer prefPrice;
// @ApiModelProperty("规格类型(1-标准,2-大份,3-小份,4-50g,5-100g)")
// private Long sizeType;
// @ApiModelProperty("菜品规格")
// private String sizeJson;
// @ApiModelProperty("月销量")
// private Integer monthlySales;
// @ApiModelProperty("好评率")
// private BigDecimal goodProbability;
// private CookH5ReserveDishesNutritionVO nutritionInfo;
//}

66
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/vo/CookH5ReserveCanteenListVO.java
View File

@ -1,33 +1,33 @@
package com.bonus.canteen.core.cook.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalTime;
import java.util.List;
/**
* @author xliu
* @date 2025/5/28 10:31
*/
@Data
public class CookH5ReserveCanteenListVO {
@ApiModelProperty("食堂id")
private Long canteenId;
@ApiModelProperty("食堂名称")
private String canteenName;
@ApiModelProperty("食堂营业状态")
private Integer canteenState;
@ApiModelProperty("食堂图片")
private String canteenImgUrl;
@ApiModelProperty("月销量")
private Integer monthlySales;
@ApiModelProperty("营业开始时间")
private LocalTime startBusinessTime;
@ApiModelProperty("营业结束时间")
private LocalTime endBusinessTime;
@ApiModelProperty("食堂营业状态")
private Integer businessState;
@ApiModelProperty("档口菜谱")
private List<CookH5ReserveStallVO> stallList;
}
//package com.bonus.canteen.core.cook.vo;
//
//import io.swagger.annotations.ApiModelProperty;
//import lombok.Data;
//
//import java.time.LocalTime;
//import java.util.List;
//
///**
// * @author xliu
// * @date 2025/5/28 10:31
// */
//@Data
//public class CookH5ReserveCanteenListVO {
// @ApiModelProperty("食堂id")
// private Long canteenId;
// @ApiModelProperty("食堂名称")
// private String canteenName;
// @ApiModelProperty("食堂营业状态")
// private Integer canteenState;
// @ApiModelProperty("食堂图片")
// private String canteenImgUrl;
// @ApiModelProperty("月销量")
// private Integer monthlySales;
// @ApiModelProperty("营业开始时间")
// private LocalTime startBusinessTime;
// @ApiModelProperty("营业结束时间")
// private LocalTime endBusinessTime;
// @ApiModelProperty("食堂营业状态")
// private Integer businessState;
// @ApiModelProperty("档口菜谱")
// private List<CookH5ReserveStallVO> stallList;
//}

112
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/vo/CookH5ReserveDishesNutritionVO.java
View File

@ -1,56 +1,56 @@
package com.bonus.canteen.core.cook.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author xliu
* @date 2025/5/28 16:47
*/
@Data
public class CookH5ReserveDishesNutritionVO {
@ApiModelProperty("菜品id")
private Long dishesId;
@ApiModelProperty("菜品初始推荐分值")
private Integer initialScore;
@ApiModelProperty("菜品分类名称")
private String classifyName;
@ApiModelProperty("热量(千卡/100g)")
private Double calories;
@ApiModelProperty("蛋白质(g/100g)")
private Double protein;
@ApiModelProperty("脂肪(g/100g)")
private Double fat;
@ApiModelProperty("碳水化合物(g/100g)")
private Double carbohydrate;
@ApiModelProperty("膳食纤维(g/100g)")
private Double dietaryFiber;
@ApiModelProperty("胆固醇(mg/100g)")
private Double cholesterol;
@ApiModelProperty("钙(mg/100g)")
private Double calcium;
@ApiModelProperty("钠(mg/100g)")
private Double sodium;
@ApiModelProperty("总嘌呤含量(mg/100g)")
private Double purine;
@ApiModelProperty("铁(mg/100g)")
private Double iron;
@ApiModelProperty("碘(μg/100g)")
private Double iodine;
@ApiModelProperty("钾(mg/100g)")
private Double kalium;
@ApiModelProperty("维生素a(μg/100g)")
private Double vitaminA;
@ApiModelProperty("维生素c(mg/100g)")
private Double vitaminC;
@ApiModelProperty("维生素e(g/100g)")
private Double vitaminE;
@ApiModelProperty("镁(mg/100g)")
private Double magnesium;
@ApiModelProperty("锌(mg/100g)")
private Double zinc;
@ApiModelProperty("血糖生成指数(GI)")
private Double glycemicIndex;
}
//package com.bonus.canteen.core.cook.vo;
//
//import io.swagger.annotations.ApiModelProperty;
//import lombok.Data;
//
///**
// * @author xliu
// * @date 2025/5/28 16:47
// */
//@Data
//public class CookH5ReserveDishesNutritionVO {
//
// @ApiModelProperty("菜品id")
// private Long dishesId;
// @ApiModelProperty("菜品初始推荐分值")
// private Integer initialScore;
// @ApiModelProperty("菜品分类名称")
// private String classifyName;
// @ApiModelProperty("热量(千卡/100g)")
// private Double calories;
// @ApiModelProperty("蛋白质(g/100g)")
// private Double protein;
// @ApiModelProperty("脂肪(g/100g)")
// private Double fat;
// @ApiModelProperty("碳水化合物(g/100g)")
// private Double carbohydrate;
// @ApiModelProperty("膳食纤维(g/100g)")
// private Double dietaryFiber;
// @ApiModelProperty("胆固醇(mg/100g)")
// private Double cholesterol;
// @ApiModelProperty("钙(mg/100g)")
// private Double calcium;
// @ApiModelProperty("钠(mg/100g)")
// private Double sodium;
// @ApiModelProperty("总嘌呤含量(mg/100g)")
// private Double purine;
// @ApiModelProperty("铁(mg/100g)")
// private Double iron;
// @ApiModelProperty("碘(μg/100g)")
// private Double iodine;
// @ApiModelProperty("钾(mg/100g)")
// private Double kalium;
// @ApiModelProperty("维生素a(μg/100g)")
// private Double vitaminA;
// @ApiModelProperty("维生素c(mg/100g)")
// private Double vitaminC;
// @ApiModelProperty("维生素e(g/100g)")
// private Double vitaminE;
// @ApiModelProperty("镁(mg/100g)")
// private Double magnesium;
// @ApiModelProperty("锌(mg/100g)")
// private Double zinc;
// @ApiModelProperty("血糖生成指数(GI)")
// private Double glycemicIndex;
//
//}

40
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/vo/CookH5ReserveDishesVO.java
View File

@ -1,20 +1,20 @@
package com.bonus.canteen.core.cook.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author xliu
* @date 2025/5/28 10:33
*/
@Data
public class CookH5ReserveDishesVO {
@ApiModelProperty("菜品id")
private Long dishesId;
@ApiModelProperty("菜品名称")
private String dishesName;
@ApiModelProperty("菜品价格")
private Integer dishesPrice;
@ApiModelProperty("菜品图片")
private String dishesImgUrl;
}
//package com.bonus.canteen.core.cook.vo;
//
//import io.swagger.annotations.ApiModelProperty;
//import lombok.Data;
//
///**
// * @author xliu
// * @date 2025/5/28 10:33
// */
//@Data
//public class CookH5ReserveDishesVO {
// @ApiModelProperty("菜品id")
// private Long dishesId;
// @ApiModelProperty("菜品名称")
// private String dishesName;
// @ApiModelProperty("菜品价格")
// private Integer dishesPrice;
// @ApiModelProperty("菜品图片")
// private String dishesImgUrl;
//}

46
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/vo/CookH5ReserveMealtimeStateVO.java
View File

@ -1,23 +1,23 @@
package com.bonus.canteen.core.cook.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalTime;
/**
* @author xliu
* @date 2025/5/28 16:04
*/
@ApiModel("餐次时段状态Model")
@Data
public class CookH5ReserveMealtimeStateVO {
@ApiModelProperty("餐次类型")
private Integer mealtimeType;
@ApiModelProperty("是否启用")
private Integer ifUse;
@ApiModelProperty("餐次时段")
private LocalTime startTime;
private LocalTime endTime;
}
//package com.bonus.canteen.core.cook.vo;
//
//import io.swagger.annotations.ApiModel;
//import io.swagger.annotations.ApiModelProperty;
//import lombok.Data;
//
//import java.time.LocalTime;
//
///**
// * @author xliu
// * @date 2025/5/28 16:04
// */
//@ApiModel("餐次时段状态Model")
//@Data
//public class CookH5ReserveMealtimeStateVO {
// @ApiModelProperty("餐次类型")
// private Integer mealtimeType;
// @ApiModelProperty("是否启用")
// private Integer ifUse;
// @ApiModelProperty("餐次时段")
// private LocalTime startTime;
// private LocalTime endTime;
//}

44
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/vo/CookH5ReserveRecipeDetailsVO.java
View File

@ -1,22 +1,22 @@
package com.bonus.canteen.core.cook.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* @author xliu
* @date 2025/5/28 14:03
*/
@Data
public class CookH5ReserveRecipeDetailsVO {
@ApiModelProperty("餐次类型")
private Integer mealtimeType;
@ApiModelProperty("餐次名称")
private String mealtimeName;
@ApiModelProperty("分类详情")
private List<CookH5ReserveRecipeTypeVO> typeList;
}
//package com.bonus.canteen.core.cook.vo;
//
//import io.swagger.annotations.ApiModelProperty;
//import lombok.Data;
//
//import java.util.List;
//
///**
// * @author xliu
// * @date 2025/5/28 14:03
// */
//@Data
//public class CookH5ReserveRecipeDetailsVO {
//
// @ApiModelProperty("餐次类型")
// private Integer mealtimeType;
// @ApiModelProperty("餐次名称")
// private String mealtimeName;
// @ApiModelProperty("分类详情")
// private List<CookH5ReserveRecipeTypeVO> typeList;
//
//}

92
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/vo/CookH5ReserveRecipeDishesVO.java
View File

@ -1,46 +1,46 @@
package com.bonus.canteen.core.cook.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.List;
/**
* @author xliu
* @date 2025/5/28 14:07
*/
@Data
public class CookH5ReserveRecipeDishesVO {
@ApiModelProperty("菜品id")
private Long dishesId;
@ApiModelProperty("菜品名称")
private String dishesName;
@ApiModelProperty("菜品类型")
private Integer detailType;
@ApiModelProperty("菜品图片")
private String dishesImgUrl;
@ApiModelProperty("菜谱详情id")
private Long recipeDetailId;
@ApiModelProperty("食堂id")
private Long canteenId;
@ApiModelProperty("食堂名称")
private String canteenName;
@ApiModelProperty("档口id")
private Long stallId;
@ApiModelProperty("档口名称")
private String stallName;
@ApiModelProperty("菜品推荐分值")
private Integer initialScore;
@ApiModelProperty("月销量")
private Integer monthlySales;
@ApiModelProperty("好评率")
private BigDecimal goodProbability;
@ApiModelProperty("是否推荐")
private Integer recommendFlag;
@ApiModelProperty("大小份详情")
private List<CookH5CurrentDishesDetailVO> dishesDetailList;
@ApiModelProperty("配送方式列表")
private List<CookH5AllocDeliveryCostVO> costModelList;
}
//package com.bonus.canteen.core.cook.vo;
//
//import io.swagger.annotations.ApiModelProperty;
//import lombok.Data;
//
//import java.math.BigDecimal;
//import java.util.List;
//
///**
// * @author xliu
// * @date 2025/5/28 14:07
// */
//@Data
//public class CookH5ReserveRecipeDishesVO {
// @ApiModelProperty("菜品id")
// private Long dishesId;
// @ApiModelProperty("菜品名称")
// private String dishesName;
// @ApiModelProperty("菜品类型")
// private Integer detailType;
// @ApiModelProperty("菜品图片")
// private String dishesImgUrl;
// @ApiModelProperty("菜谱详情id")
// private Long recipeDetailId;
// @ApiModelProperty("食堂id")
// private Long canteenId;
// @ApiModelProperty("食堂名称")
// private String canteenName;
// @ApiModelProperty("档口id")
// private Long stallId;
// @ApiModelProperty("档口名称")
// private String stallName;
// @ApiModelProperty("菜品推荐分值")
// private Integer initialScore;
// @ApiModelProperty("月销量")
// private Integer monthlySales;
// @ApiModelProperty("好评率")
// private BigDecimal goodProbability;
// @ApiModelProperty("是否推荐")
// private Integer recommendFlag;
// @ApiModelProperty("大小份详情")
// private List<CookH5CurrentDishesDetailVO> dishesDetailList;
// @ApiModelProperty("配送方式列表")
// private List<CookH5AllocDeliveryCostVO> costModelList;
//
//}

44
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/vo/CookH5ReserveRecipeTypeVO.java
View File

@ -1,22 +1,22 @@
package com.bonus.canteen.core.cook.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* @author xliu
* @date 2025/5/28 14:04
*/
@Data
public class CookH5ReserveRecipeTypeVO {
@ApiModelProperty("菜品类别id")
private Long typeId;
@ApiModelProperty("菜品类别名称")
private String typeName;
@ApiModelProperty("菜品详情")
private List<CookH5ReserveRecipeDishesVO> dishesList;
}
//package com.bonus.canteen.core.cook.vo;
//
//import io.swagger.annotations.ApiModelProperty;
//import lombok.Data;
//
//import java.util.List;
//
///**
// * @author xliu
// * @date 2025/5/28 14:04
// */
//@Data
//public class CookH5ReserveRecipeTypeVO {
//
// @ApiModelProperty("菜品类别id")
// private Long typeId;
// @ApiModelProperty("菜品类别名称")
// private String typeName;
// @ApiModelProperty("菜品详情")
// private List<CookH5ReserveRecipeDishesVO> dishesList;
//
//}

78
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/vo/CookH5ReserveStallVO.java
View File

@ -1,39 +1,39 @@
package com.bonus.canteen.core.cook.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalTime;
import java.util.List;
/**
* @author xliu
* @date 2025/5/28 10:32
*/
@Data
public class CookH5ReserveStallVO {
@ApiModelProperty("档口id")
private Long stallId;
@ApiModelProperty("档口名称")
private String stallName;
@ApiModelProperty("档口营业状态")
private Integer stallState;
@ApiModelProperty("档口图片")
private String stallImgUrl;
@ApiModelProperty("营业开始时间")
private LocalTime stallStartTime;
@ApiModelProperty("营业结束时间")
private LocalTime stallEndTime;
@ApiModelProperty("菜谱id")
private Long recipeId;
@ApiModelProperty("月销量")
private Integer monthlySales;
@ApiModelProperty("营业开始时间")
private LocalTime startBusinessTime;
@ApiModelProperty("营业结束时间")
private LocalTime endBusinessTime;
@ApiModelProperty("食堂营业状态")
private Integer businessState;
@ApiModelProperty("推荐菜品")
private List<CookH5ReserveDishesVO> recommendList;
}
//package com.bonus.canteen.core.cook.vo;
//
//import io.swagger.annotations.ApiModelProperty;
//import lombok.Data;
//
//import java.time.LocalTime;
//import java.util.List;
//
///**
// * @author xliu
// * @date 2025/5/28 10:32
// */
//@Data
//public class CookH5ReserveStallVO {
// @ApiModelProperty("档口id")
// private Long stallId;
// @ApiModelProperty("档口名称")
// private String stallName;
// @ApiModelProperty("档口营业状态")
// private Integer stallState;
// @ApiModelProperty("档口图片")
// private String stallImgUrl;
// @ApiModelProperty("营业开始时间")
// private LocalTime stallStartTime;
// @ApiModelProperty("营业结束时间")
// private LocalTime stallEndTime;
// @ApiModelProperty("菜谱id")
// private Long recipeId;
// @ApiModelProperty("月销量")
// private Integer monthlySales;
// @ApiModelProperty("营业开始时间")
// private LocalTime startBusinessTime;
// @ApiModelProperty("营业结束时间")
// private LocalTime endBusinessTime;
// @ApiModelProperty("食堂营业状态")
// private Integer businessState;
// @ApiModelProperty("推荐菜品")
// private List<CookH5ReserveDishesVO> recommendList;
//}

48
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/vo/CookH5WeekCanteenListVO.java
View File

@ -1,24 +1,24 @@
package com.bonus.canteen.core.cook.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* @author xliu
* @date 2025/5/28 9:45
*/
@Data
public class CookH5WeekCanteenListVO {
@ApiModelProperty("菜谱id")
private Long recipeId;
@ApiModelProperty("档口名称")
private String stallName;
@ApiModelProperty("食堂名称")
private String canteenName;
@ApiModelProperty("食堂图片")
private String canteenImgUrl;
@ApiModelProperty("档口图片")
private String stallImgUrl;
}
//package com.bonus.canteen.core.cook.vo;
//
//import io.swagger.annotations.ApiModelProperty;
//import lombok.Data;
//
//import java.util.List;
//
///**
// * @author xliu
// * @date 2025/5/28 9:45
// */
//@Data
//public class CookH5WeekCanteenListVO {
// @ApiModelProperty("菜谱id")
// private Long recipeId;
// @ApiModelProperty("档口名称")
// private String stallName;
// @ApiModelProperty("食堂名称")
// private String canteenName;
// @ApiModelProperty("食堂图片")
// private String canteenImgUrl;
// @ApiModelProperty("档口图片")
// private String stallImgUrl;
//}

40
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/vo/CookH5WeekDetailsVO.java
View File

@ -1,20 +1,20 @@
package com.bonus.canteen.core.cook.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* @author xliu
* @date 2025/5/28 9:59
*/
@Data
public class CookH5WeekDetailsVO {
@ApiModelProperty("餐次类型")
private Integer mealtimeType;
@ApiModelProperty("餐次名称")
private String mealtimeName;
@ApiModelProperty("分类详情")
private List<CookH5WeekTypeVO> typeList;
}
//package com.bonus.canteen.core.cook.vo;
//
//import io.swagger.annotations.ApiModelProperty;
//import lombok.Data;
//
//import java.util.List;
//
///**
// * @author xliu
// * @date 2025/5/28 9:59
// */
//@Data
//public class CookH5WeekDetailsVO {
// @ApiModelProperty("餐次类型")
// private Integer mealtimeType;
// @ApiModelProperty("餐次名称")
// private String mealtimeName;
// @ApiModelProperty("分类详情")
// private List<CookH5WeekTypeVO> typeList;
//}

68
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/vo/CookH5WeekDishesDetailsVO.java
View File

@ -1,34 +1,34 @@
package com.bonus.canteen.core.cook.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
/**
* @author xliu
* @date 2025/5/28 10:03
*/
@Data
public class CookH5WeekDishesDetailsVO {
@ApiModelProperty("菜品id")
private Long dishesId;
@ApiModelProperty("菜品名称")
private String dishesName;
@ApiModelProperty("库存数量")
private Integer remanentNum;
@ApiModelProperty("限购数量")
private Integer limitNum;
@ApiModelProperty("菜品价格")
private Integer dishesPrice;
@ApiModelProperty("优惠价")
private Integer prefPrice;
@ApiModelProperty("规格类型(1-标准,2-大份,3-小份,4-50g,5-100g)")
private Long sizeType;
@ApiModelProperty("菜品规格")
private String sizeJson;
@ApiModelProperty("月销量")
private Integer monthlySales;
@ApiModelProperty("好评率")
private BigDecimal goodProbability;
}
//package com.bonus.canteen.core.cook.vo;
//
//import io.swagger.annotations.ApiModelProperty;
//import lombok.Data;
//
//import java.math.BigDecimal;
//
///**
// * @author xliu
// * @date 2025/5/28 10:03
// */
//@Data
//public class CookH5WeekDishesDetailsVO {
// @ApiModelProperty("菜品id")
// private Long dishesId;
// @ApiModelProperty("菜品名称")
// private String dishesName;
// @ApiModelProperty("库存数量")
// private Integer remanentNum;
// @ApiModelProperty("限购数量")
// private Integer limitNum;
// @ApiModelProperty("菜品价格")
// private Integer dishesPrice;
// @ApiModelProperty("优惠价")
// private Integer prefPrice;
// @ApiModelProperty("规格类型(1-标准,2-大份,3-小份,4-50g,5-100g)")
// private Long sizeType;
// @ApiModelProperty("菜品规格")
// private String sizeJson;
// @ApiModelProperty("月销量")
// private Integer monthlySales;
// @ApiModelProperty("好评率")
// private BigDecimal goodProbability;
//}

66
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/vo/CookH5WeekDishesVO.java
View File

@ -1,33 +1,33 @@
package com.bonus.canteen.core.cook.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* @author xliu
* @date 2025/5/28 10:01
*/
@Data
public class CookH5WeekDishesVO {
@ApiModelProperty("菜品id")
private Long dishesId;
@ApiModelProperty("菜品名称")
private String dishesName;
@ApiModelProperty("菜品图片")
private String dishesImgUrl;
@ApiModelProperty("菜谱详情id")
private Long recipeDetailId;
@ApiModelProperty("食堂id")
private Long canteenId;
@ApiModelProperty("食堂名称")
private String canteenName;
@ApiModelProperty("档口id")
private Long stallId;
@ApiModelProperty("档口名称")
private String stallName;
@ApiModelProperty("菜品详情")
private List<CookH5WeekDishesDetailsVO> dishesDetailList;
}
//package com.bonus.canteen.core.cook.vo;
//
//import io.swagger.annotations.ApiModelProperty;
//import lombok.Data;
//
//import java.util.List;
//
///**
// * @author xliu
// * @date 2025/5/28 10:01
// */
//@Data
//public class CookH5WeekDishesVO {
// @ApiModelProperty("菜品id")
// private Long dishesId;
// @ApiModelProperty("菜品名称")
// private String dishesName;
// @ApiModelProperty("菜品图片")
// private String dishesImgUrl;
// @ApiModelProperty("菜谱详情id")
// private Long recipeDetailId;
// @ApiModelProperty("食堂id")
// private Long canteenId;
// @ApiModelProperty("食堂名称")
// private String canteenName;
// @ApiModelProperty("档口id")
// private Long stallId;
// @ApiModelProperty("档口名称")
// private String stallName;
//
// @ApiModelProperty("菜品详情")
// private List<CookH5WeekDishesDetailsVO> dishesDetailList;
//}

40
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/vo/CookH5WeekTypeVO.java
View File

@ -1,20 +1,20 @@
package com.bonus.canteen.core.cook.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* @author xliu
* @date 2025/5/28 10:00
*/
@Data
public class CookH5WeekTypeVO {
@ApiModelProperty("菜品类别id")
private Long typeId;
@ApiModelProperty("菜品类别名称")
private String typeName;
@ApiModelProperty("菜谱详情")
private List<CookH5WeekDishesVO> dishesList;
}
//package com.bonus.canteen.core.cook.vo;
//
//import io.swagger.annotations.ApiModelProperty;
//import lombok.Data;
//
//import java.util.List;
//
///**
// * @author xliu
// * @date 2025/5/28 10:00
// */
//@Data
//public class CookH5WeekTypeVO {
// @ApiModelProperty("菜品类别id")
// private Long typeId;
// @ApiModelProperty("菜品类别名称")
// private String typeName;
// @ApiModelProperty("菜谱详情")
// private List<CookH5WeekDishesVO> dishesList;
//}

26
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/vo/MapBeanVO.java
View File

@ -1,13 +1,13 @@
package com.bonus.canteen.core.cook.vo;
import lombok.Data;
/**
* @author xliu
* @date 2025/4/10 14:35
*/
@Data
public class MapBeanVO {
private String key;
private String value;
}
//package com.bonus.canteen.core.cook.vo;
//
//import lombok.Data;
//
///**
// * @author xliu
// * @date 2025/4/10 14:35
// */
//@Data
//public class MapBeanVO {
// private String key;
// private String value;
//}

26
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/vo/StallMonthSalesVO.java
View File

@ -1,13 +1,13 @@
package com.bonus.canteen.core.cook.vo;
import lombok.Data;
/**
* @author xliu
* @date 2025/5/28 13:36
*/
@Data
public class StallMonthSalesVO {
private Integer stallId;
private Integer monthlySales;
}
//package com.bonus.canteen.core.cook.vo;
//
//import lombok.Data;
//
///**
// * @author xliu
// * @date 2025/5/28 13:36
// */
//@Data
//public class StallMonthSalesVO {
// private Integer stallId;
// private Integer monthlySales;
//}

1
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/module/MenuModule.java
View File

@ -23,7 +23,6 @@ public class MenuModule {
allocRecipeStallDTO.setCanteenId(cookDishCheckDTO.getCanteenId());
allocRecipeStallDTO.setStallId(cookDishCheckDTO.getStallId());
allocRecipeStallDTO.setKey(cookDishCheckDTO.getApplyType());
Map<Integer, List<CookH5ReserveRecipeDishesVO>> mealTimeTypeMap = new HashMap<>();
List<AllocRecipeStallVO> cookRecipeList = cookRecipeService.selectCookRecipeList4Current(allocRecipeStallDTO);
if (CollUtil.isNotEmpty(cookRecipeList) && cookRecipeList.size() == 1) {
return cookRecipeList.get(0);