diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/zhhq/domain/WeekRecipeDTO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/zhhq/domain/WeekRecipeDTO.java index 75c17fc..d0e3482 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/zhhq/domain/WeekRecipeDTO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/zhhq/domain/WeekRecipeDTO.java @@ -7,8 +7,8 @@ import java.time.LocalDate; @Data public class WeekRecipeDTO { - @ApiModelProperty(value = "食堂id") - private Long canteenId; +// @ApiModelProperty(value = "食堂id") +// private Long canteenId; @ApiModelProperty(value = "菜单日期") @JsonFormat(pattern = "yyyy-MM-dd") diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/zhhq/service/impl/ZhhqCookRecipeServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/zhhq/service/impl/ZhhqCookRecipeServiceImpl.java index 6267ae3..39cb5ad 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/zhhq/service/impl/ZhhqCookRecipeServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/zhhq/service/impl/ZhhqCookRecipeServiceImpl.java @@ -11,6 +11,7 @@ import com.bonus.canteen.core.zhhq.mapper.ZhhqCookRecipeMapper; import com.bonus.canteen.core.zhhq.service.IZhhqCookRecipeService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import java.math.BigDecimal; @@ -31,6 +32,8 @@ import java.util.stream.Collectors; @Service @Slf4j public class ZhhqCookRecipeServiceImpl implements IZhhqCookRecipeService { + private Long JYY_CANTEEN_ID = 10L; + @Autowired private BasicCanteenMapper basicCanteenMapper; @Autowired @@ -40,7 +43,7 @@ public class ZhhqCookRecipeServiceImpl implements IZhhqCookRecipeService { public WeekRecipeVO getWeekRecipeDetailList(WeekRecipeDTO dto) { WeekRecipeVO weekRecipeVO = new WeekRecipeVO(); weekRecipeVO.setRecipeName("周菜谱"); - BasicCanteen basicCanteen = basicCanteenMapper.selectBasicCanteenByCanteenId(dto.getCanteenId()); + BasicCanteen basicCanteen = basicCanteenMapper.selectBasicCanteenByCanteenId(JYY_CANTEEN_ID); weekRecipeVO.setCanteenName(basicCanteen.getCanteenName()); List weekDates = DateUtil.getWeekDates(dto.getMenuDate()); weekRecipeVO.setRecipeYear(dto.getMenuDate().getYear());