一周菜谱

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/vo/AppletWeekCanteenVO.java

@@ -4,18 +4,22 @@ import com.bonus.canteen.core.utils.SysUtil;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 import java.util.List;
 
 @ApiModel("获取一周菜谱食堂列表")
+@Data
 public class AppletWeekCanteenVO {
    @ApiModelProperty("菜谱id")
    @JsonFormat(
       shape = JsonFormat.Shape.STRING
    )
    private Long recipeId;
+   private Long stallId;
    @ApiModelProperty("档口名称")
    private String stallName;
+   private Long canteenId;
    @ApiModelProperty("食堂名称")
    private String canteenName;
    @ApiModelProperty("食堂图片")
@@ -33,43 +37,4 @@ public class AppletWeekCanteenVO {
       return SysUtil.getCutFileUrl(this.stallImgUrl);
    }
 
-   public Long getRecipeId() {
-      return this.recipeId;
-   }
-
-   public String getStallName() {
-      return this.stallName;
-   }
-
-   public String getCanteenName() {
-      return this.canteenName;
-   }
-
-   public List<String> getLabelList() {
-      return this.labelList;
-   }
-
-   public void setRecipeId(final Long recipeId) {
-      this.recipeId = recipeId;
-   }
-
-   public void setStallName(final String stallName) {
-      this.stallName = stallName;
-   }
-
-   public void setCanteenName(final String canteenName) {
-      this.canteenName = canteenName;
-   }
-
-   public void setCanteenImgUrl(final String canteenImgUrl) {
-      this.canteenImgUrl = canteenImgUrl;
-   }
-
-   public void setStallImgUrl(final String stallImgUrl) {
-      this.stallImgUrl = stallImgUrl;
-   }
-
-   public void setLabelList(final List<String> labelList) {
-      this.labelList = labelList;
-   }
 }

bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/AppletRecipeH5Mapper.xml

@@ -14,7 +14,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <resultMap id="appletWeekCanteenVO" type="com.bonus.canteen.core.menu.vo.AppletWeekCanteenVO">
         <result property="recipeId" column="recipe_id"/>
+        <result property="stallId" column="stall_id"/>
         <result property="stallName" column="stall_name"/>
+        <result property="canteenId" column="canteen_id"/>
         <result property="canteenName" column="canteen_name"/>
         <result property="canteenImgUrl" column="canteen_img_url"/>
         <result property="stallImgUrl" column="stall_img_url"/>
@@ -25,7 +27,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
         select
         mr.recipe_id,
+        ass.stall_id,
         ass.stall_name,
+        ac.canteen_id,
         ac.canteen_name,
         ac.img_url as canteen_img_url,
         ass.img_url as stall_img_url