菜谱详情

bonus-common-biz/src/main/java/com/bonus/domain/CustInfoAppIdLoginVO.java

@@ -1,5 +1,6 @@
 package com.bonus.domain;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -10,6 +11,7 @@ import java.io.Serializable;
 @Data
 public class CustInfoAppIdLoginVO implements Serializable {
    @ApiModelProperty("人员id")
+   @JsonFormat(shape = JsonFormat.Shape.STRING)
    private Long custId;
    @ApiModelProperty("人员姓名")
    private String custName;

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/controller/AppletDishesController.java

@@ -1,6 +1,7 @@
 package com.bonus.core.menu.controller;
 
 import com.bonus.common.core.web.domain.AjaxResult;
+import com.bonus.core.menu.dto.AppletDishesDetailDTO;
 import com.bonus.core.menu.service.MenuDishesService;
 import com.bonus.core.menu.vo.AppletDishesDetailVO;
 import io.swagger.annotations.Api;
@@ -25,10 +26,10 @@ public class AppletDishesController {
    @Autowired
    private MenuDishesService menuDishesService;
 
-   @GetMapping({"/detail"})
+   @PostMapping({"/detail"})
    @ApiOperation("根据菜品id获取菜品详情")
-   public AjaxResult getRecipeDetail(@PathVariable("content") String content, @PathVariable("custId") Long custId) {
+   public AjaxResult getRecipeDetail(@RequestBody AppletDishesDetailDTO dto) {
-      AppletDishesDetailVO dishesDetailVO = this.menuDishesService.getDishesDetailByDishesId(content, custId);
+      AppletDishesDetailVO dishesDetailVO = this.menuDishesService.getDishesDetailByDishesId(dto);
       return success(dishesDetailVO);
    }
 }

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/dto/AppletDishesDetailDTO.java

@@ -1,38 +1,18 @@
 package com.bonus.core.menu.dto;
 
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
 import java.io.Serializable;
 
+@Data
 public class AppletDishesDetailDTO implements Serializable {
+   @ApiModelProperty("客户id")
+   private Long custId;
    @ApiModelProperty("菜谱详情id")
    private Long detailId;
    @ApiModelProperty("菜品id")
    private Long baseDishesId;
    @ApiModelProperty("是否删除(1删除,2未删除)")
    private Integer delFlag;
-
-   public Long getDetailId() {
-      return this.detailId;
-   }
-
-   public Long getBaseDishesId() {
-      return this.baseDishesId;
-   }
-
-   public Integer getDelFlag() {
-      return this.delFlag;
-   }
-
-   public void setDetailId(final Long detailId) {
-      this.detailId = detailId;
-   }
-
-   public void setBaseDishesId(final Long baseDishesId) {
-      this.baseDishesId = baseDishesId;
-   }
-
-   public void setDelFlag(final Integer delFlag) {
-      this.delFlag = delFlag;
-   }
-
 }

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/service/MenuDishesService.java

@@ -1,13 +1,14 @@
 package com.bonus.core.menu.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.bonus.core.menu.dto.AppletDishesDetailDTO;
 import com.bonus.core.menu.entity.MenuDishes;
 import com.bonus.core.menu.utils.NutritionEntity;
 import com.bonus.core.menu.vo.AppletDishesDetailVO;
 import java.util.Map;
 
 public interface MenuDishesService extends IService<MenuDishes> {
-   AppletDishesDetailVO getDishesDetailByDishesId(String content, Long custId);
+   AppletDishesDetailVO getDishesDetailByDishesId(AppletDishesDetailDTO dto);
 
    NutritionEntity getNutrientInfo(Map<Long, Double> dishesQuantityMap);
 }

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/core/menu/service/impl/MenuDishesServiceImpl.java

@@ -46,10 +46,11 @@ public class MenuDishesServiceImpl extends ServiceImpl<MenuDishesMapper, MenuDis
    private MenuPackageDishesMapper menuPackageDishesMapper;
 
 
-   public AppletDishesDetailVO getDishesDetailByDishesId(String content, Long custId) {
+   public AppletDishesDetailVO getDishesDetailByDishesId(AppletDishesDetailDTO dishesDetailDTO) {
-      AppletDishesDetailDTO dishesDetailDTO = (AppletDishesDetailDTO)JSON.parseObject(content, AppletDishesDetailDTO.class);
+      //AppletDishesDetailDTO dishesDetailDTO = (AppletDishesDetailDTO)JSON.parseObject(content, AppletDishesDetailDTO.class);
       dishesDetailDTO.setDelFlag(DelFlagEnum.DEL_FALSE.key());
       Long baseDishesId = dishesDetailDTO.getBaseDishesId();
+      Long custId = dishesDetailDTO.getCustId();
       if (!ObjectUtil.isNull(custId) && custId != -1L) {
          AppletDishesDetailVO appletDishesDetailVO = ((MenuDishesMapper)this.baseMapper).selectDishesDetailByDishesId(dishesDetailDTO);
          Long countDishes = this.menuCollectionDishesMapper.selectCount(Wrappers.lambdaQuery(MenuCollectionDishes.class)